Merge branch 'develop_tzs_register' of…

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

@@ -2,12 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper">
     <select id="getUnitListByType" resultType="java.util.Map">
-        SELECT use_code useCode,
+        SELECT use_unit_code useCode,
                use_unit useUnit
         FROM tz_base_enterprise_info
         WHERE is_delete = '0'
         <if test="type != null and type != 'all'">
+            <choose>
+                <when test="type == '使用单位'">
+                    and ( unit_type = '个人主体' OR unit_type LIKE CONCAT('%', #{type}, '%') )
+                </when>
+                <otherwise>
                     and unit_type LIKE CONCAT('%', #{type}, '%')
+                </otherwise>
+            </choose>
         </if>
     </select>
 

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

@@ -139,7 +139,7 @@
         LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
         LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
         LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
-        LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_code = isn.use_unit_credit_code
+        LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_unit_code = isn.use_unit_credit_code
         LEFT JOIN tz_base_enterprise_info installUnit ON installUnit.use_code = isn.install_unit_credit_code
         LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
         LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text

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");
 
 
@@ -1113,6 +1112,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (!ValidationUtil.isEmpty(type) && type.contains("安装改造维修单位")) {
                 map.put("USC_UNIT_CREDIT_CODE", companyCode);
             }
+            if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
+                map.put("USE_UNIT_CREDIT_CODE", companyCode);
+            }
         }
 
         // 默认条件【STATUS==="" || null】
@@ -1188,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();
@@ -1200,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);
             }
@@ -1379,7 +1381,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         useInfo.setDataSource("jg");
         useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
 
-        if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
+        if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode()) || companyTypeStr.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
             useInfo.setUseUnitCreditCode(companyType.get("creditCode").toString());
             useInfo.setUseUnitName(companyType.get("companyTypeName").toString());
         }

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

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;