收款单位添加结存

hx-account/src/main/java/com/fjhx/account/entity/payee/vo/PayeeInfoVo.java

@@ -14,4 +14,14 @@ import lombok.Setter;
 @Setter
 public class PayeeInfoVo extends PayeeInfo {
 
+    /**
+     * 结存预付款_含税
+     */
+    private String balancePrepaidTax;
+
+    /**
+     * 结存预付款
+     */
+    private String balancePrepaid;
+
 }

hx-account/src/main/resources/mapper/payee/PayeeInfoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.account.mapper.payee.PayeeInfoMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.payee.vo.PayeeInfoVo">
-        select pi.id,
-               pi.code,
-               pi.name,
+        SELECT pi.id,
+               pi.CODE,
+               pi.NAME,
                pi.type,
                pi.sort,
                pi.tax_points,
@@ -15,8 +15,22 @@
                pi.create_user,
                pi.create_time,
                pi.update_user,
-               pi.update_time
-        from payee_info pi
+               pi.update_time,
+               IFNULL(t1.balancePrepaid, 0)    AS balancePrepaid,
+               IFNULL(t1.balancePrepaidTax, 0) AS balancePrepaidTax
+        FROM payee_info pi
+                 LEFT JOIN (SELECT ccod.payee_account_id,
+                                   (
+                                           IFNULL(sum(ccod.current_prepaid), 0) -
+                                           IFNULL(sum(ccod.deduction_prepaid), 0))     AS balancePrepaid,
+                                   (
+                                           IFNULL(sum(ccod.current_prepaid_tax), 0) -
+                                           IFNULL(sum(ccod.deduction_prepaid_tax), 0)) AS balancePrepaidTax
+                            FROM payment_type pt
+                                     JOIN cost_control cco ON cco.cost_type = pt.id
+                                     JOIN cost_control_detail ccod ON ccod.cost_control_id = cco.id
+                            WHERE cco.`status` IN (30, 60)
+                            GROUP BY ccod.payee_account_id) t1 ON t1.payee_account_id = pi.id
             ${ew.customSqlSegment}
     </select>