Merge branch 'master' of http://test16.zhongdianyun.com/renjiancai/tasktime.git

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

@@ -30,6 +30,7 @@ import com.zrqx.olive.project.request.StatisticsProjectRequest;
 import com.zrqx.olive.project.service.ProjectRecordService;
 import com.zrqx.olive.project.service.StatisticsProjectService;
 import com.zrqx.olive.project.vo.ProjectListVo;
+import com.zrqx.olive.project.vo.ProjectListVo1;
 import com.zrqx.olive.project.vo.ProjectRecordListVo;
 import com.zrqx.olive.project.vo.ProjectVo;
 import com.zrqx.olive.system.response.SystemAdminResponse;
@@ -133,7 +134,11 @@ 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){
+		return CommonResult.success(service.list(form));
+	}
 	@ApiOperation(value = "查询项目" , notes ="查询项目")
 	@RequestMapping(value = "/listProject", method = RequestMethod.GET)
 	@ApiImplicitParam(name="customerId", value="客户ID")

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

@@ -9,26 +9,27 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zrqx.olive.project.model.StatisticsProject;
 import com.zrqx.olive.project.request.QueryProjectRequest;
 import com.zrqx.olive.project.vo.ProjectListVo;
+import com.zrqx.olive.project.vo.ProjectListVo1;
 
 public interface StatisticsProjectDao extends BaseMapper<StatisticsProject> {
 	@Select("<script>"
-			+ "select id,project,customer_id,name,status,DATE_FORMAT(start_time,'%Y-%m-%d') start_time,total_apply_time total,"
+			+ "select id,project,customer,customer_id,name,status,DATE_FORMAT(start_time,'%Y-%m-%d') start_time,total_apply_time total,"
 			+ "DATE_FORMAT(end_time,'%Y-%m-%d') end_time,px,presale,to_be_allocated FROM t_statistics_project where 1=1 "
 			// 项目负责人
-			+ "<if test = 'form.name !=\"\" and form.name !=null'> "
+			+ "<if test = 'form.name !=null'> "
 			+ "AND name like concat('%', #{form.name},'%') "
 			+ "</if>"
-			+ "<if test = 'form.project !=\"\" and form.project !=null'> "
-			+ "AND project like concat('%',#{form.project},'%')"
+			+ "<if test = 'form.project !=null'> "
+			+ "AND project like concat(#{form.project},'%') "
 			+ "</if>"
-			+ "<if test = 'form.customer !=\"\" and form.customer !=null'> "
+			+ "<if test = 'form.customer !=null'> "
 			+ "AND customer like concat('%',#{form.customer},'%') "
 			+ "</if>"
 			// 项目状态
 			+ "<if test = 'form.status!=\"\" and form.status!=null'> "
 			+ " AND status = #{form.status} "
 			+ "</if>"
-			+ "<if test = 'form.presale!=\"\" and form.presale!=null'> "
+			+ "<if test = 'form.presale!=null'> "
 			+ " AND presale = #{form.presale} "
 			+ "</if>"
 			+ "</script>")
@@ -37,5 +38,12 @@ public interface StatisticsProjectDao extends BaseMapper<StatisticsProject> {
 			+ "SELECT max(px) FROM t_statistics_project "	
 			+ "</script>")
 	Integer selectByMaxSort();
+	@Select("<script>"
+			+ "select id,project,px FROM t_statistics_project where 1=1 "
+			+ "<if test = 'form.project !=\"\" and form.project !=null'> "
+			+ "AND project like concat('%',#{form.project},'%')"
+			+ "</if>"
+			+ "</script>")
+	List<ProjectListVo1> list(QueryProjectRequest form);
 
 }

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

@@ -10,6 +10,7 @@ import com.zrqx.olive.project.request.QueryProjectRequest;
 import com.zrqx.olive.project.request.SaveProjectRequest;
 import com.zrqx.olive.project.request.StatisticsProjectRequest;
 import com.zrqx.olive.project.vo.ProjectListVo;
+import com.zrqx.olive.project.vo.ProjectListVo1;
 import com.zrqx.olive.project.vo.ProjectVo;
 import com.zrqx.olive.system.response.SystemAdminResponse;
 
@@ -59,5 +60,14 @@ public interface StatisticsProjectService extends IService<StatisticsProject> {
 	 * @date 2021年8月16日
 	 */
 	List<StatisticsProjectRequest> listProject(String customerId);
+	/**
+	 * 查询全部
+	 * @Title: StatisticsProjectService.java
+	 * @Package com.zrqx.olive.project.service
+	 * @Description: TODO
+	 * @author 任建彩
+	 * @date 2021年9月8日
+	 */
+	List<ProjectListVo1> list(QueryProjectRequest form);
 	
 }

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

