Merge remote-tracking branch 'origin/dev' into prod

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancecompany/ApiInsuranceCompanyPageRequest.java

@@ -17,4 +17,9 @@ public class ApiInsuranceCompanyPageRequest extends PageDto {
      * 保险公司表唯一业务ID列表
      * 保险公司表唯一业务ID列表
      */
      */
     private List<String> insuranceCompanyBizIdList;
     private List<String> insuranceCompanyBizIdList;
+
+    /**
+     * 保险公司名称列表
+     */
+    private List<String> fullNameList;
 }
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyPageRequest.java

@@ -3,6 +3,8 @@ package com.yd.insurance.base.feign.request.insurancereconciliationcompany;
 import com.yd.common.dto.PageDto;
 import com.yd.common.dto.PageDto;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 public class ApiInsuranceReconciliationCompanyPageRequest extends PageDto {
 public class ApiInsuranceReconciliationCompanyPageRequest extends PageDto {
 
 
@@ -10,4 +12,10 @@ public class ApiInsuranceReconciliationCompanyPageRequest extends PageDto {
      * 保险对账公司名称
      * 保险对账公司名称
      */
      */
     private String name;
     private String name;
+
+    /**
+     * 保险对账公司表唯一业务ID
+     */
+    private List<String> reconciliationCompanyBizIdList;
+
 }
 }

yd-insurance-base-service/src/main/resources/mappers/InsuranceCompanyMapper.xml

@@ -20,6 +20,12 @@
                     #{item}
                     #{item}
                 </foreach>
                 </foreach>
             </if>
             </if>
+            <if test="request.fullNameList != null and request.fullNameList.size > 0">
+                and ic.full_name in
+                <foreach collection="request.fullNameList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             and ic.is_deleted = 0
             and ic.is_deleted = 0
         </where>
         </where>
     </select>
     </select>

yd-insurance-base-service/src/main/resources/mappers/InsuranceReconciliationCompanyMapper.xml

@@ -9,7 +9,12 @@
             <if test="request.name != null and request.name != ''">
             <if test="request.name != null and request.name != ''">
                 and irc.name like concat('%', #{request.name}, '%')
                 and irc.name like concat('%', #{request.name}, '%')
             </if>
             </if>
-
+            <if test="request.reconciliationCompanyBizIdList != null and request.reconciliationCompanyBizIdList.size > 0">
+                irc.reconciliation_company_biz_id IN
+                <foreach collection="request.reconciliationCompanyBizIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             and irc.is_deleted = 0
             and irc.is_deleted = 0
         </where>
         </where>
     </select>
     </select>