查询所有工时列表修改

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/SubmitUserTaskController.java

@@ -271,7 +271,6 @@ public class SubmitUserTaskController {
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public void updateAndTakeTask(
             SubmitUserTaskVo subVo,
             Task task,

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ManHourServiceImpl.java

@@ -65,15 +65,13 @@ public class ManHourServiceImpl implements ManHourService {
 
         Page<Map<String, String>> manHourAll = manHourMapper.findManHourAll(manHourInfoEntity.getFlowTaskStatus(), manHourInfoEntity.getCreateDate(), endDate, page);
         return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
-            Map<Object, Object> map1 = new HashMap<>();
-            map1.putAll(map);
+            Map<Object, Object> map1 = new HashMap<>(map);
             String projectId = map.get("projectName");
             map1.put("manHour", map.get("manHour") + "天");
             List<ManHourJobInfo> byManIdIs = manHourJobMapper.findManHourJobInfosByManIdIs(Integer.valueOf(map1.get("manId").toString()));
             map1.put("manHourJob", byManIdIs);
             Optional<ProjectInfoEntity> byId = projectInfoMapper.findById(Integer.valueOf(projectId));
             map1.put("projectName", byId.orElse(null) != null ? byId.orElse(null).getProjectName() : null);
-            map1.put("flowTaskStatus", byId.orElse(null) != null ? byId.orElse(null).getFlowTaskStatus() : null);
             return map1;
         }).getContent(), manHourAll.getTotalElements()));
     }