平台应收 加个对接人的筛选项，将表中将保险公司删除

commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -167,4 +167,7 @@ public class FeeAuditParam extends PageRequest {
     @Schema(description = "非车起保时间-止")
     private String jyRiskStartDateEnd;
 
+    @Schema(description = "投保人")
+    private String policyholder;
+
 }

commons/src/main/java/com/jzg/commons/entity/orders/vo/FeeAuditVo.java

@@ -451,4 +451,6 @@ public class FeeAuditVo extends BaseModel {
     private String jyRiskStartDate;
     private String jyRiskEndDate;
 
+    @Schema(description = "投保人")
+    private String policyholder;
 }

commons/src/main/java/com/jzg/commons/entity/vo/IncomeAndExpenseList.java

@@ -55,6 +55,9 @@ public class IncomeAndExpenseList {
     @Schema(description = "处理进度")
     private List<ChangeLogDetail> stepList;
 
+    @Schema(description = "支付凭证")
+    private String paymentVoucher;
 
-
+    @Schema(description = "支付凭证的id")
+    private String picId;
 }

commons/src/main/java/com/jzg/commons/entity/vo/IncomeAndExpenseVo.java

@@ -68,5 +68,11 @@ public class IncomeAndExpenseVo {
 
         @Schema(description = "处理进度")
         private List<ChangeLogDetail> stepList;
+
+        @Schema(description = "支付凭证")
+        private String paymentVoucher;
+
+        @Schema(description = "支付凭证的id")
+        private String picId;
     }
 }

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -86,11 +86,13 @@
         (select ior.start_date  from ins_orders_risk ior where ior.order_no = io.id and ior.risk_name = '商业险' )  as sy_risk_start_date,
         (select ior.end_date from ins_orders_risk ior where ior.order_no = io.id and ior.risk_name = '商业险' )  as sy_risk_end_date,
         (select ior.start_date  from ins_orders_risk ior where ior.order_no = io.id and ior.risk_name = '驾意险' )  as jy_risk_start_date,
-        (select ior.end_date from ins_orders_risk ior where ior.order_no = io.id and ior.risk_name = '驾意险' )  as jy_risk_end_date
+        (select ior.end_date from ins_orders_risk ior where ior.order_no = io.id and ior.risk_name = '驾意险' )  as jy_risk_end_date,
+        iocui2.name as policyholder
         FROM ins_fee_audit ifa
         LEFT JOIN ins_orders io on ifa.order_no = io.id AND io.is_delete=0
         LEFT JOIN ins_orders_car_info ioci on io.id = ioci.order_no AND ioci.is_delete=0
         LEFT JOIN ins_orders_car_user_info iocui on io.id = iocui.order_no and iocui.policy_person_type = 3 AND iocui.is_delete=0
+        LEFT JOIN ins_orders_car_user_info iocui2 ON io.id = iocui2.order_no AND iocui2.policy_person_type = 2 AND iocui2.is_delete = 0
         LEFT JOIN sys_user qsu on qsu.mobile = io.real_quote_user_id AND qsu.is_delete=0
         LEFT JOIN sys_user_jzg_info suji ON suji.user_id = qsu.id and suji.system_code = #{param.systemCode} AND suji.is_delete=0
         LEFT JOIN sys_dept sd on suji.dept_id = sd.id AND sd.is_delete=0
@@ -102,6 +104,9 @@
         LEFT JOIN ins_orders_policy iop on iop.order_no = io.id and iop.is_delete = 0
         <where>
             and ifa.is_delete=0 and ifa.system_code = #{param.systemCode}
+            <if test="param.policyholder != null and param.policyholder !=''">
+                and iocui2.name  = #{param.policyholder}
+            </if>
             <if test="param.vinNo != null and param.vinNo !=''">
                 and ioci.vin_no = #{param.vinNo}
             </if>

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -353,7 +353,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 // 支出, 并且不是审核驳回的数据
                 summary.setExpense(BigDecimalUtil.add(summary.getExpense(),record.getAmount()));
             }
-
             // 计算余额（收入 - 支出）
             summary.setBalance(summary.getIncome().subtract(summary.getExpense()));
         }

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

@@ -713,6 +713,9 @@
                     #{settlementId}
                 </foreach>
             </if>
+            <if test="settlementQueryVo.contactPerson != null and settlementQueryVo.contactPerson != ''">
+                AND io.contact_person = #{settlementQueryVo.contactPerson}
+            </if>
             <if test="settlementQueryVo.invoiceTypes != null and settlementQueryVo.invoiceTypes != ''">
                 AND ipii.invoice_type IN
                 <foreach collection="settlementQueryVo.invoiceTypes" item="invoiceType" open="(" separator="," close=")">

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

@@ -302,13 +302,13 @@
         suacl.update_by,
         suacl.update_time,
         ioci.license_no,
-        null as payment_time , null as reject_time ,  null as auditing_status
+        null as payment_time , null as reject_time ,  null as auditing_status,
+        suf.file_name as paymentVoucher, saa.pic_id as picId
         from
         sys_user_account_change_log suacl
-        left join sys_amount_auditing saa on
-        suacl.related_amount_auditing_id = saa.id
-        left join ins_orders_car_info ioci on
-        suacl.related_order_id = ioci.order_no
+        left join sys_amount_auditing saa on suacl.related_amount_auditing_id = saa.id
+        left join ins_orders_car_info ioci on suacl.related_order_id = ioci.order_no
+        left join sys_upload_files suf on saa.pic_id = suf.id
         where
         suacl.system_code = #{systemCode}
         union ALL
@@ -328,7 +328,7 @@
         saa.update_by,
         saa.update_time,
         null as license_no,
-        saa.payment_time , saa.reject_time ,  saa.auditing_status
+        saa.payment_time , saa.reject_time ,  saa.auditing_status, null as paymentVoucher, null as picId
         from
         sys_amount_auditing saa
         where