修改报检接受状态

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -97,14 +97,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey( model.getProcessKey());
                 dto.setBusinessKey(buildOrderNo());
-           //     dto.setCompleteFirstTask(true);
-           //     JSONObject body = new JSONObject();
-           //     String businessKey = buildOrderNo();
-           //     body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
-           //     body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
-           //     body.put("completeFirstTask", Boolean.TRUE);
-           // dto.setCompleteFirstTask(true);
-
                 try {
                     FeignClientResult ajaxResult = Workflow.taskV2Client.startByVariable(dto);
                     String id = ((Map) ajaxResult.getResult()).get("id").toString();
@@ -114,16 +106,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-
-//                JSONObject body = new JSONObject();
-//                String businessKey = buildOrderNo();
-//                body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
-//                body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
-//                JSONObject jsonObject = workflowFeignService.startByVariable(body);
-//                String processId = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("data"))).getString("id");
-                model.setStatus("已提交");
+             model.setStatus(String.valueOf(FlowStatusEnum.SUBMITTED.getCode()));
             } else if (model.getOperationType().equals("1")) {
-                model.setStatus("草稿");
+                model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
 
             LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.HAVE_PROCESSED.getCode());
@@ -214,7 +199,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
                 }
             }
-            model.setStatus("已提交");
+            model.setStatus(String.valueOf(FlowStatusEnum.SUBMITTED.getCode()));
             execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getProcessInstanceId()).put("comments", "").build());
             Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
             String role = (String) nextNodeInfo.get("role");
@@ -327,7 +312,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         String type = (String) params.get("type");
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
-        params.put("status", FlowStatusEnum.SUBMITTED.getCode() + "");
+        params.put("status", FlowStatusEnum.TO_BE_FINISHED.getCode() + "");
         updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), params);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {