月度账单调整

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/RptFinancialMonthSummary.java

@@ -75,6 +75,22 @@ public class RptFinancialMonthSummary extends BaseEntity
 
     private String kprq;
 
+    public void setPurchaseAmount(String purchaseAmount) {
+        this.purchaseAmount = purchaseAmount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public String getPurchaseAmount() {
+        return purchaseAmount;
+    }
+
     public void setSummaryMonthEnd(String summaryMonthEnd) {
         this.summaryMonthEnd = summaryMonthEnd;
     }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/RptFinancialMonthSummaryMapper.xml

@@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRptFinancialMonthSummaryVo">
-        select summary_id, summary_month, payable_amount, transaction_count, status, create_time, update_time, remark, del_flag, create_by, update_by, dept_id, user_id, bw_djbh, bw_dzfp_pdf_url, bw_dzfp_ofd_url, bw_dzfp_xml_url from rpt_financial_month_summary
+        select summary_id, summary_month, amount,payable_amount,purchase_amount, transaction_count, status, create_time, update_time, remark, del_flag, create_by, update_by, dept_id, user_id, bw_djbh, bw_dzfp_pdf_url, bw_dzfp_ofd_url, bw_dzfp_xml_url from rpt_financial_month_summary
     </sql>
 
     <select id="selectRptFinancialMonthSummaryList" parameterType="com.ruoyi.logistics.domain.RptFinancialMonthSummary" resultMap="RptFinancialMonthSummaryResult">
-        select a.summary_id, a.summary_month, a.payable_amount, a.transaction_count, a.status, a.create_time,
+        select a.summary_id, a.summary_month,a.amount,a.purchase_amount, a.payable_amount, a.transaction_count, a.status, a.create_time,
         a.update_time, a.remark, a.del_flag, a.create_by, a.update_by, a.dept_id, a.user_id, a.bw_djbh,
         a.bw_dzfp_pdf_url, a.bw_dzfp_ofd_url, a.bw_dzfp_xml_url,d.dept_name from rpt_financial_month_summary a
                left join  sys_dept d on  a.dept_id=d.dept_id