fix(jg)：增补功能修改

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

@@ -241,6 +241,6 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查询当前单位下已注册或未注册工程装置信息", notes = "查询当前单位下已注册或未注册工程装置信息")
     public ResponseModel<List<Map<String, Object>>> getProjectContraptionByCondition() {
         String unitCreditCode = getSelectedOrgInfo().getCompany().getCompanyCode();
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getUnRegisterProjectContraptionList(unitCreditCode));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getProjectContraptionList(unitCreditCode));
     }
 }

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

@@ -146,7 +146,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 																		 @RequestParam(value = "EQU_LIST_CODE", required = false) String EQU_LIST_CODE,
 																		 @RequestParam(value = "EQU_CATEGORY_CODE", required = false) String EQU_CATEGORY_CODE,
 																		 @RequestParam(value = "equList", required = false) String equList,
-																		 @RequestParam(value = "receiveCompanyCode") String receiveCompanyCode,
+																		 @RequestParam(value = "receiveCompanyCode", required = false) String receiveCompanyCode,
 																		 @RequestParam(value = "transferType", required = false) String transferType,
 																		 @RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) {
 		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();

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

@@ -279,4 +279,23 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.saveHistoryEquip(secondMap));
     }
 
+    /**
+     * 根据使用登记证查询工程装置名称
+     * @param useRegistrationCode 使用登记证
+     * @return projectContraption
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/queryByRegistrationCode")
+    @ApiOperation(httpMethod = "POST", value = "根据使用登记证查询工程装置名称", notes = "根据使用登记证查询工程装置名称")
+    public ResponseModel<Object> queryByRegistrationCode(@RequestParam("useRegistrationCode") String useRegistrationCode) {
+        ReginParams selectedOrgInfo = getSelectedOrgInfo();
+        String companyCode = selectedOrgInfo.getCompany().getCompanyCode();
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        String useUnitCreditCode = "个人主体".equals(companyType) && companyCode.contains("_")? companyCode.split("_", 2)[1]
+                : companyCode;
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("useRegistrationCode", useRegistrationCode);
+        map.put("useUnitCreditCode", useUnitCreditCode);
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.queryByRegistrationCode(map));
+    }
 }

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

@@ -55,5 +55,5 @@ public interface IIdxBizJgRegisterInfoService {
      * @param useUnitCreditCode 单位统一信用代码
      * @return 查询单位下工程装置信息
      */
-    List<Map<String, Object>> getUnRegisterProjectContraptionList(String useUnitCreditCode);
+    List<Map<String, Object>> getProjectContraptionList(String useUnitCreditCode);
 }

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

@@ -2514,6 +2514,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegistration").getEquipInFlow(useUnitCreditCode);
         if ("8300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 管道
+            if (jsonObject.get("projectContraption") == null) {
+                throw new BadRequest("请先选择工程装置后，再选择设备信息！");
+            }
             return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records);
         } else if ("2300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 气瓶
             List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
@@ -3123,7 +3126,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public List<Map<String, Object>> getUnRegisterProjectContraptionList(String useUnitCreditCode) {
-        return this.baseMapper.getUnRegisterProjectContraptionList(useUnitCreditCode);
+    public List<Map<String, Object>> getProjectContraptionList(String useUnitCreditCode) {
+        return this.baseMapper.getProjectContraptionList(useUnitCreditCode);
     }
 }
\ No newline at end of file

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

@@ -661,11 +661,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             CompanyBo company = reginParams.getCompany();
 
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
-            if (CollectionUtils.isEmpty(equipmentLists) || equipmentLists.stream()
-                    .map(v -> (String) v.get("equDefine"))
-                    .distinct()
-                    .count() != 1) {
-                throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同设备品种！");
+            if (CollectionUtils.isEmpty(equipmentLists)) {
+                throw new BadRequest( "请选择设备信息!");
             }
             // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
             checkForRepeatUsedEquip(map, equipmentLists, reginParams);
@@ -2951,4 +2948,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
         certificateChangeRecordService.save(jgCertificateChangeRecord);
     }
+
+    public Object queryByRegistrationCode(HashMap<String, Object> map) {
+        LambdaQueryWrapper<JgUseRegistration> queryWrapper = new LambdaQueryWrapper<JgUseRegistration>()
+                .eq(JgUseRegistration::getIsDelete, false)
+                .eq(JgUseRegistration::getUseRegistrationCode, map.get("useRegistrationCode"))
+                .eq(JgUseRegistration::getUseUnitCreditCode, map.get("useUnitCreditCode"))
+                .eq(JgUseRegistration::getIsAddEquip, "0")
+                .ne(JgUseRegistration::getStatus, "已作废");
+        return this.baseMapper.selectOne(queryWrapper);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
 public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterInfo> {
 
     @Select("select \"USE_ORG_CODE\" from idx_biz_jg_register_info where \"RECORD\" = #{equipCode}")
-   String getUseOrgCodeByEquip(@Param("equipCode") String equipCode);
+    String getUseOrgCodeByEquip(@Param("equipCode") String equipCode);
 
     @Select("update idx_biz_jg_register_info set \"USE_ORG_CODE\" = #{useOrgCode} where \"RECORD\" = #{equipCode}")
     Boolean updateUseOrgCodeByEquip(@Param("equipCode") String equipCode,@Param("useOrgCode") String useOrgCode);
@@ -32,15 +32,20 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     List<Map<String, Object>> esSynchronousProjectContraption();
 
     @Select("SELECT\n" +
-            "\tjui.PROJECT_CONTRAPTION AS value \n" +
+            "\tjui.PROJECT_CONTRAPTION AS value,\n" +
+            "\ttjur.use_registration_code\n" +
             "FROM\n" +
             "\tidx_biz_jg_use_info jui\n" +
             "\tLEFT JOIN idx_biz_jg_register_info jri ON jri.\"RECORD\" = jui.\"RECORD\"\n" +
+            "\tLEFT JOIN tzs_jg_use_registration_eq tjure ON tjure.\"equ_id\" = jui.\"RECORD\"\n" +
+            "\tLEFT JOIN tzs_jg_use_registration tjur ON tjure.\"equip_transfer_id\" = tjur.\"sequence_nbr\"\n" +
             "WHERE\n" +
-            "\tjui.USE_UNIT_CREDIT_CODE = #{useUnitCreditCode} \n" +
+            "\tjui.USE_UNIT_CREDIT_CODE = #{useUnitCreditCode}\n" +
             "\tAND jui.PROJECT_CONTRAPTION IS NOT NULL\n" +
             "\tAND jri.\"USE_ORG_CODE\" IS NULL\n" +
+            "\tAND tjur.use_registration_code IS NULL\n" +
+            "\tAND tjur.status <> '已完成'\n" +
             "GROUP BY\n" +
             "\tjui.PROJECT_CONTRAPTION")
-    List<Map<String, Object>> getUnRegisterProjectContraptionList(String useUnitCreditCode);
+    List<Map<String, Object>> getProjectContraptionList(String useUnitCreditCode);
 }