|
@@ -67,7 +67,7 @@ public class ManHourServiceImpl implements ManHourService {
|
|
Page<Map<String, String>> manHourAll = manHourMapper.findManHourAll(userId, manHourInfoEntity.getFlowTaskStatus(), manHourInfoEntity.getStartDate(), endDate, page);
|
|
Page<Map<String, String>> manHourAll = manHourMapper.findManHourAll(userId, manHourInfoEntity.getFlowTaskStatus(), manHourInfoEntity.getStartDate(), endDate, page);
|
|
//匹配项目信息和任务信息
|
|
//匹配项目信息和任务信息
|
|
List<ProjectInfoEntity> projectInfos = projectInfoMapper.findAll();
|
|
List<ProjectInfoEntity> projectInfos = projectInfoMapper.findAll();
|
|
- List<TaskInfoEntity> finishedTasks = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusIsAndIsDeleteIs(userId, FlowTaskStatus.FINISHED, DataIsDeleteEnum.NORMAL.getCode());
|
|
|
|
|
|
+ List<TaskInfoEntity> finishedTasks = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusEqualsAndIsDeleteEquals(userId, String.valueOf(FlowTaskStatus.FINISHED), (DataIsDeleteEnum.NORMAL.getCode()));
|
|
return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
|
|
return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
|
|
Map<Object, Object> map1 = new HashMap<>(map);
|
|
Map<Object, Object> map1 = new HashMap<>(map);
|
|
for (TaskInfoEntity taskInfo : finishedTasks) {
|
|
for (TaskInfoEntity taskInfo : finishedTasks) {
|