1.压力管道批量模式，使用登记url增加equ_LIST_CODE 打开详情判断显示哪个表单使用

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskMessageDto.java

@@ -69,4 +69,11 @@ public class TaskMessageDto {
      * 登记类型（新增使用登记，历史使用登记，特殊使用登记）
      */
     String regType;
+
+
+    /**
+     * 设备种类code
+     */
+    String EQU_LIST_CODE;
+
 }

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/JgUseRegistrationServiceImpl.java

@@ -224,6 +224,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private DataDictionaryServiceImpl dataDictionaryServiceImpl;
     @Autowired
     private IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
+    @Autowired
+    private RegistrationInfoMapper registrationInfoMapper;
 
 
     /**
@@ -658,6 +660,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
                     taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
+                    taskMessageDto.setEQU_LIST_CODE(String.valueOf(map.get("EQU_LIST_CODE")));
                     // 数据参数
                     dto.setModel(taskMessageDto);
                     // 摘要
@@ -876,7 +879,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")), map);
                 }
             } else {
-                String equType = this.baseMapper.getEquType(String.valueOf(map.get("EQU_LIST_CODE")));
+                String equType = this.baseMapper.getEquType(equListCode);
+                TaskMessageDto  messageDto = BeanUtil.copyProperties(useRegistration, TaskMessageDto.class);
+                messageDto.setEQU_LIST_CODE(equListCode);
                 TaskModelDto dto = TaskModelDto.builder()
                         .model(BeanUtil.copyProperties(useRegistration, TaskMessageDto.class))
                         .taskContent("来自" + equType + "的业务办理,"
@@ -886,7 +891,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         .relationId(String.valueOf(useRegistration.getSequenceNbr()))
                         .nextExecuteUser("")
                         .build();
-
                 commonServiceImpl.buildTaskModel(Collections.singletonList(dto));
             }
             // 设备数据存历史数据，在流程完成时使用
@@ -959,6 +963,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+                    taskMessageDto.setEQU_LIST_CODE(String.valueOf(jsonObject.get("EQU_LIST_CODE")));
                     // taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
                     taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
@@ -1300,6 +1305,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
                     taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
+                    taskMessageDto.setEQU_LIST_CODE(String.valueOf(jsonObject.get("EQU_LIST_CODE")));
                     taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -1613,7 +1619,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
-
         LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
         jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
         List<JgUseRegistrationEq> jgUseRegistrationEqList = jgRelationEquipMapper.selectList(jgUseRegEqWrapper);
@@ -1621,6 +1626,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!jgUseRegistrationEqList.isEmpty()) {
             String equId = jgUseRegistrationEqList.get(0).getEquId();
             taskMessageDto.setEquipId(equId);
+            taskMessageDto.setEQU_LIST_CODE(this.getEquipListCode(equId));
 //            dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
             dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         }
@@ -1631,6 +1637,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         commonServiceImpl.buildTaskModel(list);
     }
 
+    private String getEquipListCode(String record) {
+        IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record).select(TzsBaseEntity::getSequenceNbr,IdxBizJgRegisterInfo::getEquList));
+        if(registerInfo != null){
+          return  registerInfo.getEquList();
+        }
+        return null;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public void flowExecute(Long id, String instanceId, String operate, String comment, String carNumber, String manageType, String nextTaskId, JSONObject jsonObject) {
@@ -3010,6 +3024,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         BeanUtils.copyProperties(taskV2Model, taskModelDto);
                         TaskMessageDto taskMessageDto = new TaskMessageDto();
                         BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+                        setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
                         taskModelDto.setModel(taskMessageDto);
                         taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                         taskModelDto.setStartUserId(workflowResultDto.getExecutorId());
@@ -3036,6 +3051,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    private void setEquListForWorkSpace(JgUseRegistration jgUseRegistration, TaskMessageDto taskMessageDto) {
+        LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
+        List<JgUseRegistrationEq> jgUseRegistrationEqList = jgRelationEquipMapper.selectList(jgUseRegEqWrapper);
+        if (!jgUseRegistrationEqList.isEmpty()) {
+            String equId = jgUseRegistrationEqList.get(0).getEquId();
+            taskMessageDto.setEQU_LIST_CODE(this.getEquipListCode(equId));
+        }
+    }
+
     /**
      * 按单位办理或按台套办理
      *