fix(jg):设备移交

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -154,4 +155,7 @@ public class JgEquipTransferDto extends BaseDto {
 
     @ApiModelProperty(value = "工作流下一节点任务id")
     private String nextTaskId;
+
+    @ApiModelProperty(value = "工程装置表seq--压力管道用")
+    private String projectContraptionSeq;
 }

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

@@ -228,4 +228,10 @@ public class JgEquipTransfer extends BaseEntity {
      */
     @TableField(value = "equ_list_code")
     private String equListCode;
+
+    /**
+     * 工程装置表seq--压力管道用
+     */
+    @TableField(value = "project_contraption_seq")
+    private String projectContraptionSeq;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -61,9 +61,11 @@
             (select name from tz_equipment_category tec1 where tec1.code = ri."EQU_LIST") AS equList,
             (select name from tz_equipment_category tec2 where tec2.code = ri."EQU_CATEGORY") AS equCategory,
             (select name from tz_equipment_category tec3 where tec3.code = ri."EQU_DEFINE") AS equDefine
-        FROM
-            tzs_jg_equip_transfer jet
-                LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
+        FROM tzs_jg_equip_transfer jet
+                 LEFT JOIN (SELECT *,
+                                   ROW_NUMBER() OVER (PARTITION BY equip_transfer_id ORDER BY equip_transfer_id) AS rn
+                            FROM tzs_jg_equip_transfer_eq) ete
+                           ON ete.equip_transfer_id = jet.sequence_nbr AND ete.rn = 1
                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
                 LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
@@ -184,6 +186,7 @@
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
             jet.task_name AS taskName,
+            jet.project_contraption_seq AS projectContraptionSeq,
             ri.product_name AS productName,
             ri.brand_name AS brandName,
             ri.equ_type AS equType,
@@ -221,9 +224,11 @@
             (select name from tz_equipment_category tec WHERE ri."EQU_CATEGORY"::text = tec.code::text) AS equDefine,
             (select SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE ri.RECORD = oi.RECORD) AS supervisoryCode,
             ete.equ_id AS equId
-        FROM
-            tzs_jg_equip_transfer jet
-            LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
+        FROM tzs_jg_equip_transfer jet
+                 LEFT JOIN (SELECT *,
+                                   ROW_NUMBER() OVER (PARTITION BY equip_transfer_id ORDER BY equip_transfer_id) AS rn
+                            FROM tzs_jg_equip_transfer_eq) ete
+                           ON ete.equip_transfer_id = jet.sequence_nbr AND ete.rn = 1
             LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
             LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
             LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.common.BaseException;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -145,5 +147,26 @@ public class JgEquipTransferController extends BaseController {
         }
         return ResponseHelper.buildResponse(map);
     }
