bug

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

@@ -59,7 +59,7 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 	@Override
 	public PageInfo<ProjectListVo> page(QueryProjectRequest form, PageParamRequest pageParamRequest) {
 		if(pageParamRequest.getOrderBy()==null) {
-			pageParamRequest.setOrderBy("px desc,upload_time desc");
+			pageParamRequest.setOrderBy("px desc");
 		}
 		//开启分页
 		PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
@@ -71,12 +71,14 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 				projectListVo.setCustomer(customer.getCustomer());
 				projectListVo.setStatus_Name(ProjectStatusEnum.getName(projectListVo.getStatus()));
 			}
-			BigDecimal consume=taskService.queryConsume(projectListVo.getId(),null,null);
+			//项目的消耗总工时
+			BigDecimal consume=taskService.queryConsume(projectListVo.getId(),null,null,projectListVo.getPresale());
 			if(consume!=null) {
 				if(projectListVo.getTotal()!=null) {
-				projectListVo.setConsume(projectListVo.getTotal().subtract(consume));
+				projectListVo.setConsume(consume);
 				}
 			}
+			//项目的剩余总工时
 			BigDecimal querySurplus = taskService.querySurplus(projectListVo.getId(),null,null);
 			if(querySurplus!=null) {
 				if(projectListVo.getTotal()!=null) {

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

@@ -42,8 +42,6 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
 	@Autowired
 	private SystemRoleDao roleDao;
 	@Autowired
-	private SystemAdminDao systemAdminDao;
-	@Autowired
 	private TeamDao teamDao; 
 	@Autowired
 	private DepartmentDao dao;
@@ -54,8 +52,10 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
 	public List<TeamMemberListVo> getByMember(QueryTeamMemberRequest request) {
 		List<TeamMemberListVo> list =relationDao.getByMember(request); 
 		for (TeamMemberListVo teamMemberListVo : list) {
-			BigDecimal consume=taskService.queryConsume(teamMemberListVo.getProjectId(),teamMemberListVo.getId(),null);
+			//当前消耗总工时
+			BigDecimal consume=taskService.queryConsume(teamMemberListVo.getProjectId(),teamMemberListVo.getId(),null,null);
 			teamMemberListVo.setConsume(consume);
+			//当前剩余总工时
 			BigDecimal total = taskService.querySurplus(teamMemberListVo.getProjectId(),teamMemberListVo.getId(),null);
 			teamMemberListVo.setTotal(total);
 		}

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

@@ -69,9 +69,9 @@ 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());
+				BigDecimal consume=taskService.queryConsume(team.getProjectId(),null,team.getDepartmentId(),null);
 				if(consume!=null) {
-				team.setConsume(team.getTotal().subtract(consume));
+				team.setConsume(consume);
 				}
 				BigDecimal querySurplus = taskService.querySurplus(team.getProjectId(),null,team.getDepartmentId());
 				if(querySurplus!=null) {

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

@@ -102,8 +102,14 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "<if test = 'userId!=null and userId!=\"\"'> "
 			+ " AND a.user_id = #{userId} "
 			+ "</if>"
+			+ "<if test = 'presale==1'> "
+			+ " AND a.status = 2 "
+			+ "</if>"
+			+ "<if test = 'presale==2'> "
+			+ " AND a.status = 1 "
+			+ "</if>"
 			+ "</script>")
-	BigDecimal queryConsume(String id,Integer userId,Integer departmentId);
+	BigDecimal queryConsume(String id,Integer userId,Integer departmentId,String presale);
 	@Select("<script>"
 			+ " select sum(working_hours) FROM t_task a  where 1=1 "	
 			+ "<if test = 'id!=null and id!=\"\"'> "

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

@@ -41,7 +41,7 @@ public interface TaskService extends IService<Task> {
     
     CommonResult<Object> imporTask(MultipartFile file, TaskForm taskRequest) throws BaseException, IOException;
 
-	BigDecimal queryConsume(String id,Integer userId,Integer departmentId);
+	BigDecimal queryConsume(String id,Integer userId,Integer departmentId,String presale);
 	
 	BigDecimal querySurplus(String id,Integer userId,Integer departmentId);
 }

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

@@ -245,9 +245,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
 	}
 
 	@Override
-	public BigDecimal queryConsume(String id,Integer userId,Integer departmentId) {
+	public BigDecimal queryConsume(String id,Integer userId,Integer departmentId,String presale) {
 		
-		return dao.queryConsume(id,userId,departmentId);
+		return dao.queryConsume(id,userId,departmentId,presale);
 	}
 	public BigDecimal querySurplus(String id,Integer userId,Integer departmentId) {