Merge branch 'refs/heads/develop_tzs_main' into develop_tzs_test

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

@@ -1329,7 +1329,7 @@
                 </if>
             </otherwise>
         </choose>
-        ORDER BY ui.REC_DATE DESC
+        ORDER BY factoryNum ASC,ui.REC_DATE DESC
         ) aa
         <where>
             <if test="jsonObject.equDefineName != null and jsonObject.equDefineName != ''">
@@ -1450,7 +1450,7 @@
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}
         </foreach>
-        ORDER BY ui.REC_DATE DESC
+        ORDER BY factoryNum ASC,ui.REC_DATE DESC
     </select>
     <select id="queryForFlowingEquipList"
             resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">

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

@@ -232,4 +232,17 @@ public class JgChangeRegistrationUnitController extends BaseController {
         return ResponseHelper.buildResponse(businessType.equals("1") ? "单位变更" : "注销" + "业务，" + "申请单号：" + applyNos + "数据修改成功");
     }
 
+    /**
+     * 处理单位变更流程结束，业务未结束单子问题
+     * @param applyNo 申请单号
+     * @return s
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handleChangeRegistrationUnitWrongData")
+    @ApiOperation(httpMethod = "POST", value = "处理单位变更流程结束，业务未结束单子问题", notes = "处理单位变更流程结束，业务未结束单子问题")
+    public ResponseModel<Object> handleChangeRegistrationUnitWrongData(@RequestParam("applyNo") String applyNo) {
+        jgChangeRegistrationUnitServiceImpl.handleChangeRegistrationUnitWrongData(applyNo);
+        return ResponseHelper.buildResponse("ok");
+    }
+
 }

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

@@ -523,14 +523,13 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
         return getCheckResultMap(projectContraptionIdList, resultMap, inUseTimeMap);
     }
 
-    private Map<String, Boolean> getCheckResultMap(List<Long> projectContraptionIdList, Map<String, Boolean> resultMap, List<Map<String, Integer>> inUseTimeMap) {
+    private Map<String, Boolean> getCheckResultMap(List<Long> projectContraptionIdList,Map<String, Boolean> resultMap,List<Map<String, Integer>> inUseTimeMap) {
         for (Long projectContraptionId : projectContraptionIdList) {
             Optional<Integer> inUseCountOpt = inUseTimeMap.stream()
-                    .filter(map -> projectContraptionId.toString().equals(map.get("project_contraption_id")))
+                    .filter(map -> String.valueOf(projectContraptionId)
+                            .equals(String.valueOf(map.get("project_contraption_id"))))
                     .map(map -> map.get("inUseNumber"))
-                    .filter(Objects::nonNull)
                     .findFirst();
-
             Integer inUseCount = inUseCountOpt.orElse(0);
             resultMap.put(String.valueOf(projectContraptionId), inUseCount <= 0);
         }

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

@@ -1231,10 +1231,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
             list.add(esEquipmentCategoryDto);
         }
-        // 删除校验，被引用时不可删除。管道不做是否引用校验，直接删除已有管道
-        if(!PipelineEnum.PRESSURE_PIPELINE.getCode().equals(map.get("equList"))) {
-            this.checkForDelete(records);
-        }
+        // 删除校验，被引用时不可删除。管道不做是否引用校验，直接删除已有管道(20251121注释，管道引用不能删除)
+        //if(!PipelineEnum.PRESSURE_PIPELINE.getCode().equals(map.get("equList"))) {
+            //this.checkForDelete(records);
+        //}
+        this.checkForDelete(records);
         if (CollUtil.isNotEmpty(records)) {
             // 删除涉及的19张表的数据
             superviseInfoMapper.deleteDataAll(records);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -105,7 +105,7 @@
         LEFT JOIN tzs_jg_use_registration ur
         ON ur.project_contraption_id = pl.project_contraption_id
         AND ur.is_delete = 0
-        AND ur.project_contraption_id != null
+        AND ur.project_contraption_id IS NOT NULL
         AND ur.status NOT IN ('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
         LEFT JOIN tzs_jg_installation_notice ins
         ON ins.project_contraption_id = pl.project_contraption_id
@@ -382,7 +382,7 @@
         WITH target_use AS MATERIALIZED (
         SELECT "RECORD", project_contraption_id
         FROM idx_biz_jg_use_info
-        WHERE project_contraption_id != null and
+        WHERE project_contraption_id is not null and
         project_contraption_id IN
         <foreach collection="projectContraptionIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}