+
+
+    /**
+     * 查询有使用登记证，不在流程中的，已纳管的，装置父ID为空的数据
+     *
+     * @param useUnitCreditCode 使用单位code
+     * @param current           当前页
+     * @param size              每页数
+     * @return page
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/finishSy/proCon")
+    @ApiOperation(value = "查询指定使用单位下的可用装置，已纳管且使用登记证编号为空或者null", notes = "不包括流程中的")
+    public ResponseModel<IPage<IdxBizJgProjectContraption>> getJgProjectContraptionPage(@RequestParam String useUnitCreditCode,
+                                                                                        @RequestParam(value = "current") int current,
+                                                                                        @RequestParam(value = "size") int size) {
+        Page<IdxBizJgProjectContraption> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.getJgProjectContraptionPage(useUnitCreditCode, page));
+    }
 }
 

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

@@ -1306,10 +1306,8 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(noticeObj);
             return jgMaintenanceContractServiceImpl.saveOrSubmit(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.SBYJ.getBusinessCode())) {
-
-            JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
-            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
-            jsonObject.put("businessCode", type);
+            noticeObj.put("businessCode", type);
+            JSONObject jsonObject = new JSONObject(noticeObj);
             return jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
         } else if (type.contains(ApplicationFormTypeEnum.ZX.getBusinessCode()) || type.contains(ApplicationFormTypeEnum.BF.getBusinessCode())) {
             noticeObj.put("cancelType", type.equals("BF_ZX") ? "1" : "2");

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

@@ -1166,11 +1166,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                             .filter(x -> "8300".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
-                if (EquipmentClassifityEnum.YLGD.getCode().equals(equList) && "black".equals(dataSource)) {
-                    return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
-                            .filter(x -> !"8300".equals(x.getDictDataKey()))
-                            .collect(Collectors.toList());
-                }
+                // if (EquipmentClassifityEnum.YLGD.getCode().equals(equList) && "black".equals(dataSource)) {
+                //     return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
+                //             .filter(x -> !"8300".equals(x.getDictDataKey()))
+                //             .collect(Collectors.toList());
+                // }
             }
             return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList);
         }

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

@@ -5,11 +5,13 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -30,7 +32,12 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -62,6 +69,8 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static java.util.stream.Collectors.toSet;
+
 /**
  * 设备移交服务实现类
  *
@@ -73,6 +82,8 @@ import java.util.stream.Stream;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService, ICompensateFlowDataOfRedis<JgEquipTransfer> {
     private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
+    private static final String record = "record";
+    private static final String sequenceNbr = "sequenceNbr";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
 
     private static final String SUBMIT_TYPE_FLOW = "1";
@@ -80,11 +91,13 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private final JgEquipTransferEqServiceImpl equipTransferEqService;
     private final RedisUtils redisUtils;
     private final TzsServiceFeignClient tzsServiceFeignClient;
-
+    private final IdxBizJgOtherInfoServiceImpl idxBizJgOtherInfoServiceImpl;
+    private final IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoServiceImpl;
+    private final IdxBizJgUseInfoServiceImpl idxBizJgUseInfoServiceImpl;
     private final CmWorkflowServiceImpl cmWorkflowService;
     private final IJgInstallationNoticeService jrmInstallationNoticeService;
     private final IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
-
+    private final IdxBizJgProjectContraptionServiceImpl jgProjectContraptionService;
     @Lazy
     private final CommonServiceImpl commonService;
 
@@ -107,20 +120,31 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         JgEquipTransferDto model = JSON.parseObject(JSONObject.toJSONString(jsonObjectMap), JgEquipTransferDto.class);
 
         convertField(model);
+        String equListCode = model.getEquList();
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
             throw new BadRequest("请选择设备!");
         }
 
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
-            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {// 放在最后面防止前面有异常
+            // 如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
             CompanyBo company = reginParams.getCompany();
-            deviceList.forEach(device -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
-                    .equipRepeatUsedCheck(String.valueOf(device.get("SEQUENCE_NBR")), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
-                            company.getCompanyCode().split("_")[1] :
-                            company.getCompanyCode()));
+            if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
+                deviceList.forEach(proCon -> {
+                    String proConSeq = String.valueOf(proCon.get(sequenceNbr));
+                    List<Map<String, Object>> equipList = jgProjectContraptionService.getBaseMapper().selectEquipList(proConSeq);
+                    equipList.forEach(equip -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
+                            .equipRepeatUsedCheck(String.valueOf(equip.get(record)), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                    company.getCompanyCode().split("_")[1] :
+                                    company.getCompanyCode()));
+                });
+            } else {
+                deviceList.forEach(device -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
+                        .equipRepeatUsedCheck(String.valueOf(device.get("SEQUENCE_NBR")), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                company.getCompanyCode().split("_")[1] :
+                                company.getCompanyCode()));
+            }
         }
-
         //获取申请单编号
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(jsonObjectMap.get("businessCode"))), deviceList.size());
         this.handleResponseModel(listResponseModel, "告知单获取失败: ");
@@ -135,22 +159,47 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         IntStream.range(0, deviceList.size()).forEach(i -> {
             Map<String, Object> obj = deviceList.get(i);
             String applyNo = applyNoList.get(i);
-
-            JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);
-            JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
-            transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            transfer.setEquList(Objects.toString(obj.get("EQU_LIST"), ""));
-            transfer.setEquListCode(Objects.toString(obj.get("EQU_LIST_CODE"), ""));
-            transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"), ""));
-            transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"), ""));
-            transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"), ""));
-            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
-            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
-            transfer.setUseInnerCode(Objects.toString(obj.get("USE_INNER_CODE"), ""));
-            transfer.setEquAddress(Objects.toString(obj.get("ADDRESS"), ""));
-            transfer.setEquCode(Objects.toString(obj.get("EQU_CODE"), ""));
-            transferList.add(transfer);
-            equipTransferEqList.add(jgEquipTransferEq);
+            if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
+                String proConSeq = String.valueOf(obj.get(sequenceNbr));
+                IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.lambdaQuery().eq(IdxBizJgProjectContraption::getSequenceNbr, proConSeq).one();
+                List<Map<String, Object>> equipList = jgProjectContraptionService.getBaseMapper().selectEquipList(proConSeq);
+                equipList.forEach(equip -> {
+                    JgEquipTransferEq jgEquipTransferEq = new JgEquipTransferEq()
+                            .setEquId(String.valueOf(equip.get(record)))
+                            .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();
+                // transfer.setEquDefine();
+                transfer.setSupervisoryCode(org.apache.commons.lang3.StringUtils.join(idxBizJgOtherInfoServiceImpl.lambdaQuery().in(IdxBizJgOtherInfo::getRecord, records).list().stream().filter(Objects::nonNull).map(IdxBizJgOtherInfo::getSupervisoryCode).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).collect(Collectors.toList()), ","));
+                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).collect(Collectors.toList()), ","));
+                transfer.setEquAddress(projectContraption.getAddress());
+                transfer.setEquCode(org.apache.commons.lang3.StringUtils.join(idxBizJgRegisterInfoServiceImpl.lambdaQuery().in(IdxBizJgRegisterInfo::getRecord, records).list().stream().filter(Objects::nonNull).map(IdxBizJgRegisterInfo::getEquCode).collect(Collectors.toList()), ","));
+                transferList.add(transfer);
+            } else {
+                JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);
+                JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
+                transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
+                transfer.setEquList(Objects.toString(obj.get("EQU_LIST"), ""));
+                transfer.setEquListCode(Objects.toString(obj.get("EQU_LIST_CODE"), ""));
+                transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"), ""));
+                transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"), ""));
+                transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"), ""));
+                transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
+                transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
+                transfer.setUseInnerCode(Objects.toString(obj.get("USE_INNER_CODE"), ""));
+                transfer.setEquAddress(Objects.toString(obj.get("ADDRESS"), ""));
+                transfer.setEquCode(Objects.toString(obj.get("EQU_CODE"), ""));
+                transferList.add(transfer);
+                equipTransferEqList.add(jgEquipTransferEq);
+            }
         });
 
         baseMapper.insertBatchSomeColumn(transferList);
@@ -645,7 +694,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             // 兼容老数据
             if (his == null) {
                 // 1.设备信息
-                Map<String, Object> equipMap = getEquipInfonNew(sequenceNbr);
+                Map<String, Object> equipMap = (Map<String, Object>) getEquipInfonNew(sequenceNbr);
                 // 2.移交业务字段信息
                 equipMap.putAll(equipTransferInfo);
                 return equipMap;
@@ -656,7 +705,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 return his;
             }
         } else {
-            Map<String, Object> equipMap = getEquipInfonNew(sequenceNbr);
+            Map<String, Object> equipMap = (Map<String, Object>) getEquipInfonNew(sequenceNbr);
             return Stream.concat(equipTransferInfo.entrySet().stream(),
                             equipMap.entrySet().stream())
                     .filter(entry -> entry.getValue() != null)
@@ -665,16 +714,22 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
     }
 
-    private Map<String, Object> getEquipInfonNew(Long sequenceNbr) {
+    private Object getEquipInfonNew(Long sequenceNbr) {
         List<Map<String, Object>> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
-        Map<String, Object> equipMap = null;
+
         if (equipmentInfos != null && !equipmentInfos.isEmpty()) {
-            String equId = (String) equipmentInfos.get(0).get("equId");
-            if (equId != null) {
-                equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
+            String equList = String.valueOf(equipmentInfos.get(0).get("equList"));
+            if (EquipmentClassifityEnum.YLGD.getName().equals(equList)) {
+                String projectContraptionSeq = String.valueOf(equipmentInfos.get(0).get("projectContraptionSeq"));
+                return jgProjectContraptionService.details(projectContraptionSeq).get("equipInfo");
+            } else {
+                String equId = (String) equipmentInfos.get(0).get("equId");
+                if (equId != null) {
+                    return idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
+                }
             }
         }
-        return equipMap;
+        return null;
     }
 
     /**
@@ -708,7 +763,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .map(item -> {
                     ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                     dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
-                    dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
+                    // dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
                     dto.setCompleteFirstTask(Boolean.TRUE);
                     dto.setNextExecuteUserCompanyCode(receiveOrgCode);
                     return dto;
@@ -830,7 +885,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
     @Override
     public boolean beforeCheck(JgEquipTransfer jgEquipTransfer) {
-        return jgEquipTransfer.getInstanceId() != null && !jgEquipTransfer.getApplyStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode())) &&!jgEquipTransfer.getApplyStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));
+        return jgEquipTransfer.getInstanceId() != null && !jgEquipTransfer.getApplyStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode())) && !jgEquipTransfer.getApplyStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));
     }
 
     @Override
@@ -838,4 +893,13 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         commonService.saveExecuteFlowData2Redis(jgEquipTransfer.getInstanceId(), this.buildInstanceRuntimeData(jgEquipTransfer));
     }
 
+    public IPage<IdxBizJgProjectContraption> getJgProjectContraptionPage(String useUnitCreditCode, Page<IdxBizJgProjectContraption> page) {
+        if (useUnitCreditCode.contains("_")) {
+            useUnitCreditCode = useUnitCreditCode.split("_")[1];
+        }
+        LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode).eq(IdxBizJgProjectContraption::getIsIntoManagement, true).eq(IdxBizJgProjectContraption::getEquList, "8000").isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode).ne(IdxBizJgProjectContraption::getUseRegistrationCode, "");
+        return jgProjectContraptionService.page(page, wrapper);
+    }
+
 }
\ No newline at end of file