refact(jg)：设备移交调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipTransfer.java

@@ -157,7 +157,7 @@ public class JgEquipTransfer extends BaseEntity {
     /**
      * 设备监管码
      */
-    @TableField(exist = false)
+    @TableField(value = "supervisory_code")
     private String supervisoryCode;
 
     /**

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

@@ -160,7 +160,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             this.handleApplyNoList(applyNoList);
             //启动工作流
             List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getInstallUnitCreditCode(), submitType, deviceList);
-
             List<JgEquipTransfer> transferList = new ArrayList<>();
             List<JgEquipTransferEq> equipTransferEqList = new ArrayList<>();
             IntStream.range(0, deviceList.size()).forEach(i -> {
@@ -176,56 +175,16 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                                 .setEquipTransferId(applyNo);
                         equipTransferEqList.add(jgEquipTransferEq);
                     });
-                    List<String> records = equipList.stream().map(equ -> String.valueOf(equ.get(record))).collect(Collectors.toList());
                     JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
                     transfer.setProjectContraptionSeq(proConSeq);
                     transfer.setEquList(EquipmentClassifityEnum.YLGD.getName());
                     transfer.setEquListCode(equListCode);
-                    transfer.setEquCategory(equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, idxBizJgRegisterInfoServiceImpl.lambdaQuery().eq(IdxBizJgRegisterInfo::getRecord, equipList.get(0).get(record)).one().getEquCategory())).getName());
-                    transfer.setEquDefine(equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, idxBizJgRegisterInfoServiceImpl.lambdaQuery().eq(IdxBizJgRegisterInfo::getRecord, equipList.get(0).get(record)).one().getEquDefine())).getName());
-                    transfer.setSupervisoryCode(org.apache.commons.lang3.StringUtils.join(
-                            idxBizJgOtherInfoServiceImpl.lambdaQuery()
-                                    .in(IdxBizJgOtherInfo::getRecord, records)
-                                    .list()
-                                    .stream()
-                                    .filter(Objects::nonNull)
-                                    .map(IdxBizJgOtherInfo::getSupervisoryCode)
-                                    .filter(Objects::nonNull)
-                                    .distinct()
-                                    .collect(Collectors.toList()), ","
-                    ));
-                    transfer.setProductName(org.apache.commons.lang3.StringUtils.join(
-                            idxBizJgRegisterInfoServiceImpl.lambdaQuery()
-                                    .in(IdxBizJgRegisterInfo::getRecord, records)
-                                    .list()
-                                    .stream()
-                                    .filter(Objects::nonNull)
-                                    .map(IdxBizJgRegisterInfo::getProductName)
-                                    .filter(Objects::nonNull)
-                                    .distinct()
-                                    .collect(Collectors.toList()), ","
-                    ));
+                    transfer.setEquCategory(projectContraption.getEquCategory());
+                    transfer.setEquDefine(projectContraption.getEquDefine());
                     transfer.setUseRegistCode(projectContraption.getUseRegistrationCode());
-                    transfer.setUseInnerCode(org.apache.commons.lang3.StringUtils.join(
-                            idxBizJgUseInfoServiceImpl.lambdaQuery()
-                                    .in(IdxBizJgUseInfo::getRecord, records)
-                                    .list()
-                                    .stream()
-                                    .filter(Objects::nonNull)
-                                    .map(IdxBizJgUseInfo::getUseInnerCode)
-                                    .distinct()
-                                    .collect(Collectors.toList()), ","));
                     transfer.setEquAddress(projectContraption.getAddress());
                     transfer.setSupervisoryCode(projectContraption.getSupervisoryCode());
-                    transfer.setEquCode(org.apache.commons.lang3.StringUtils.join(
-                            idxBizJgRegisterInfoServiceImpl.lambdaQuery()
-                                    .in(IdxBizJgRegisterInfo::getRecord, records)
-                                    .list()
-                                    .stream()
-                                    .filter(Objects::nonNull)
-                                    .map(IdxBizJgRegisterInfo::getEquCode)
-                                    .distinct()
-                                    .collect(Collectors.toList()), ","));
+                    transfer.setEquCode(projectContraption.getEquCode());
                     transferList.add(transfer);
                 } else {
                     JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);