1.压力管道按照装置报检，联调修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -246,7 +246,7 @@
                     and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
                 </when>
                 <otherwise>
-                    1 = 2
+                    and 1 = 2
                 </otherwise>
             </choose>
         </where>
@@ -275,6 +275,9 @@
             <if test="jyjcInspectionResultModel.inspectionUnitName != '' and jyjcInspectionResultModel.inspectionUnitName != null">
                 and res.inspection_unit_name like concat('%',#{jyjcInspectionResultModel.inspectionUnitName},'%')
             </if>
+            <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
+                and 1 = 2
+            </if>
             <choose>
                 <when test="identity == 'apply'">
                     and res.application_unit_code = #{jyjcInspectionResultModel.companyCode}
@@ -286,7 +289,7 @@
                     and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
                 </when>
                 <otherwise>
-                    1 = 2
+                    and 1 = 2
                 </otherwise>
             </choose>
         </where>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/EnableRuleDataPreparationListener.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
@@ -122,27 +123,52 @@ public class EnableRuleDataPreparationListener implements ApplicationListener<In
         if (!this.getEnableConfig(equipInfoModel.getInspectionType())) {
             return;
         }
-        RegistrationInfo registrationInfo = fetchRegistrationInfo(equipInfoModel.getRecord());
         InspectionEquipInfo inspectionEquipInfo = new InspectionEquipInfo();
-        if (registrationInfo == null) {
-            log.error("未找到设备，报检规则匹配流程结束！");
-            return;
+        if (equipInfoModel.getEquCategory() != null && equipInfoModel.getEquCategory().startsWith("8")) {
+            // 管道逻辑
+            String projectContraptionId = equipInfoModel.getRecord();
+            IdxBizJgProjectContraption projectContraption = jgProjectContraptionMapper.selectById(projectContraptionId);
+            if (projectContraption == null) {
+                log.error("未找到装置，报检规则匹配流程结束！");
+                return;
+            }
+            inspectionEquipInfo.setEquCategory(projectContraption.getEquCategory());
+            inspectionEquipInfo.setEquList(projectContraption.getEquList());
+            inspectionEquipInfo.setEquDefine(projectContraption.getEquDefine());
+            inspectionEquipInfo.setTechParams(new HashMap<>());
+            // 地市
+            UseInfo useInfo = new UseInfo();
+            BeanUtil.copyProperties(projectContraption, useInfo, true);
+            inspectionEquipInfo.setAreaCode(ruleCommonService.getArea(useInfo));
+            // 区县
+            inspectionEquipInfo.setDistrictOrCountyCode(ruleCommonService.getCounty(useInfo));
+        } else {
+            // 非管道逻辑
+            RegistrationInfo registrationInfo = fetchRegistrationInfo(equipInfoModel.getRecord());
+            if (registrationInfo == null) {
+                log.error("未找到设备，报检规则匹配流程结束！");
+                return;
+            }
+            inspectionEquipInfo.setEquCategory(registrationInfo.getEquCategory());
+            inspectionEquipInfo.setEquList(registrationInfo.getEquList());
+            inspectionEquipInfo.setEquDefine(registrationInfo.getEquDefine());
+            inspectionEquipInfo.setTechParams(this.getTechParams(registrationInfo));
+            // 是否球罐 0 1 转 boolean
+            inspectionEquipInfo.setIsBallValve(!"0".equals(registrationInfo.getWhetherSphericalTank()));
+            UseInfo useInfo = ruleCommonService.getUseInfo(equipInfoModel.getRecord());
+            // 地市
+            inspectionEquipInfo.setAreaCode(ruleCommonService.getArea(useInfo));
+            // 区县
+            inspectionEquipInfo.setDistrictOrCountyCode(ruleCommonService.getCounty(useInfo));
         }
-        inspectionEquipInfo.setEquCategory(registrationInfo.getEquCategory());
-        inspectionEquipInfo.setEquList(registrationInfo.getEquList());
-        inspectionEquipInfo.setEquDefine(registrationInfo.getEquDefine());
         inspectionEquipInfo.setComponentKey(equipInfoModel.getComponentKey());
         inspectionEquipInfo.setInspectionType(equipInfoModel.getInspectionType());
         inspectionEquipInfo.setRecord(equipInfoModel.getRecord());
         inspectionEquipInfo.setBizType(getCategoryByType(JYJCTypeEnum.of(inspectionEquipInfo.getInspectionType())));
         inspectionEquipInfo.setUuid(sequence.nextId() + "");
-        inspectionEquipInfo.setTechParams(this.getTechParams(registrationInfo));
-        this.setReginInfo(inspectionEquipInfo, equipInfoModel);
         JyjcInspectionApplicationNoAcceptLog jyjcInspectionApplicationNoAcceptLog = getLastNoAcceptLog(equipInfoModel);
         inspectionEquipInfo.setRequestType(this.buildRequestType(equipInfoModel, jyjcInspectionApplicationNoAcceptLog));
         inspectionEquipInfo.setLastNoAcceptInspectionCode(this.buildLastNoAcceptInspectionCode(jyjcInspectionApplicationNoAcceptLog));
-        // 是否球罐 0 1 转 boolean
-        inspectionEquipInfo.setIsBallValve(!"0".equals(registrationInfo.getWhetherSphericalTank()));
         inspectionEquipInfo.setAppSeq(equipInfoModel.getAppSeq());
         // 触发规则
         publisher.publish(new TouchRuleEvent(this, inspectionEquipInfo));
@@ -159,25 +185,6 @@ public class EnableRuleDataPreparationListener implements ApplicationListener<In
         return inspectionRuleEnableConfig.getValueByFieldName(inspectionType) != null && (Boolean) inspectionRuleEnableConfig.getValueByFieldName(inspectionType);
     }
 
-    private void setReginInfo(InspectionEquipInfo inspectionEquipInfo,InspectionEquipInfoModel equipInfoModel) {
-        String record = equipInfoModel.getRecord();
-        // 压力管道地点取工程装置数据
-        if(equipInfoModel.getEquCategory() != null && equipInfoModel.getEquCategory().startsWith("8")) {
-            IdxBizJgProjectContraption projectContraption = jgProjectContraptionMapper.selectById(record);
-            // 地市
-            UseInfo useInfo = new UseInfo();
-            BeanUtil.copyProperties(projectContraption, useInfo, true);
-            inspectionEquipInfo.setAreaCode(ruleCommonService.getArea(useInfo));
-            // 区县
-            inspectionEquipInfo.setDistrictOrCountyCode(ruleCommonService.getCounty(useInfo));
-        } else {
-            UseInfo useInfo = ruleCommonService.getUseInfo(record);
-            // 地市
-            inspectionEquipInfo.setAreaCode(ruleCommonService.getArea(useInfo));
-            // 区县
-            inspectionEquipInfo.setDistrictOrCountyCode(ruleCommonService.getCounty(useInfo));
-        }
-    }
 
     private String buildLastNoAcceptInspectionCode(JyjcInspectionApplicationNoAcceptLog jyjcInspectionApplicationNoAcceptLog) {
         if (jyjcInspectionApplicationNoAcceptLog != null) {