@@ -34,6 +34,7 @@ import com.zrqx.olive.project.request.SaveProjectRequest;
 import com.zrqx.olive.project.request.StatisticsProjectRequest;
 import com.zrqx.olive.project.service.StatisticsProjectService;
 import com.zrqx.olive.project.vo.ProjectListVo;
+import com.zrqx.olive.project.vo.ProjectListVo1;
 import com.zrqx.olive.project.vo.ProjectVo;
 import com.zrqx.olive.system.response.SystemAdminResponse;
 import com.zrqx.olive.timeApply.dao.TimeApplyChangeDao;
@@ -62,17 +63,12 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 	public PageInfo<ProjectListVo> page(QueryProjectRequest form, PageParamRequest pageParamRequest) {
 		//开启分页
 		if(pageParamRequest.getOrderBy()==null) {
-			pageParamRequest.setOrderBy("px desc,upload_time desc");
+			pageParamRequest.setOrderBy("start_time desc,px desc");
 		}
 		Page<StatisticsProject> startPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit(),
 				pageParamRequest.getOrderBy());
 		List<ProjectListVo> list = mapper.queryProjectPage(form);
 		for (ProjectListVo projectListVo : list) {
-			Customer customer = dao.selectById(projectListVo.getCustomerId());
-			if(customer!=null) {
-				projectListVo.setCustomer(customer.getCustomer());
-				projectListVo.setStatus_Name(ProjectStatusEnum.getName(projectListVo.getStatus()));
-			}
 			//项目的消耗总工时
 			BigDecimal consume=taskService.queryConsume(projectListVo.getId(),null,null,projectListVo.getPresale());
 			if(consume!=null) {
@@ -208,4 +204,10 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 		}
 		return statisticsProjectRequest;
 	}
+
+	@Override
+	public List<ProjectListVo1> list(QueryProjectRequest form) {
+		// TODO Auto-generated method stub
+		return mapper.list(form) ;
+	}
 }

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

@@ -59,6 +59,14 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team>  implements Team
 		List<Team> list = teamDao.selectList(qw);
 		if(list.size()>0) {
 			for (Team team : list) {
+				BigDecimal consume=taskService.queryConsume(team.getProjectId(),null,team.getDepartmentId(),null);
+				if(consume!=null) {
+				team.setConsume(consume);
+				}
+				BigDecimal querySurplus = taskService.querySurplus(team.getProjectId(),null,team.getDepartmentId());
+				if(querySurplus!=null) {
+				team.setSurplus(team.getTotal().subtract(querySurplus));
+				}
 				TeamRequest aqr = new TeamRequest();
 				BeanUtils.copyProperties(team, aqr);
 				aqr.setUploadTime(DateUtils.dateTimeToStr(team.getUploadTime()));
@@ -69,14 +77,6 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team>  implements Team
 					aqr.setMemberNumber(selectList.size());
 				}
 				teamRequest.add(aqr);
-				BigDecimal consume=taskService.queryConsume(team.getProjectId(),null,team.getDepartmentId(),null);
-				if(consume!=null) {
-				team.setConsume(consume);
-				}
-				BigDecimal querySurplus = taskService.querySurplus(team.getProjectId(),null,team.getDepartmentId());
-				if(querySurplus!=null) {
-				team.setSurplus(team.getTotal().subtract(querySurplus));
-				}
 			}
 		}
 		return new PageInfo<TeamRequest>(teamRequest);

olive-console/src/main/java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java

@@ -133,6 +133,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 					+ " and status2 = 5"
 					+ "</if>" 
 			+ "</if>"
+					+" order by create_time desc"
 			+ "</script>")
 	List<TimeApplyChangeVo> selectTimeApplyChange(@Param("form") TimeApplyChangeForm form);
 
@@ -144,6 +145,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 			+ "<if test = 'form.status == 3'>"
 			+ " and status2 = 3 "
 			+ "</if>"
+			+ " order by create_time desc"
 			+ "</script>")
 	List<TimeApplyChangeVo> pageTimeApply1(@Param("form") TimeApplyChangeForm form);
 	
@@ -155,6 +157,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 			+ "<if test = 'form.status == 3'>"
 			+ " and status2 = 3 "
 			+ "</if>"
+			+ " order by create_time desc"
 			+ "</script>")
 	List<TimeApplyChangeVo> pageTimeApply2(@Param("form") TimeApplyChangeForm form);
 	@Select("<script>"