密评问题-使用单位下拉调整为文本模糊匹配

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

@@ -100,6 +100,9 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "使用单位统一信用代码-搜索使用")
     private String useUnitCreditCodeForSearch;
 
+    @ApiModelProperty(value = "使用单位名称-搜索使用")
+    private String useUnitCreditNameForSearch;
+
     @ApiModelProperty(value = "是否车用气瓶--过滤数据使用")
     private String whetherVehicleCylinder;
 

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

@@ -17,7 +17,7 @@
                     AND isn.receive_org_code = #{param.receiveOrgCode}
                 </if>
                 <if test="param.useUnitName != null and param.useUnitName != ''">
-                    AND isn.use_unit_code = #{param.useUnitName}
+                    AND isn.use_unit_name like concat ('%',#{param.useUnitName},'%')
                 </if>
                 <if test="param.status != null and param.status != ''">
                     AND isn.status = #{param.status}
@@ -28,6 +28,9 @@
                 <if test="param.newUseUnitCreditCode != null and param.newUseUnitCreditCode != ''">
                     AND isn.new_use_unit_credit_code = #{param.newUseUnitCreditCode}
                 </if>
+                <if test="param.newUseUnitName != null and param.newUseUnitName != ''">
+                    AND isn.new_use_unit_name like concat ('%',#{param.newUseUnitName},'%')
+                </if>
                 <if test="param.equCodeB != null and param.equCodeB != ''">
                     AND isn.equ_code_b like concat('%',#{param.equCodeB},'%')
                 </if>

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

@@ -82,9 +82,15 @@
             <if test="dto.newUseUnitCreditCode != null and dto.newUseUnitCreditCode != ''">
                 and cru.new_use_unit_credit_code = #{dto.newUseUnitCreditCode}
             </if>
+            <if test="dto.newUseUnitName != null and dto.newUseUnitName != ''">
+                and cru.new_use_unit_name like concat ('%',#{dto.newUseUnitName},'%')
+            </if>
             <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
                 and cru.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
+            <if test="dto.useUnitName != null and dto.useUnitName != ''">
+                and cru.use_unit_name like concat ('%',#{dto.useUnitName},'%')
+            </if>
             <if test="dto.createDate != null">
                 AND cru.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
             </if>

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

@@ -50,6 +50,9 @@
                 <if test="param.installUnitId != null and param.installUnitId != ''">
                     AND isn.install_unit_credit_code = #{param.installUnitId}
                 </if>
+                <if test="param.installUnitName != null and param.installUnitName != ''">
+                    AND isn.install_unit_name like concat ('%',#{param.installUnitName},'%')
+                </if>
                 <if test="param.noticeStatus != null and param.noticeStatus != ''">
                     AND isn.notice_status = #{param.noticeStatus}
                 </if>
@@ -74,6 +77,9 @@
                 <if test="param.useUnitCreditCode != null and param.useUnitCreditCode != ''">
                     AND isn.use_unit_credit_code = #{param.useUnitCreditCode}
                 </if>
+                <if test="param.useUnitName != null and param.useUnitName != ''">
+                    AND isn.use_unit_name like concat ('%',#{param.useUnitName},'%')
+                </if>
                 <if test="param.orgBranchCode != null and param.orgBranchCode != ''">
                     <choose>
                         <when test="client == 'jgLook'">

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

@@ -121,6 +121,9 @@
             <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
             </if>
+            <if test="dto.useUnitCreditNameForSearch != null and dto.useUnitCreditNameForSearch != ''">
+                and tjurm.use_unit_name like concat ('%',#{dto.useUnitCreditNameForSearch},'%')
+            </if>
             <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
                 and tjurm.receive_company_code = #{dto.receiveCompanyCode}
             </if>
@@ -202,6 +205,9 @@
             <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
             </if>
+            <if test="dto.useUnitCreditNameForSearch != null and dto.useUnitCreditNameForSearch != ''">
+                and tjurm.use_unit_name like concat ('%',#{dto.useUnitCreditNameForSearch},'%')
+            </if>
             <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
                 and tjurm.receive_company_code = #{dto.receiveCompanyCode}
             </if>

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

@@ -35,6 +35,9 @@
             <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
                 and tjvi.use_unit_credit_code = #{dto.useUnitCode}
             </if>
+            <if test="dto.useUnitName != null and dto.useUnitName != ''">
+                and tjvi.use_unit_name like concat ('%',#{dto.useUnitName},'%')
+            </if>
             <if test="dto.dataType == 'supervision' and client == 'jgAudit' ">
                         AND tjvi.receive_company_code = #{dto.useUnitCreditCode}
                 AND  tjvi.status  <![CDATA[<>]]>  '使用单位待提交'

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

@@ -83,6 +83,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
     // 设备基本信息表单id
     private static final String EQUIP_INFO_FORM_ID = "equipInfo";
     public static final String USE_UNIT_CREDIT_CODE = "useUnitCreditCode";
+    public static final String USE_UNIT_NAME = "useUnitName";
     @Resource
     private IdxBizJgUseInfoServiceImpl useInfoService;
     @Resource
@@ -252,11 +253,11 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         if(!StringUtils.isEmpty(street) && street.contains("_")){
             street= street.split("_")[0];
         }
-        //获取街道
         String useUnitCreditCode = params.get(USE_UNIT_CREDIT_CODE);
         if(!StringUtils.isEmpty(useUnitCreditCode) && useUnitCreditCode.contains("_")){
             useUnitCreditCode= useUnitCreditCode.split("_")[0];
         }
+        String useUnitName = params.get(USE_UNIT_NAME);
         IPage<IdxBizJgProjectContraption> pageList = lambdaQuery()
                 // 企业按照公司类型进行过滤
                 .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType), IdxBizJgProjectContraption::getUscUnitCreditCode, companyCode)
@@ -273,6 +274,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .eq(!ValidationUtil.isEmpty(county), IdxBizJgProjectContraption::getCounty, county)
                 .eq(!ValidationUtil.isEmpty(street), IdxBizJgProjectContraption::getStreet, street)
                 .eq(!ValidationUtil.isEmpty(useUnitCreditCode), IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
+                .like(!ValidationUtil.isEmpty(useUnitName), IdxBizJgProjectContraption::getUseUnitName, useUnitName)
                 .like(!ValidationUtil.isEmpty(projectContraption), IdxBizJgProjectContraption::getProjectContraption, projectContraption)
                 .eq(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode)            // 企业 等于匹配
                 .likeRight(!ValidationUtil.isEmpty(orgBranchCode) && BaseController.COMPANY_TYPE_SUPERVISION.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, orgBranchCode) // 监管 右模糊匹配

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

@@ -183,6 +183,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String ATTACHMENT_UPLOAD = "attachmentUpload";
     private static final Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
     public static final String CAR_NUMBER = "CAR_NUMBER";
+    public static final String USE_UNIT_NAME = "USE_UNIT_NAME";
     // 需要转化成jsonObject的附件字段
     public static String[] jsonFields = {"insOtherAccessories", "installContractAttachment", "installProxyStatementAttachment"};
     private final List<String> resultError = new ArrayList<>();
@@ -2644,6 +2645,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.wildcardQuery("PRODUCE_UNIT_NAME", "*" + QueryParser.escape(test.toLowerCase()) + "*"));
             boolMust.must(pBuilder);
         }
+        // 使用单位 名称模糊查询
+        if (!ObjectUtils.isEmpty(map.getString(USE_UNIT_NAME))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String text = map.getString(USE_UNIT_NAME);
+            pBuilder.must(QueryBuilders.matchQuery(USE_UNIT_NAME, text));
+            boolMust.must(pBuilder);
+        }
         // 模糊查询
         if (!ObjectUtils.isEmpty(map.getString(USE_PLACE_CODE))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();

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

@@ -716,6 +716,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
                 .like(!ValidationUtil.isEmpty(dto.getApplyNo()), JgCertificateReplenish::getApplyNo, dto.getApplyNo())
                 .eq(!ValidationUtil.isEmpty(dto.getApplyStatus()), JgCertificateReplenish::getApplyStatus, dto.getApplyStatus())
                 .eq(!ValidationUtil.isEmpty(dto.getUseUnitCode()), JgCertificateReplenish::getUseUnitCode, dto.getUseUnitCode())
+                .like(!ValidationUtil.isEmpty(dto.getUseUnitName()), JgCertificateReplenish::getUseUnitName, dto.getUseUnitName())
                 .eq(!ValidationUtil.isEmpty(dto.getApplicationReason()), JgCertificateReplenish::getApplicationReason, dto.getApplicationReason())
                 .eq(!ValidationUtil.isEmpty(dto.getLossDamageTime()), JgCertificateReplenish::getLossDamageTime, dto.getLossDamageTime())
                 .eq(!ValidationUtil.isEmpty(dto.getAcceptDate()), JgCertificateReplenish::getAcceptDate, dto.getAcceptDate())