|
@@ -11,11 +11,17 @@ import com.ankaibei.workFlow.common.flow.dto.FlowTaskCommentDto;
|
|
|
import com.ankaibei.workFlow.common.flow.model.FlowEntry;
|
|
|
import com.ankaibei.workFlow.common.flow.model.FlowEntryPublish;
|
|
|
import com.ankaibei.workFlow.common.flow.vo.TaskInfoVo;
|
|
|
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.*;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.ManHourInfoEntity;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectInfoEntity;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.TaskInfoEntity;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
|
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.enums.CodeEnum;
|
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.enums.DataIsDeleteEnum;
|
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.enums.ManHourStatus;
|
|
|
-import com.ankaibei.workFlow.webadmin.ankaibei.mapper.*;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.ManHourMapper;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.ProjectInfoMapper;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.TaskInfoMapper;
|
|
|
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.UserInfoMapper;
|
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.service.ManHourService;
|
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
|
|
|
import com.ankaibei.workFlow.webadmin.ankaibei.vo.ManHourInfoVo;
|
|
@@ -27,12 +33,14 @@ import org.springframework.data.domain.PageRequest;
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.ManHourInfoEntity;
|
|
|
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.TaskInfoEntity;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
/**
|
|
|
* @author lwq
|
|
@@ -70,15 +78,16 @@ public class ManHourServiceImpl implements ManHourService {
|
|
|
List<TaskInfoEntity> finishedTasks = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusEqualsAndIsDeleteEquals(userId, String.valueOf(FlowTaskStatus.FINISHED), (DataIsDeleteEnum.NORMAL.getCode()));
|
|
|
return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
|
|
|
Map<Object, Object> map1 = new HashMap<>(map);
|
|
|
+ //匹配任务信息
|
|
|
for (TaskInfoEntity taskInfo : finishedTasks) {
|
|
|
- if (map1.get("taskId").equals(taskInfo.getTaskId())) {
|
|
|
+ if (map1.get("taskId").equals(taskInfo.getTaskId().toString())) {
|
|
|
map1.put("targetTask", taskInfo.getTargetTask());
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
String projectId = map.get("projectId");
|
|
|
for (ProjectInfoEntity projectInfo : projectInfos) {
|
|
|
- if (Integer.valueOf(projectId).equals(projectInfo.getProjectId())) {
|
|
|
+ if (Integer.valueOf(projectId) == (projectInfo.getProjectId())) {
|
|
|
map1.put("projectName", projectInfo.getProjectName());
|
|
|
break;
|
|
|
}
|