按时间范围进行合同回款统计

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -82,6 +82,10 @@ public class CmcContractController extends BaseController
         JSONObject amountObject = new JSONObject();
         JSONArray cwAmountArray = new JSONArray();
         JSONObject cwAmountObject = new JSONObject();
+        JSONArray paidAmountArray = new JSONArray();
+        JSONObject paidAmountObject = new JSONObject();
+        JSONArray paidCwAmountArray = new JSONArray();
+        JSONObject paidCwAmountObject = new JSONObject();
         //每年合同数量及金额
         if (cmcContract.getSignDate() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
@@ -89,12 +93,15 @@ public class CmcContractController extends BaseController
                 List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
                 yearObject.put(String.valueOf(i), yearList.size());
                 BigDecimal amount = new BigDecimal(0);
+                BigDecimal paidAmount = new BigDecimal(0);
                 for (CmcContract contract : yearList) {
                     if (contract.getAmount() != null)
                         amount = amount.add(contract.getAmount());
+                    if (contract.getPaidAmount() != null)
+                        paidAmount = paidAmount.add(contract.getPaidAmount());
                 }
                 amountObject.put(String.valueOf(i), amount);
-
+                paidAmountObject.put(String.valueOf(i), paidAmount);
             }
             cmcContract.setSignDate(null);
         }
@@ -102,21 +109,29 @@ public class CmcContractController extends BaseController
             //输入年份合同数量及金额
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), cmcContractService.selectCmcContractList(cmcContract).size());
             BigDecimal amount = new BigDecimal(0);
+            BigDecimal paidAmount = new BigDecimal(0);
             for (CmcContract contract : cmcContractService.selectCmcContractList(cmcContract)) {
                 if (contract.getAmount() != null)
                     amount = amount.add(contract.getAmount());
+                if (contract.getPaidAmount() != null)
+                    paidAmount = paidAmount.add(contract.getPaidAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), amount);
+            paidAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidAmount);
         }
-        getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject);
+        getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject, paidCwAmountObject);
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
         amountArray.add(amountObject);
         cwAmountArray.add(cwAmountObject);
+        paidAmountArray.add(paidAmountObject);
+        paidCwAmountArray.add(paidCwAmountObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("source", sourceArray);
         jsonObject.put("amount", amountArray);
         jsonObject.put("cwAmount", cwAmountArray);
+        jsonObject.put("paidAmount", paidAmountArray);
+        jsonObject.put("paidCwAmount", paidCwAmountArray);
         return success(jsonObject);
     }
 
@@ -211,25 +226,33 @@ public class CmcContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject cwAmountObject) {
+    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject) {
         cmcContract.setProjectSource("1");
         List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
         BigDecimal cAmount = new BigDecimal(0);
         BigDecimal wAmount = new BigDecimal(0);
+        BigDecimal paidCAmount = new BigDecimal(0);
+        BigDecimal paidWAmount = new BigDecimal(0);
         for (CmcContract contract : sourceList) {
             if(contract.getAmount() != null)
                 wAmount = wAmount.add(contract.getAmount());
+            if(contract.getPaidAmount() != null)
+                paidWAmount = paidWAmount.add(contract.getPaidAmount());
         }
         sourceObject.put("院外项目", sourceList.size());
         cwAmountObject.put("院外项目承接金额", wAmount);
+        paidCwAmountObject.put("院外项目回款金额", paidWAmount);
         cmcContract.setProjectSource("0");
         sourceList = cmcContractService.selectCmcContractList(cmcContract);
         for (CmcContract contract : sourceList) {
             if(contract.getAmount() != null)
                 cAmount = cAmount.add(contract.getAmount());
+            if(contract.getPaidAmount() != null)
+                paidCAmount = paidCAmount.add(contract.getPaidAmount());
         }
         sourceObject.put("院内项目", sourceList.size());
         cwAmountObject.put("院内项目承接金额", cAmount);
+        paidCwAmountObject.put("院内项目回款金额", paidCAmount);
         cmcContract.setProjectSource(null);
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSubContractController.java

@@ -92,6 +92,10 @@ public class CmcSubContractController extends BaseController
         JSONObject amountObject = new JSONObject();
         JSONArray cwAmountArray = new JSONArray();
         JSONObject cwAmountObject = new JSONObject();
+        JSONArray paidAmountArray = new JSONArray();
+        JSONObject paidAmountObject = new JSONObject();
+        JSONArray paidCwAmountArray = new JSONArray();
+        JSONObject paidCwAmountObject = new JSONObject();
         //每年合同数量及金额
         if (cmcSubContract.getSignDate() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
@@ -99,11 +103,15 @@ public class CmcSubContractController extends BaseController
                 List<CmcSubContract> yearList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
                 yearObject.put(String.valueOf(i), yearList.size());
                 BigDecimal amount = new BigDecimal(0);
+                BigDecimal paidAmount = new BigDecimal(0);
                 for (CmcSubContract subContract : yearList) {
                     if (subContract.getSubAmount() != null)
                         amount = amount.add(subContract.getSubAmount());
+                    if (subContract.getPaidAmount() != null)
+                        paidAmount = paidAmount.add(subContract.getPaidAmount());
                 }
                 amountObject.put(String.valueOf(i), amount);
+                paidAmountObject.put(String.valueOf(i), paidAmount);
             }
             cmcSubContract.setSignDate(null);
         }
