Merge branch 'develop_tzs_register_to_0715' of…

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

@@ -453,7 +453,7 @@
             pp."MEDIUM" medium,
             pp."REMARKS" remarks,
             (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) inspectOrgName,
-            (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY DESC REC_DATE limit 1)) inspectConclusion,
+            (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1)) inspectConclusion,
             to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
             idx_biz_jg_use_info ui

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

@@ -1360,7 +1360,7 @@ public class DPStatisticsServiceImpl {
         Map<String, Object> result = new HashMap<>();
         String orgCode = regionCodeOrgCodeMap.get(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
-            orgCode = commonMapper.getOrgCodeByCompanyCode(dpFilterParamDto.getCityCode());
+            orgCode = getAndSetOrgCode(dpFilterParamDto.getCityCode());
             if (orgCode == null) {
                 result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), 0);
                 result.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), 0);
@@ -1381,7 +1381,7 @@ public class DPStatisticsServiceImpl {
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", orgCode + "*"));
+        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 纳管状态为已纳管
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         request.query(boolMust);

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

@@ -388,7 +388,11 @@ public class DPSubServiceImpl {
                 JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
                 if (!ValidationUtil.isEmpty(value)) {
                     JSONObject attachmentUploadDatasObj = new JSONObject();
-                    attachmentUploadDatasObj.put("label", visualParams.getString("label"));
+                    String label = visualParams.getString("label");
+                    if (!ValidationUtil.isEmpty(displayName)){
+                        label = label + "(" + displayName + ")";
+                    }
+                    attachmentUploadDatasObj.put("label", label);
                     attachmentUploadDatasObj.put("value", value);
                     attachmentUploadDatasObj.put("type", "img");
                     attachmentUploadDatas.add(attachmentUploadDatasObj);