回付款比例在sql中计算

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

@@ -272,25 +272,6 @@ public class CmcContractController extends BaseController
     public void export(HttpServletResponse response, CmcContract cmcContract, String selectFields)
     {
         List<CmcContract> list = cmcContractService.selectCmcContractList(cmcContract);
-        for (CmcContract contract : list) {
-            CmcContractPaid cmcContractPaid = new CmcContractPaid();
-            cmcContractPaid.setContractId(contract.getContractId());
-            List<CmcContractPaid> cmcContractPaidList = cmcContractPaidService.selectCmcContractPaidList(cmcContractPaid);
-            BigDecimal paidAmount = new BigDecimal("0.00");
-            String paidPercentage = "";
-            for (CmcContractPaid contractPaid : cmcContractPaidList) {
-                paidAmount = paidAmount.add(contractPaid.getPaidAmount());
-            }
-            contract.setPaidAmount(paidAmount);
-            if (contract.getAmount().equals(new BigDecimal("0.00")) || paidAmount.equals(new BigDecimal("0.00"))) {
-                paidPercentage = "0%";
-            }
-            else {
-                paidPercentage = paidAmount.divide(contract.getAmount(), RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP) + "%";
-            }
-            contract.setPaidAmount(paidAmount);
-            contract.setPaidPercentage(paidPercentage);
-        }
         List<String> selectFieldList = Arrays.asList(selectFields.split(","));
         ExcelUtil<CmcContract> util = new ExcelUtil<CmcContract>(CmcContract.class);
         util.exportExcel(response, selectFieldList, list, "cmc合同评审数据", StringUtils.EMPTY);

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

@@ -10,6 +10,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.domain.CmcSubContract;
 import com.ruoyi.oa.service.ICmcPartnerService;
@@ -67,6 +68,19 @@ public class CmcSubContractController extends BaseController
         util.exportExcel(response, list, "cmc分包合同评审数据");
     }
 
