Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -88,7 +88,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
 
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
-    private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("待提交", "已驳回", "已撤回", "已作废", "已完成");
 
     private final String PROCESS_DEFINITION_KEY = "deactivateEnable";
 
@@ -160,6 +160,10 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
 
             if (SUBMIT_TYPE_FLOW.equals(submit)) {
                 if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))) {
+                    String instanceId = String.valueOf(map.get("instanceId"));
+                    LambdaQueryWrapper<JgEnableDisable> queryWrapper = new LambdaQueryWrapper<JgEnableDisable>().eq(JgEnableDisable::getInstanceId, instanceId);
+                    JgEnableDisable jgEnableDisable1 = this.baseMapper.selectOne(queryWrapper);
+                    BeanUtils.copyProperties(jgEnableDisable1, jgEnableDisable);
                     // 只调用执行API，返回下个节点信息，用于填充业务字段
                     // 组装信息
                     TaskResultDTO dto = new TaskResultDTO();
@@ -246,6 +250,18 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
                 jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
                 jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
+                // 设备种类
+                String equListCode = String.valueOf(map.getString("equListCode"));
+                jgEnableDisable.setEquListCode(equListCode);
+                jgEnableDisable.setEquListName(EquipmentClassifityEnum.getNameByCode(equListCode));
+                // 使用登记证相关
+                List<String> certificates = (List<String>) map.get("sequenceNbrs");
+                LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.in(JgUseRegistrationManage::getSequenceNbr, certificates.stream().map(Long::parseLong).collect(Collectors.toList()));
+                lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode);
+                List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
+                jgEnableDisable.setRegistrationManageId(String.join(",", certificates));
+                jgEnableDisable.setUseRegistrationCode(jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.joining(",")));
                 jgEnableDisable.setRemark(map.get("remark") == null ? "" : map.get("remark").toString());
                 jgEnableDisable.setApplyDate(new Date());
                 jgEnableDisable.setApplyType(String.valueOf(map.get("applyType")));
@@ -257,11 +273,14 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.FALSE);
             } else {
                 // 编辑
-                jgEnableDisable.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
                 this.baseMapper.updateById(jgEnableDisable);
-                LambdaQueryWrapper<JgEnableDisableEq> lambda = new QueryWrapper<JgEnableDisableEq>().lambda();
-                lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, String.valueOf(map.get("sequenceNbr")));
-                jgEnableDisableEqService.getBaseMapper().delete(lambda);
+                // 关联设备表
+                for (Map<String, Object> equipment : equipments) {
+                    JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
+                    jgEnableDisableEq.setEquId(String.valueOf(equipment.get("SEQUENCE_NBR")));
+                    jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
+                    jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
+                }
             }
             if (!SUBMIT_TYPE_FLOW.equals(submit)) {
                 // 暂存任务
@@ -824,6 +843,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             resultMap.putAll(jsonObject);
         }
         resultMap.put("receiveOrgCode", enableDisable.getReceiveCompanyCode() + '_' + enableDisable.getReceiveOrgName());
+        resultMap.put("sequenceNbr", enableDisable.getSequenceNbr());
         commonService.convertStringToJsonobject(resultMap, new String[]{"otherAccessories"});
         return resultMap;
     }