Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -1093,8 +1093,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             result.setTotal(0);
             return result;
         }
-        String companyCode = company.getString("companyCode").contains("_") ?
-                company.getString("companyCode").split("_")[1] : company.getString("companyCode");
+        String companyCode = company.getString("companyCode");
         String type = company.getString("companyType");
 
 
@@ -1191,7 +1190,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
             BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
             String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
-            useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
+            // useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
             ubuilder.should(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", useCode));
 
             String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
@@ -1203,7 +1202,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
                 String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
                 String param = QueryParser.escape(uucc);
-                param = param.contains("_") ? param.split("_")[0] : param;
+                // param = param.contains("_") ? param.split("_")[0] : param;
                 uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
                 boolMust.must(uuccBuilder);
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -786,7 +786,11 @@
 												<w:sz-cs w:val="24"/>
 												<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
 											</w:rPr>
-											<w:t>${(useUnitName)!''}</w:t>
+                                            <#if equDefineCode == "23T0">
+                                            <w:t>${(useUnitAddress)!''}</w:t>
+                                            <#else>
+                                            <w:t>${(useUnitName)!''}</w:t>
+                                            </#if>
 										</w:r>
 									</w:p>
 								</w:txbxContent>
@@ -1020,7 +1024,11 @@
 												<w:sz-cs w:val="36"/>
 												<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
 											</w:rPr>
-											<w:t>设备使用地点：</w:t>
+                                            <#if equDefineCode == "23T0">
+                                            <w:t>使用单位地址：</w:t>
+                                            <#else>
+                                            <w:t>设备使用地点：</w:t>
+                                            </#if>
 										</w:r>
 									</w:p>
 								</w:txbxContent>