优化

olive-console/src/main/java/com/enums/ProjectStatusEnum.java

@@ -9,17 +9,22 @@ package com.enums;
  *
  */
 public enum ProjectStatusEnum {
-
-	// 开启
-	STATUS_1("1","进行中"),
-	// 开发完成 
-	STATUS_2("2","开发完成 "),
-	// 试运行
-	STATUS_3("3","试运行"),
-	// 验收完成
-	STATUS_4("4","验收完成"),
-	// 已关闭
-	STATUS_5("5","已关闭");
+	// 项目启动
+	STATUS_1("1","项目启动"),
+	// 需求分析 
+	STATUS_2("2","需求分析 "),
+	// 项目开发
+	STATUS_3("3","项目开发"),
+	// 系统测试
+	STATUS_4("4","系统测试"),
+	// 部署试运行
+	STATUS_5("5","部署试运行"),
+	//项目结项
+	STATUS_6("6","项目结项"),
+	//售后期
+	STATUS_7("7","售后期"),
+	//已归档
+	STATUS_8("8","已归档");
 	private final String code;
 	private final String value;
 	private ProjectStatusEnum(String code, String value) {

olive-console/src/main/java/com/zrqx/olive/project/controller/ProjectController.java

@@ -134,6 +134,7 @@ public class ProjectController {
 	public CommonResult<CommonPage<ProjectListVo>> query(QueryProjectRequest form, PageParamRequest pageParamRequest){
 		return CommonResult.success(CommonPage.restPage(service.page(form, pageParamRequest)));
 	}
+	
 	@ApiOperation(value = "查询全部项目" , notes ="分页查询")
 	@GetMapping(value = "/projectList" )
 	public CommonResult<List<ProjectListVo1>> list(QueryProjectRequest form){

olive-console/src/main/java/com/zrqx/olive/project/dao/CustomerDao.java

@@ -22,7 +22,6 @@ public interface CustomerDao extends BaseMapper<Customer> {
 			+ "<if test = 'form.status!=\"\" and form.status!=null'> "
 			+ "AND status = #{form.status} "
 			+ "</if>"
-			+ "order by px desc"
 			+ "</script>")
 	List<Customer> query(@Param("form")QueryCustomerRequest form);
 	@Select("<script>"

olive-console/src/main/java/com/zrqx/olive/project/dao/StatisticsProjectDao.java

@@ -20,7 +20,7 @@ public interface StatisticsProjectDao extends BaseMapper<StatisticsProject> {
 			+ "AND name like concat('%', #{form.name},'%') "
 			+ "</if>"
 			+ "<if test = 'form.project !=null'> "
-			+ "AND project like concat(#{form.project},'%') "
+			+ "AND project like concat('%',#{form.project},'%') "
 			+ "</if>"
 			+ "<if test = 'form.customer !=null'> "
 			+ "AND customer like concat('%',#{form.customer},'%') "

olive-console/src/main/java/com/zrqx/olive/project/model/StatisticsProject.java

@@ -46,7 +46,8 @@ public class StatisticsProject {
 	private String customer;
 	@ApiModelProperty("合同签订时间")
 	private Date signingTime;
-	@ApiModelProperty("项目状态： 1 进行中 2开发完成 3试运行 4验收完成 5已关闭 ")
+	//@ApiModelProperty("项目状态： 1 进行中 2开发完成 3试运行 4验收完成 5已关闭 ")
+	@ApiModelProperty("项目状态：1项目启动、2需求分析、3项目开发、4系统测试、5部署试运行、6项目结项、7售后期、8已归档")
 	private String status;
 	@ApiModelProperty("项目描述")
 	private String describes;

olive-console/src/main/java/com/zrqx/olive/project/service/impl/CustomerServiceImpl.java

@@ -29,6 +29,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, Customer>  imp
 
 	@Override
 	public PageInfo<Customer> page(QueryCustomerRequest form, PageParamRequest pageParamRequest) {
+		if(pageParamRequest.getOrderBy()==null) {
+			pageParamRequest.setOrderBy("upload_time desc,px desc");
+		}
 		PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
 		
 		List<Customer> list=mapper.query(form);

olive-console/src/main/java/com/zrqx/olive/project/service/impl/StatisticsProjectServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.web.ProjectedPayload;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -69,6 +70,7 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 				pageParamRequest.getOrderBy());
 		List<ProjectListVo> list = mapper.queryProjectPage(form);
 		for (ProjectListVo projectListVo : list) {
+			projectListVo.setStatus_Name(ProjectStatusEnum.getName(projectListVo.getStatus()));
 			//项目的消耗总工时
 			BigDecimal consume=taskService.queryConsume(projectListVo.getId(),null,null,projectListVo.getPresale());
 			if(consume!=null) {

olive-console/src/main/java/com/zrqx/olive/project/vo/ProjectListVo.java

@@ -25,9 +25,9 @@ public class ProjectListVo {
 	private String customerId;
 	@ApiModelProperty("所属客户")
 	private String customer;
-	@ApiModelProperty("项目状态： 1 进行中 2开发完成 3试运行 4验收完成 5已关闭 ")
+	@ApiModelProperty("项目状态： 1项目启动、2需求分析、3项目开发、4系统测试、5部署试运行、6项目结项、7售后期、8已归档 ")
 	private String status;
-	@ApiModelProperty("项目状态： 1 进行中 2开发完成 3试运行 4验收完成 5已关闭 ")
+	@ApiModelProperty("项目状态：1项目启动、2需求分析、3项目开发、4系统测试、5部署试运行、6项目结项、7售后期、8已归档 ")
 	private String status_Name;
 	@ApiModelProperty("总工时")
 	private BigDecimal total;

olive-console/src/main/java/com/zrqx/olive/ttask/controller/TaskController.java

@@ -105,14 +105,6 @@ public class TaskController {
     @Autowired
     private SystemConfigService systemConfigService;
 
-	/**
-	 * 分页显示文章管理表
-	 * 
-	 * @param request          ArticleSearchRequest 搜索条件
-	 * @param pageParamRequest 分页参数
-	 * @author Mr.Zhang
-	 * @since 2020-04-18
-	 */
 	@ApiOperation(value = "分页列表")
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@ApiImplicitParam(name = "keywords", value = "搜索关键字")

olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java

@@ -174,7 +174,7 @@ public interface TaskDao extends BaseMapper<Task> {
 	
 	
 	@Select("<script>"
-			+ " select sum(working_hours) FROM t_task a  where  task_status=3 "	
+			+ " select sum(working_hours) FROM t_task a  where  task_status=3 and user_id is not null"	
 			+ "<if test = 'id!=null and id!=\"\"'> "
 			+ " AND a.project_id = #{id} "
 			+ "</if>"

olive-console/src/main/java/com/zrqx/olive/ttask/service/imp/TaskServiceImpl.java

@@ -93,6 +93,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 	 */
 	@Override
 	public PageInfo<TaskVo> getpage(TaskRequest request, PageParamRequest pageParamRequest) {
+		if(pageParamRequest.getOrderBy()==null) {
+			pageParamRequest.setOrderBy("create_time desc");
+		}
 		Page<Task> taskPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit(),
 				pageParamRequest.getOrderBy());
 		List<TaskVo> taskVo = dao.page(request);