@@ -111,21 +119,29 @@ public class CmcSubContractController extends BaseController
             //输入年份合同数量及金额
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), cmcSubContractService.selectCmcSubContractList(cmcSubContract).size());
             BigDecimal amount = new BigDecimal(0);
+            BigDecimal paidAmount = new BigDecimal(0);
             for (CmcSubContract subContract : cmcSubContractService.selectCmcSubContractList(cmcSubContract)) {
                 if (subContract.getSubAmount() != null)
                     amount = amount.add(subContract.getSubAmount());
+                if (subContract.getPaidAmount() != null)
+                    paidAmount = paidAmount.add(subContract.getPaidAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), amount);
+            paidAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidAmount);
         }
-        getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject);
+        getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject, paidCwAmountObject);
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
         amountArray.add(amountObject);
         cwAmountArray.add(cwAmountObject);
+        paidAmountArray.add(paidAmountObject);
+        paidCwAmountArray.add(paidCwAmountObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("source", sourceArray);
         jsonObject.put("amount", amountArray);
         jsonObject.put("cwAmount", cwAmountArray);
+        jsonObject.put("paidAmount", paidAmountArray);
+        jsonObject.put("paidCwAmount", paidCwAmountArray);
         return success(jsonObject);
     }
 
@@ -160,25 +176,33 @@ public class CmcSubContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceObject, JSONObject cwAmountObject) {
+    public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject) {
         cmcSubContract.setProjectSource("1");
         List<CmcSubContract> sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
         BigDecimal cAmount = new BigDecimal(0);
         BigDecimal wAmount = new BigDecimal(0);
+        BigDecimal paidCAmount = new BigDecimal(0);
+        BigDecimal paidWAmount = new BigDecimal(0);
         for (CmcSubContract subContract : sourceList) {
             if(subContract.getSubAmount() != null)
                 wAmount = wAmount.add(subContract.getSubAmount());
+            if(subContract.getPaidAmount() != null)
+                paidWAmount = paidWAmount.add(subContract.getPaidAmount());
         }
         sourceObject.put("院外项目", sourceList.size());
         cwAmountObject.put("院外项目分包金额", wAmount);
+        paidCwAmountObject.put("院外项目付款金额", paidWAmount);
         cmcSubContract.setProjectSource("0");
         sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
         for (CmcSubContract subContract : sourceList) {
             if(subContract.getSubAmount() != null)
                 cAmount = cAmount.add(subContract.getSubAmount());
+            if(subContract.getPaidAmount() != null)
+                paidCAmount = paidCAmount.add(subContract.getPaidAmount());
         }
         sourceObject.put("院内项目", sourceList.size());
         cwAmountObject.put("院内项目分包金额", cAmount);
+        paidCwAmountObject.put("院内项目付款金额", paidCAmount);
         cmcSubContract.setProjectSource(null);
     }
 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContract.java

@@ -56,6 +56,10 @@ public class CmcContract extends BaseEntity
     @Excel(name = "合同金额")
     private BigDecimal amount;
 
+    /** 实际回款金额 */
+    @Excel(name = "实际回款金额")
+    private BigDecimal paidAmount;
+
     /** 履约保证金 */
     @Excel(name = "履约保证金")
     private BigDecimal deposit;
@@ -265,6 +269,15 @@ public class CmcContract extends BaseEntity
     {
         return amount;
     }
