fix(jyjc):委托检验bug修改

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/JYJCBusinessTypeEnum.java

@@ -8,6 +8,7 @@ import java.util.List;
 public enum JYJCBusinessTypeEnum {
     DQJY("DQJY","定期检验"),
     SCJY("SCJY","首次检验"),
+    WTJY("WTJY","委托检验"),
 
     AZJDJY("AZJDJY","安装监督检验"),
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BizTypeEnum.java

@@ -23,7 +23,7 @@ public enum BizTypeEnum {
     FIRST_INSPECTION("firstinspect", "定(首)检","116"),
     DETECTION("detection", "电梯检测","117"),
     BUSINESS_OPEN("businessOpen", "检验检测业务开通","114"),
-    ENTRUST("entrust", "委托检验","120");
+    ENTRUST("entrust", "委托检验","122");
 
     private String code;
     private String name;

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

@@ -1391,15 +1391,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
         }
         // 流动时起重机械及厂车可直接做首检
-        if (("5000".equals(equListCode) || "4400".equals(equCategoryCode)) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
+        if (JYJCBusinessTypeEnum.WTJY.getCode().equals(inspectionType) ||
+                (("5000".equals(equListCode) || "4400".equals(equCategoryCode)) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType))) {
+            // 5000/4400 且是首检，或是委托检验，都不需要进入管理
             boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false));
         } else {
-            BoolQueryBuilder shouldBuilder = QueryBuilders.boolQuery();
             // 历史无证设备可做检验
-            shouldBuilder.should(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
-            shouldBuilder.should(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_black"));
-            shouldBuilder.minimumShouldMatch(1);
-            boolMust.must(shouldBuilder);
+            boolMust.must(QueryBuilders.boolQuery()
+                    .should(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true))
+                    .should(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_black"))
+                    .minimumShouldMatch(1));
         }
         boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/bizTypeInfo.json

-[ {
-  "type":"115",
-  "pageType": "draft",
-  "url": "/mixuap?appId=1742358052905971713&id=1734576595978448898&roleIds={roleIds}&userId={userId}&pageType=edit"
-},  {
-  "type":"116",
-  "pageType": "draft",
-  "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
-},  {
-  "type":"117",
-  "pageType": "draft",
-  "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
-},{
-  "type":"120",
-  "pageType": "draft",
-  "url": "/mixuap?appId=1742358052905971713&id=1897529486077882370&roleIds={roleIds}&userId={userId}&pageType=edit"
-},
+[
   {
-    "type":"115",
+    "type": "115",
+    "pageType": "draft",
+    "url": "/mixuap?appId=1742358052905971713&id=1734576595978448898&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "116",
+    "pageType": "draft",
+    "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "117",
+    "pageType": "draft",
+    "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "122",
+    "pageType": "draft",
+    "url": "/mixuap?appId=1742358052905971713&id=1897529486077882370&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "115",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
-  },  {
-    "type":"116",
+  },
+  {
+    "type": "116",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
-  },  {
-    "type":"117",
+  },
+  {
+    "type": "117",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
-  },  {
-    "type":"115",
+  },
+  {
+    "type": "115",
     "pageType": "edit",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
-    "type":"120",
+    "type": "122",
     "pageType": "look",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
-  },  {
-  "type":"120",
-  "pageType": "edit",
-  "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
-},{
-    "type":"116",
+  },
+  {
+    "type": "122",
+    "pageType": "edit",
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "116",
     "pageType": "edit",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
-  },  {
-    "type":"117",
+  },
+  {
+    "type": "117",
     "pageType": "edit",
     "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=edit"
-  },  {
-  "type":"114",
-  "pageType": "draft",
-  "url": "/mixuap?appId=1742358052905971713&id=1737319295022559234&roleIds={roleIds}&userId={userId}&pageType=edit"
-},  {
-  "type":"114",
-  "pageType": "look",
-  "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=look"
-},  {
-  "type":"114",
-  "pageType": "edit",
-  "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit"
-}
+  },
+  {
+    "type": "114",
+    "pageType": "draft",
+    "url": "/mixuap?appId=1742358052905971713&id=1737319295022559234&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "114",
+    "pageType": "look",
+    "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=look"
+  },
+  {
+    "type": "114",
+    "pageType": "edit",
+    "url": "/mixuap?appId=1742358052905971713&id=1735201757841092609&roleIds={roleIds}&userId={userId}&pageType=edit"
+  }
 ]
\ No newline at end of file