+    /**
+     * 导出选择字段cmc分包合同评审列表
+     */
+    @Log(title = "cmc分包合同评审", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportSelectFields")
+    public void export(HttpServletResponse response, CmcSubContract cmcSubContract, String selectFields)
+    {
+        List<CmcSubContract> list = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        List<String> selectFieldList = Arrays.asList(selectFields.split(","));
+        ExcelUtil<CmcSubContract> util = new ExcelUtil<CmcSubContract>(CmcSubContract.class);
+        util.exportExcel(response, selectFieldList, list, "cmc分包合同评审数据", StringUtils.EMPTY);
+    }
+
     /**
      * 获取cmc分包合同评审详细信息
      */

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

@@ -56,12 +56,20 @@ public class CmcContract extends BaseEntity
     @Excel(name = "合同金额")
     private BigDecimal amount;
 
-    /** 实际回款金额 */
-    @Excel(name = "实际回款金额")
+    /** 开票金额 */
+    @Excel(name = "开票金额")
+    private BigDecimal invoiceAmount;
+
+    /** 开票比例 */
+    @Excel(name = "开票比例")
+    private String invoicePercentage;
+
+    /** 回款金额 */
+    @Excel(name = "回款金额")
     private BigDecimal paidAmount;
 
-    /** 实际回款比例 */
-    @Excel(name = "实际回款比例")
+    /** 回款比例 */
+    @Excel(name = "回款比例")
     private String paidPercentage;
 
     /** 履约保证金 */
@@ -294,6 +302,24 @@ public class CmcContract extends BaseEntity
     {
         return paidPercentage;
     }
+    public void setInvoiceAmount(BigDecimal invoiceAmount)
+    {
+        this.invoiceAmount = invoiceAmount;
+    }
+
+    public BigDecimal getInvoiceAmount()
+    {
+        return invoiceAmount;
+    }
+    public void setInvoicePercentage(String invoicePercentage)
+    {
+        this.invoicePercentage = invoicePercentage;
+    }
+
+    public String getInvoicePercentage()
+    {
+        return invoicePercentage;
+    }
     public void setDeposit(BigDecimal deposit)
     {
         this.deposit = deposit;

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

@@ -30,10 +30,22 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "分包合同金额")
     private BigDecimal subAmount;
 
-    /** 实际付款金额 */
-    @Excel(name = "实际付款金额")
+    /** 收票金额 */
+    @Excel(name = "收票金额")
+    private BigDecimal invoiceAmount;
+
+    /** 收票比例 */
+    @Excel(name = "收票比例")
+    private String invoicePercentage;
+
+    /** 付款金额 */
+    @Excel(name = "付款金额")
     private BigDecimal paidAmount;
 
+    /** 付款比例 */
+    @Excel(name = "付款比例")
+    private String paidPercentage;
+
     /** 项目id */
     @Excel(name = "项目编号")
     private String projectNumber;
@@ -179,6 +191,33 @@ public class CmcSubContract extends BaseEntity
     {
         return paidAmount;
     }
+    public void setPaidPercentage(String paidPercentage)
+    {
+        this.paidPercentage = paidPercentage;
+    }
+
+    public String getPaidPercentage()
+    {
+        return paidPercentage;
+    }
+    public void setInvoiceAmount(BigDecimal invoiceAmount)
+    {
+        this.invoiceAmount = invoiceAmount;
+    }
+
+    public BigDecimal getInvoiceAmount()
+    {
+        return invoiceAmount;
+    }
+    public void setInvoicePercentage(String invoicePercentage)
+    {
+        this.invoicePercentage = invoicePercentage;
+    }
+
+    public String getInvoicePercentage()
+    {
+        return invoicePercentage;
+    }
     public void setPartnerId(String partnerId)
     {
         this.partnerId = partnerId;

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

@@ -17,6 +17,9 @@
         <result property="borrowAmount"    column="borrow_amount"    />
         <result property="settleAmount"    column="settle_amount"    />
         <result property="paidAmount"    column="paid_amount"    />
+        <result property="paidPercentage"    column="paid_percentage"    />
+        <result property="invoiceAmount"    column="invoice_amount"    />
+        <result property="invoicePercentage"    column="invoice_percentage"    />
         <result property="deposit"    column="deposit"    />
         <result property="contractDocument"    column="contract_document"    />
         <result property="drafter"    column="drafter"    />
@@ -75,9 +78,11 @@
 
     <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, 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
+        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, case c.amount when 0 then '0.00%' else concat(convert(round(sum(cp.paid_amount) / c.amount * 100, 2), CHAR), '%') end as paid_percentage,
+        sum(ci.invoice_amount) as invoice_amount, case c.amount when 0 then '0.00%' else concat(convert(round(sum(ci.invoice_amount) / c.amount * 100, 2), CHAR), '%') end as invoice_percentage,
+        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
         left join sys_user as u1 on u1.user_id = c.manager_user_id
         left join sys_user as u2 on u2.user_id = c.gm_user_id
@@ -86,6 +91,7 @@
         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
+        left join cmc_contract_invoice as ci on ci.contract_id = c.contract_id
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
@@ -116,7 +122,9 @@
 
     <select id="selectCmcContractListFuzzy" parameterType="CmcContract" resultMap="CmcContractResult">
         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, sum(cp.paid_amount) as paid_amount,
+        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, case c.amount when 0 then '0.00%' else concat(convert(round(sum(cp.paid_amount) / c.amount * 100, 2), CHAR), '%') end as paid_percentage,
+        sum(ci.invoice_amount) as invoice_amount, case c.amount when 0 then '0.00%' else concat(convert(round(sum(ci.invoice_amount) / c.amount * 100, 2), CHAR), '%') end as invoice_percentage,
         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

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

@@ -9,6 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subContractName"    column="sub_contract_name"    />
         <result property="subAmount"    column="sub_amount"    />
         <result property="paidAmount"    column="paid_amount"    />
+        <result property="paidPercentage"    column="paid_percentage"    />
+        <result property="invoiceAmount"    column="invoice_amount"    />
+        <result property="invoicePercentage"    column="invoice_percentage"    />
         <result property="partnerId"    column="partner_id"    />
         <result property="contactPerson"    column="contact_person"    />
         <result property="telephone"    column="telephone"    />
@@ -61,9 +64,11 @@ 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, 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
+        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, case sc.amount when 0 then '0.00%' else concat(convert(round(sum(cp.paid_amount) / sc.amount * 100, 2), CHAR), '%') end as paid_percentage,
+        sum(ci.invoice_amount) as invoice_amount, case sc.amount when 0 then '0.00%' else concat(convert(round(sum(ci.invoice_amount) / sc.amount * 100, 2), CHAR), '%') end as invoice_percentage,
+        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
         left join sys_user as u1 on u1.user_id = sc.manager_user_id
         left join sys_user as u2 on u2.user_id = sc.gm_user_id
@@ -71,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        left join cmc_contract_invoice as ci on ci.contract_id = sc.sub_contract_id
     </sql>
 
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">