refeat(jyjc): 开通消息展示appId

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/message/open/OpenAppDockPassMsgHandler.java

@@ -28,7 +28,7 @@ public class OpenAppDockPassMsgHandler implements IOpenApplicationMsgHandler {
 
     @Override
     public void handle(String userId, String relationId, String companyType) {
-        this.send(userId, relationId + "2", companyType);
+        this.send(userId, relationId, companyType);
     }
 
     private void send(String userId, String relationId, String companyType) {
@@ -38,7 +38,7 @@ public class OpenAppDockPassMsgHandler implements IOpenApplicationMsgHandler {
         messageModel.setMsgType("openApp");
         messageModel.setTitle("签署承诺书");
         messageModel.setBody("系统对接已完成，请尽快按照消息详情提示进行签署承诺书！");
-        messageModel.setRelationId(relationId);
+        messageModel.setRelationId(relationId + "2");
         messageModel.setTerminal("WEB");
         messageModel.setRoutePath(msgDetailPath + "&relationId=" + relationId);
         messageModel.setCompanyType(companyType);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/message/open/OpenAppReceivePassMsgHandler.java

@@ -28,7 +28,7 @@ public class OpenAppReceivePassMsgHandler implements IOpenApplicationMsgHandler
 
     @Override
     public void handle(String userId, String relationId, String companyType) {
-        this.send(userId, relationId + "1", companyType);
+        this.send(userId, relationId, companyType);
     }
 
     private void send(String userId, String relationId, String companyType) {
@@ -38,7 +38,7 @@ public class OpenAppReceivePassMsgHandler implements IOpenApplicationMsgHandler
         messageModel.setMsgType("openApp");
         messageModel.setTitle("系统对接");
         messageModel.setBody("资料校对已通过，请尽快按照消息详情提示进行系统对接！");
-        messageModel.setRelationId(relationId);
+        messageModel.setRelationId(relationId + "1");
         messageModel.setTerminal("WEB");
         messageModel.setRoutePath(msgDetailPath + "&relationId=" + relationId);
         messageModel.setCompanyType(companyType);

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

@@ -1440,14 +1440,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             boolMust.must(QueryBuilders.termQuery("EQU_DEFINE_CODE", QueryParser.escape(map.getString("EQU_DEFINE_CODE"))));
         }
 
-//        // 地市
-//        if (!ObjectUtils.isEmpty(map.getString("CITY"))) {
-//            boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("CITY") + "*"));
-//        }
-//        // 区县
-//        if (!ObjectUtils.isEmpty(map.getString("COUNTY"))) {
-//            boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("COUNTY") + "*"));
-//        }
+        // 地市
+        if (!ObjectUtils.isEmpty(map.getString("CITY"))) {
+            boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("CITY") + "*"));
+        }
+        // 区县
+        if (!ObjectUtils.isEmpty(map.getString("COUNTY"))) {
+            boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("COUNTY") + "*"));
+        }
         // 设备代码模糊查询
         if (!ObjectUtils.isEmpty(map.getString(EQU_CODE))) {
             String test = QueryParser.escape(map.getString(EQU_CODE));