Merge branch 'master' of http://124.70.58.209:3000/buzhanyi/ankaibeiProjectManagement

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/ManHourServiceApi.java

@@ -43,7 +43,7 @@ public class ManHourServiceApi implements ManHourInfoApi {
 
     @Override
     public ResMsg findManHourByID(ManHourInfoVo manHourInfoVo) {
-        return manHourService.findManHourByID(manHourInfoVo.getManId());
+        return manHourService.findManHourByID(Integer.valueOf(manHourInfoVo.getManId()));
     }
 
 

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

@@ -490,7 +490,7 @@ public class CostInfoController {
                 }
             }
         } else {
-            for (int i = (pageNum - 1) * 10; i < pageNum * 10 - 1; i++) {
+            for (int i = (pageNum - 1) * 10; i < pageNum * 10; i++) {
                 flowTaskVoListByQueryTypeRsg.add(flowTaskVoListByQueryTypePro.get(i));
                 if (i == flowTaskVoListByQueryTypePro.size() - 1) {
                     break;

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

@@ -120,10 +120,11 @@ public class SubmitUserTaskController {
     @PostMapping("/submitUserTaskBatch")
     public ResMsg submitUserTaskBatch(
             @RequestBody List<SubmitUserTaskVo> subVoList) {
+        ResMsg resMsg = new ResMsg();
         for (SubmitUserTaskVo taskVo : subVoList) {
-            submitUserTaskOfAKB(taskVo);
+            resMsg = submitUserTaskOfAKB(taskVo);
         }
-        return ResMsg.newInstance(CodeEnum.OK);
+        return resMsg;
     }
 
 
@@ -307,29 +308,29 @@ public class SubmitUserTaskController {
         switch (CostEnum.getEnumByCode(subVo.getCostType())) {
 
             case PROJECTADD:
-                projectInfoMapper.updateProjectFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
+                projectInfoMapper.updateProjectFlowStatus(flowStatus + "", subVo.getApplyDataId());
             case MANHOUR:
-                manHourMapper.updateManHourFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
+                manHourMapper.updateManHourFlowStatus(flowStatus + "", subVo.getApplyDataId());
             case PROJECTTASKADD:
-                taskInfoMapper.updateTaskFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
+                taskInfoMapper.updateTaskFlowStatus(flowStatus + "", subVo.getApplyDataId());
             case COMMUNICATION:
-                communicationMapper.updateCommunicationFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
-                costInfoMapper.updateCostInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId(), "通讯费");
+                communicationMapper.updateCommunicationFlowStatus(flowStatus + "", subVo.getApplyDataId());
+                costInfoMapper.updateCostInfoFlowStatus(flowStatus + "", subVo.getApplyDataId(), "通讯费");
             case PURCHASE:
-                purchaseInfoMapper.updatePurchaseInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
-                costInfoMapper.updateCostInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId(), "采购费");
+                purchaseInfoMapper.updatePurchaseInfoFlowStatus(flowStatus + "", subVo.getApplyDataId());
+                costInfoMapper.updateCostInfoFlowStatus(flowStatus + "", subVo.getApplyDataId(), "采购费");
             case REST:
-                restInfoMapper.updateRestsFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
-                costInfoMapper.updateCostInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId(), "其他费用");
+                restInfoMapper.updateRestsFlowStatus(flowStatus + "", subVo.getApplyDataId());
+                costInfoMapper.updateCostInfoFlowStatus(flowStatus + "", subVo.getApplyDataId(), "其他费用");
             case TRANSPORTATION:
-                trafficExpenseMapper.updateTrafficFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
-                costInfoMapper.updateCostInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId(), "交通费");
+                trafficExpenseMapper.updateTrafficFlowStatus(flowStatus + "", subVo.getApplyDataId());
+                costInfoMapper.updateCostInfoFlowStatus(flowStatus + "", subVo.getApplyDataId(), "交通费");
             case REPAST:
-                repastExpenseMapper.updateRepastFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
-                costInfoMapper.updateCostInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId(), "餐饮费");
+                repastExpenseMapper.updateRepastFlowStatus(flowStatus + "", subVo.getApplyDataId());
+                costInfoMapper.updateCostInfoFlowStatus(flowStatus + "", subVo.getApplyDataId(), "餐饮费");
             case TRAVEL:
-                travelExpenseMapper.updateTravelFlowStatus(flowTaskStatus + "", subVo.getApplyDataId());
-                costInfoMapper.updateCostInfoFlowStatus(flowTaskStatus + "", subVo.getApplyDataId(), "差旅费");
+                travelExpenseMapper.updateTravelFlowStatus(flowStatus + "", subVo.getApplyDataId());
+                costInfoMapper.updateCostInfoFlowStatus(flowStatus + "", subVo.getApplyDataId(), "差旅费");
             default:
         }
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/entity/ManHourInfoEntity.java

@@ -15,6 +15,9 @@ import java.util.Objects;
 @Entity
 @Table(name = "man_hour_info", schema = "ankaibei", catalog = "")
 public class ManHourInfoEntity {
+    /**
+     * 工时id
+     */
     private Integer manId;
     /**
      * 项目成员

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

@@ -84,17 +84,14 @@ public class ManHourServiceImpl implements ManHourService {
         manHourInfoEntity.setProjectName(projectId);
         manHourInfoEntity.setProjectUser(byId1.orElse(null) != null ? byId1.orElse(null).getShowName() : null);
         //manHourInfoEntity.setManStatus("1");
-
-        /**
-         * 调用人员工时申请流程的启动
-         * 获取流程开始节点之后的第一个任务节点的数据
-         * param processDefinitionKey 项目人员工时接口审批流程--流程标识。
-         */
+        //param processDefinitionKey 项目人员工时接口审批流程--流程标识。
         String processDefinitionKey = "manHourCountApply";
         ResponseResult<FlowEntry> flowEntryResult = flowTaskStart.verifyAndGetFlowEntry(processDefinitionKey);
         if (!flowEntryResult.isSuccess()) {
             return ResMsg.newInstance(CodeEnum.FAIL, flowEntryResult);
         }
+        //调用人员工时申请流程的启动
+        //获取流程开始节点之后的第一个任务节点的数据
         FlowEntryPublish flowEntryPublish = flowEntryResult.getData().getMainFlowEntryPublish();
         String initTaskInfo = flowEntryPublish.getInitTaskInfo();
         com.ankaibei.workFlow.common.flow.vo.TaskInfoVo taskInfo = StrUtil.isBlank(initTaskInfo)
@@ -117,7 +114,6 @@ public class ManHourServiceImpl implements ManHourService {
         stringObjectHashMap.put("man_id", manHourInfoEntity.getManId());
         JSONObject masterData = (JSONObject) JSONObject.toJSON(stringObjectHashMap);
         Map<String, String> map = flowTaskStart.startAndTakeUserTaskSS(processDefinitionKey, flowTaskCommentDto, null, masterData, null, null).getData();
-
         manHourInfoEntity.setProcessInstanceId(map.get("processInstanceId"));
         manHourInfoEntity.setProcessDefinitionId(map.get("processDefinitionId"));
         manHourInfoEntity.setFlowTaskStatus(FlowTaskStatus.SUBMITTED);
@@ -140,8 +136,8 @@ public class ManHourServiceImpl implements ManHourService {
     public ResMsg deleteManHour(List<ManHourInfoVo> manHourInfoVos) {
 
         for (ManHourInfoVo info : manHourInfoVos) {
-            manHourMapper.deleteById(info.getManId());
-            manHourJobMapper.deleteByManIdEquals(info.getManId());
+            manHourMapper.deleteById(Integer.valueOf(info.getManId()));
+            manHourJobMapper.deleteByManIdEquals(Integer.valueOf(info.getManId()));
         }
         return new ResMsg(CodeEnum.OK);
     }