问题处理

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountSubjects.java

@@ -48,9 +48,9 @@ public class AccountSubjects extends BasePo {
      */
     private Integer sort;
 
-    /**
-     * 付款类型Id
-     */
-    private Long paymentTypeId;
+//    /**
+//     * 付款类型Id
+//     */
+//    private Long paymentTypeId;
 
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControl.java

@@ -30,7 +30,7 @@ public class CostControl extends BasePo {
      * 费用类型
      */
     @Label("费用类型")
-    private String costType;
+    private Long costType;
 
     /**
      * 记账凭证号

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControlDetail.java

@@ -36,7 +36,7 @@ public class CostControlDetail extends BasePo {
      * 供应商
      */
     @Label("供应商")
-    private String supplierId;
+    private Long supplierId;
 
     /**
      * 收款单位

hx-account/src/main/java/com/fjhx/account/entity/payment/po/PaymentType.java

@@ -43,4 +43,9 @@ public class PaymentType extends BasePo {
      */
     private String dynamicFieldJson;
 
+    /**
+     * 记账科目Id
+     */
+    private Long accountSubjectsId;
+
 }

hx-account/src/main/resources/mapper/payment/PaymentTypeMapper.xml

@@ -2,15 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.account.mapper.payment.PaymentTypeMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.payment.vo.PaymentTypeVo">
-        select pt.id,
-               pt.name,
-               pt.trade_type,
-               pt.remark,
-               pt.sort,
-               pt.create_user,
-               pt.create_time,
-               pt.update_user,
-               pt.update_time
+        select *
         from payment_type pt
             ${ew.customSqlSegment}
     </select>

hx-common/src/main/java/com/fjhx/common/entity/logistics/vo/LogisticsCompanyInfoVo.java

@@ -4,6 +4,8 @@ import com.fjhx.common.entity.logistics.po.LogisticsCompanyInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 物流公司信息列表查询返回值实体
  *
@@ -14,4 +16,13 @@ import lombok.Setter;
 @Setter
 public class LogisticsCompanyInfoVo extends LogisticsCompanyInfo {
 
+    /**
+     * 预付款结存
+     */
+    private BigDecimal balancePrepaid;
+    /**
+     * 预付款结存(含税)
+     */
+    private BigDecimal balancePrepaidTax;
+
 }

hx-common/src/main/resources/mapper/logistics/LogisticsCompanyInfoMapper.xml

@@ -1,42 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.common.mapper.logistics.LogisticsCompanyInfoMapper">
+
+    <sql id="list">
+        SELECT IFNULL(t1.balancePrepaid, 0)    AS balancePrepaid,
+               IFNULL(t1.balancePrepaidTax, 0) AS balancePrepaidTax,
+               lci.*
+        FROM logistics_company_info lci
+                 LEFT JOIN (SELECT ccod.logistics_company_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 pt.`name` LIKE '%快递费%'
+                              AND cco.`status` IN (30, 60)
+                            GROUP BY ccod.logistics_company_id) AS t1 ON t1.logistics_company_id = lci.id
+    </sql>
+
     <select id="getList" resultType="com.fjhx.common.entity.logistics.vo.LogisticsCompanyInfoVo">
-        select lci.id,
-               lci.code,
-               lci.name,
-               lci.type,
-               lci.sort,
-               lci.tax_points,
-               lci.account_name,
-               lci.account_bank,
-               lci.account_number,
-               lci.company_id,
-               lci.create_user,
-               lci.create_time,
-               lci.update_user,
-               lci.update_time
-        from logistics_company_info lci
-            ${ew.customSqlSegment}
+        <include refid="list"/>
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getPage" resultType="com.fjhx.common.entity.logistics.vo.LogisticsCompanyInfoVo">
-        select lci.id,
-               lci.code,
-               lci.name,
-               lci.type,
-               lci.sort,
-               lci.tax_points,
-               lci.account_name,
-               lci.account_bank,
-               lci.account_number,
-               lci.company_id,
-               lci.create_user,
-               lci.create_time,
-               lci.update_user,
-               lci.update_time
-        from logistics_company_info lci
-            ${ew.customSqlSegment}
+        <include refid="list"/>
+        ${ew.customSqlSegment}
     </select>
 
 </mapper>