1.检验检测报检接收，人信息移动到计划排期

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -44,7 +44,7 @@ public enum BusinessTypeEnum {
 
     JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
 
-    JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）"),
+    JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测"),
 
     JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记");
     private final String code;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java

@@ -44,7 +44,7 @@ public enum BusinessTypeEnum {
 
     JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
 
-    JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）");
+    JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测");
     private final String code;
 
     private final String name;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -225,7 +224,7 @@ public class JyjcInspectionApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "接收", notes = "接收")
     @PostMapping(value = "/flow/{type}/receive")
-    public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
+    public ResponseModel executeFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
         params.put("type", type);
         try {
             jyjcInspectionApplicationServiceImpl.doReceive(params);

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSON;
@@ -37,20 +36,22 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.*;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -79,6 +80,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     @Autowired
     EventPublisher eventPublisher;
+
+    @Autowired
+    @Lazy
+    InspectionPlanServiceImpl inspectionPlanService;
     /**
      * 分页查询
      */
@@ -147,7 +152,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
                 String[] inspectionUnit = model.getInspectionUnitCode().split("_");
-                if(inspectionUnit.length == 2){
+                if (inspectionUnit.length == 2) {
                     model.setInspectionUnitCode(inspectionUnit[0]);
                     model.setInspectionUnitName(inspectionUnit[1]);
                 }
@@ -174,7 +179,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
             } else if (model.getOperationType().equals("1")) {  //  工作台暂存、详情保存逻辑
                 String[] inspectionUnit = model.getInspectionUnitCode().split("_");
-                if(inspectionUnit.length == 2){
+                if (inspectionUnit.length == 2) {
                     model.setInspectionUnitCode(inspectionUnit[0]);
                     model.setInspectionUnitName(inspectionUnit[1]);
                 }
@@ -487,7 +492,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
     public Map<String, Object> selectBySeq(Long sequenceNbr) {
-
         JyjcInspectionApplicationModel model = this.getBaseMapper().selectDataBySeq(sequenceNbr);
         Map<String, Object> map = BeanUtil.beanToMap(model);
         List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr);
@@ -523,9 +527,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             map.put("equip", arrayList);
         }
         map.putAll(attMap);
+        this.setPlanData(sequenceNbr, map);
         return map;
     }
 
+    private void setPlanData(Long sequenceNbr, Map<String, Object> map) {
+        JSONObject planData = inspectionPlanService.getDetail(String.valueOf(sequenceNbr));
+        map.put("planData", planData);
+    }
+
     /**
      * 接收
      *
@@ -542,7 +552,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         LambdaQueryWrapper<JyjcInspectionApplication> lambda = new QueryWrapper<JyjcInspectionApplication>().lambda();
         lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr);
         JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda);
-
         String taskId = entity.getNextTaskId();
         //组装信息
         TaskResultDTO task = new TaskResultDTO();
@@ -554,7 +563,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         task.setVariable(map);
         //执行流程
         task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode());
-        ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
+        cmWorkflowService.complete(taskId, task);
         entity.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
         JyjcInspectionApplicationModel model = new JyjcInspectionApplicationModel();
         model.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName());
@@ -564,32 +573,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (StringUtils.isNotBlank(processDescription)) {
             entity.setProcessDescription(processDescription);
         }
-        List<String> persons = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePerson")), String.class);
-        if (CollectionUtil.isNotEmpty(persons)) {
-
-            List<String> personCodes = new ArrayList<>();
-            List<String> personNames = new ArrayList<>();
-            for (String person : persons) {
-                String[] s = person.split("_");
-                personCodes.add(s[0]);
-                personNames.add(s[1]);
-            }
-            String inspectionChargePerson = persons == null ? "" : String.join(",", persons);
-            if (StringUtils.isNotBlank(inspectionChargePerson)) {
-                entity.setInspectionChargePerson(String.join(",", personCodes));
-                entity.setInspectionChargePersonName(String.join(",", personNames));
-            }
-        }
-
-        String inspectionChargePhone = (String) params.get("inspectionChargePhone");
-        if (StringUtils.isNotBlank(inspectionChargePhone)) {
-            entity.setInspectionChargePhone(inspectionChargePhone);
-        }
         this.updateById(entity);
-
         BeanUtils.copyProperties(entity, model);
         updateTaskModel(model);
-
         // 执行接收业务
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
 
@@ -598,12 +584,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             log.warn("JyjcInspectionApplicationModel Not Found！");
             return;
         }
-
-
-        List<JyjcInspectionResult> resultModels = new ArrayList(applicationEquipModels.size());
+        List<JyjcInspectionResult> resultModels = new ArrayList<>();
         List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult();
 
-
         for (int i = 0; i < applicationEquipModels.size(); i++) {
             JyjcInspectionResult resultModel = new JyjcInspectionResult();
             resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
@@ -634,7 +617,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     private void pushInspectionApplication(JyjcInspectionApplicationModel inspectionApplicationModel) {
         // 将检验检测申请信息推送至对应的检验机构
-        if(inspectionApplicationModel.getResultType().equals(ResultTypeEnum.INTEGRATED.getCode())){
+        if (inspectionApplicationModel.getResultType().equals(ResultTypeEnum.INTEGRATED.getCode())) {
             InspectionApplicationPushEvent event = new InspectionApplicationPushEvent(this, inspectionApplicationModel);
             eventPublisher.publish(event);
         }
@@ -676,7 +659,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         //执行流程
         task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode());
         ProcessTaskDTO processTaskDTO = cmWorkflowService.reject(taskId, task);
-        String taskCode = FlowStatusEnum.TO_SUBMITTED.getName();
         String taskName1 = "";
         String nextTaskId = "";
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
@@ -693,7 +675,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
         String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
         if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
-            taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName1 = processTaskDTO.getNextTask().get(0).getName();
             nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         }