+    public void setPaidAmount(BigDecimal paidAmount)
+    {
+        this.paidAmount = paidAmount;
+    }
+
+    public BigDecimal getPaidAmount()
+    {
+        return paidAmount;
+    }
     public void setDeposit(BigDecimal deposit)
     {
         this.deposit = deposit;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContractPaid.java

@@ -1,5 +1,6 @@
 package com.ruoyi.oa.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -30,7 +31,7 @@ public class CmcContractPaid extends BaseEntity
 
     /** 实际回款金额 */
     @Excel(name = "实际回款金额")
-    private String paidAmount;
+    private BigDecimal paidAmount;
 
     /** 实际回款时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -64,12 +65,12 @@ public class CmcContractPaid extends BaseEntity
     {
         return paidPercentage;
     }
-    public void setPaidAmount(String paidAmount) 
+    public void setPaidAmount(BigDecimal paidAmount)
     {
         this.paidAmount = paidAmount;
     }
 
-    public String getPaidAmount() 
+    public BigDecimal getPaidAmount()
     {
         return paidAmount;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSubContract.java

@@ -30,6 +30,10 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "分包合同金额")
     private BigDecimal subAmount;
 
+    /** 实际付款金额 */
+    @Excel(name = "实际付款金额")
+    private BigDecimal paidAmount;
+
     /** 项目id */
     @Excel(name = "项目编号")
     private String projectNumber;
@@ -166,6 +170,15 @@ public class CmcSubContract extends BaseEntity
     {
         return subAmount;
     }
+    public void setPaidAmount(BigDecimal paidAmount)
+    {
+        this.paidAmount = paidAmount;
+    }
+
+    public BigDecimal getPaidAmount()
+    {
+        return paidAmount;
+    }
     public void setPartnerId(String partnerId)
     {
         this.partnerId = partnerId;

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractMapper.xml

@@ -16,6 +16,7 @@
         <result property="budgetAmount"    column="budget_amount"    />
         <result property="borrowAmount"    column="borrow_amount"    />
         <result property="settleAmount"    column="settle_amount"    />
+        <result property="paidAmount"    column="paid_amount"    />
         <result property="deposit"    column="deposit"    />
         <result property="contractDocument"    column="contract_document"    />
         <result property="drafter"    column="drafter"    />
@@ -74,7 +75,7 @@
 
     <sql id="selectCmcContractVo">
         select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name, p.project_number, p.project_name,
-               p.project_source, c.party_a_id, pa.party_a_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person,
+               p.project_source, c.party_a_id, pa.party_a_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person, sum(cp.paid_amount) as paid_amount,
                t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan,
                c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time, c.gm_user_id, u2.nick_name as gm_nick_name, c.gm_time, c.gm_comment from cmc_contract as c
         left join sys_user as u on u.user_id = c.drafter
@@ -84,6 +85,7 @@
         left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
         left join cmc_project_contract as pc on pc.contract_id = c.contract_id
         left join cmc_project as p on pc.project_id = p.project_id
+        left join cmc_contract_paid as cp on cp.contract_id = c.contract_id
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
@@ -107,6 +109,12 @@
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(c.sign_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(c.sign_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
         group by c.contract_id
         order by c.draft_time desc

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractPaidMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
             <if test="paidPercentage != null  and paidPercentage != ''"> and paid_percentage = #{paidPercentage}</if>
-            <if test="paidAmount != null  and paidAmount != ''"> and paid_amount = #{paidAmount}</if>
+            <if test="paidAmount != null"> and paid_amount = #{paidAmount}</if>
             <if test="paidTime != null "> and paid_time = #{paidTime}</if>
         </where>
     </select>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSubContractMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subContractId"    column="sub_contract_id"    />
         <result property="subContractName"    column="sub_contract_name"    />
         <result property="subAmount"    column="sub_amount"    />
+        <result property="paidAmount"    column="paid_amount"    />
         <result property="partnerId"    column="partner_id"    />
         <result property="contactPerson"    column="contact_person"    />
         <result property="telephone"    column="telephone"    />
@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcSubContractVo">
-        select distinct sc.sub_contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, pa.partner_name, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter,
+        select distinct sc.sub_contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, pa.partner_name, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter, sum(cp.paid_amount) as paid_amount,
                p.project_number, p.project_name, p.project_source,u.nick_name as draft_nick_name, sc.draft_time, sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment,
                sc.manager_user_id, u1.nick_name as manager_nick_name, sc.manager_time, sc.gm_user_id, u2.nick_name as gm_nick_name, sc.gm_time, sc.gm_comment from cmc_sub_contract as sc
         left join sys_user as u on u.user_id = sc.drafter
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join cmc_partner as pa on pa.partner_id = sc.partner_id
         left join cmc_project_sub_contract as psc on psc.sub_contract_id = sc.sub_contract_id
         left join cmc_project as p on psc.project_id = p.project_id
+        left join cmc_contract_paid as cp on cp.contract_id = sc.sub_contract_id
     </sql>
 
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
@@ -87,6 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="signScan != null  and signScan != ''"> and sc.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and sc.comment_type = #{commentType}</if>
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(sc.sign_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(sc.sign_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
         group by sc.sub_contract_id
         order by sc.draft_time desc