fix 租户平台应收订单的搜索筛选不生效问题

commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java

@@ -95,5 +95,8 @@ public class ReceivableQueryVo extends PageRequest {
     @Schema(description = "商业起保时间")
     private String syEndDate;
 
+    @Schema(description = "产品名称")
+    private String productName;
+
 
 }

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -71,6 +71,7 @@ public class ReceivableController {
     @Operation(summary = "获取私有协议手续费列表")
     public HttpResult getCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("2");
+        receivableQueryVo.setAgreementType("2");
         return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
     }
 
@@ -78,13 +79,15 @@ public class ReceivableController {
     @Operation(summary = "获取私有协议跟单费列表")
     public HttpResult getOtherReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("2");
+        receivableQueryVo.setAgreementType("2");
         return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
     }
 
     @PostMapping("getJyCommissionReceivableList")
     @Operation(summary = "获取私有协议驾意险手续费列表")
     public HttpResult getJyCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
-        receivableQueryVo.setQueryType("2");
+        receivableQueryVo.setQueryType("3");
+        receivableQueryVo.setAgreementType("2");
         return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
     }
 
@@ -92,6 +95,7 @@ public class ReceivableController {
     @Operation(summary = "获取私有协议驾意险跟单费列表")
     public HttpResult getJyOtherReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("2");
+        receivableQueryVo.setAgreementType("2");
         return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
     }
 
@@ -210,6 +214,7 @@ public class ReceivableController {
     @PostMapping("exportSuperviseExcel")
     @Operation(summary = "导出应收手续费excel文件（车险）")
     public void exportSuperviseExcel(@RequestBody ReceivableQueryVo receivableQueryVo) throws IOException {
+        receivableQueryVo.setAgreementType("2");
         receivableQueryVo.setQueryType("1");
         receivableService.exportSuperviseExcel(receivableQueryVo);
     }
@@ -217,6 +222,7 @@ public class ReceivableController {
     @PostMapping("exportSuperviseJyExcel")
     @Operation(summary = "导出应收手续费excel文件（非车险）")
     public void exportSuperviseJyExcel(@RequestBody ReceivableQueryVo receivableQueryVo) throws IOException {
+        receivableQueryVo.setAgreementType("2");
         receivableQueryVo.setQueryType("3");
         receivableService.exportSuperviseJyExcel(receivableQueryVo);
     }
@@ -260,6 +266,7 @@ public class ReceivableController {
     @PostMapping("exportOtherExcel")
     @Operation(summary = "导出应收跟单费（车险）excel文件")
     public void exportOtherExcel(@RequestBody ReceivableQueryVo receivableQueryVo) throws IOException {
+        receivableQueryVo.setAgreementType("2");
         receivableQueryVo.setQueryType("2");
         receivableService.exportOtherExcel(receivableQueryVo);
     }
@@ -267,6 +274,7 @@ public class ReceivableController {
     @PostMapping("exportOtherJyExcel")
     @Operation(summary = "导出应收跟单费（非车险）excel文件")
     public void exportOtherJyExcel(@RequestBody ReceivableQueryVo receivableQueryVo) throws IOException {
+        receivableQueryVo.setAgreementType("2");
         receivableQueryVo.setQueryType("4");
         receivableService.exportOtherJyExcel(receivableQueryVo);
     }

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -231,9 +231,9 @@
             ior1.start_date as jq_start_date,
             ior2.start_date as sy_start_date,
             io.product_name AS productName,
-            iop.jq_policy_no,
-            iop.sy_policy_no,
-            iop.jy_policy_no,
+            iop.jq_policy_no, -- 交强保单号
+            iop.sy_policy_no, -- 商业保单号
+            iop.jy_policy_no, -- 非车险保单号
             io.company_name,
             io.create_time,
             io.docking_person
@@ -248,7 +248,7 @@
         WHERE
             1=1
         AND NOT EXISTS ( SELECT 1 FROM ins_ply_income_invoice_link ipil WHERE ipil.income_id = ipi.id )
-        AND ipi.agreement_type = #{receivableQueryVo.queryType}
+        AND ipi.agreement_type = #{receivableQueryVo.agreementType}
         <if test = "receivableQueryVo.ids != null and receivableQueryVo.ids.size > 0">
             AND ipi.id in
             <foreach collection="receivableQueryVo.ids" item="id" open="(" separator="," close=")">
@@ -293,6 +293,34 @@
             AND io.entry_status = #{receivableQueryVo.orderType}
         </if>
 
+        <if test="receivableQueryVo.productName != null and receivableQueryVo.productName != ''">
+            AND io.product_name = #{receivableQueryVo.productName}
+        </if>
+
+        <if test="receivableQueryVo.jqPolicyNo != null and receivableQueryVo.jqPolicyNo != ''">
+            AND iop.jq_policy_no = #{receivableQueryVo.jqPolicyNo}
+        </if>
+
+        <if test="receivableQueryVo.syPolicyNo != null and receivableQueryVo.syPolicyNo != ''">
+            AND iop.sy_policy_no = #{receivableQueryVo.syPolicyNo}
+        </if>
+
+        <if test="receivableQueryVo.jyPolicyNo != null and receivableQueryVo.jyPolicyNo != ''">
+            AND iop.jy_policy_no = #{receivableQueryVo.jyPolicyNo}
+        </if>
+
+        <if test="receivableQueryVo.dockingPerson != null and receivableQueryVo.dockingPerson != ''">
+            AND io.docking_person = #{receivableQueryVo.dockingPerson}
+        </if>
+
+        <if test="receivableQueryVo.jqStartDate != null and receivableQueryVo.jqStartDate != ''">
+            AND ior1.start_date between #{receivableQueryVo.jqStartDate} and  #{receivableQueryVo.jqEndDate}
+        </if>
+
+        <if test="receivableQueryVo.syStartDate != null and receivableQueryVo.syStartDate != ''">
+            AND ior2.start_date between #{receivableQueryVo.syStartDate} and  #{receivableQueryVo.syStartDate}
+        </if>
+
 
     </select>