fix(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -1513,11 +1513,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
         // 设备类别
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
-            boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(map.getString("EQU_CATEGORY_CODE").toLowerCase())));
+            boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(map.getString("EQU_CATEGORY_CODE"))));
         }
         // 设备类别编码
         if (!ObjectUtils.isEmpty(map.getString("EQU_DEFINE_CODE"))) {
-            boolMust.must(QueryBuilders.termQuery("EQU_DEFINE_CODE", QueryParser.escape(map.getString("EQU_DEFINE_CODE").toLowerCase())));
+            boolMust.must(QueryBuilders.termQuery("EQU_DEFINE_CODE", QueryParser.escape(map.getString("EQU_DEFINE_CODE"))));
         }
 
         // 地市

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -30,7 +30,7 @@ public enum ApplicationFormTypeEnum {
     YZBG("YZBG", "DJ_YZ"),//移装变更登记
     DWBG("DWBG", "DJ_DW"),//单位变更登记
     JY("JY", ""),
-    JG("JG", ""),// 检验结果
+    JG("SE", ""),// 检验结果
     ZX("ZX", "BF_YZ"),//电梯（设备）移装注销
     BF("BF", "BF_ZX"),//电梯（设备）报废注销
     GMBG("GMBG", "DJ_GM"),//更名变更

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

@@ -264,13 +264,7 @@
     <select id="queryJgProjectContraptionPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
         select
-            *
-        from
-        (
-            select
-               pc.*,
-              (select count(distinct ibjui.record) from idx_biz_jg_use_info ibjui, idx_biz_jg_inspection_detection_info di where ibjui."RECORD" = di."RECORD"  and ibjui.project_contraption_id=pc.sequence_nbr and  di."INSPECT_TYPE" <![CDATA[<>]]> '') as inspectNum,
-              (select count(1) from idx_biz_jg_use_info ibjui where ibjui.project_contraption_id= pc.sequence_nbr) as totalNum
+           pc.*
          from
              idx_biz_jg_project_contraption pc
          where
@@ -312,14 +306,7 @@
              </choose>
              and not EXISTS (SELECt 1 FROM tz_jyjc_inspection_application a where a.status='6611' and a.application_unit_code=#{companyCode} and a.project_contraption_id = pc.sequence_nbr)
              and (pc.project_contraption_parent_id is null or pc.project_contraption_parent_id = '')
-        ) s
-        <where>
-             <if test="params.inspectionType == 'DQJY' and params.equCategory != '8300'">
-                 s.inspectNum = s.totalNum
-                 and  s.inspectNum > 0
-             </if>
-        </where>
-
+             order by pc.sequence_nbr desc
     </select>
 
     <select id="selectEquipListByExport" resultType="java.util.Map">