结算统计优化

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

@@ -103,14 +103,8 @@ public class CmcSettleController extends BaseController
                 yearObject.put(String.valueOf(i), yearList.size());
                 BigDecimal amount = new BigDecimal(0);
                 for (CmcSettle settle : yearList) {
-                    CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
-                    cmcSettleSummary.setSettleId(settle.getSettleId());
-                    cmcSettleSummary.setContent("实际结算总金额");
-                    if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
-                        CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
-                        if (settleSummary.getAmount() != null)
-                            amount = amount.add(settleSummary.getAmount());
-                    }
+                    if (settle.getAmount() != null)
+                        amount = amount.add(settle.getAmount());
                 }
                 amountObject.put(String.valueOf(i), amount);
             }
@@ -120,14 +114,8 @@ public class CmcSettleController extends BaseController
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), cmcSettleService.selectCmcSettleList(cmcSettle).size());
             BigDecimal amount = new BigDecimal(0);
             for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
-                CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
-                cmcSettleSummary.setSettleId(settle.getSettleId());
-                cmcSettleSummary.setContent("实际结算总金额");
-                if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
-                    CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
-                    if (settleSummary.getAmount() != null)
-                        amount = amount.add(settleSummary.getAmount());
-                }
+                if (settle.getAmount() != null)
+                    amount = amount.add(settle.getAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), amount);
         }
@@ -189,29 +177,17 @@ public class CmcSettleController extends BaseController
         typeObject.put("项目结算", typeList.size());
         BigDecimal pAmount = new BigDecimal(0);
         for (CmcSettle settle : typeList) {
-            CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
-            cmcSettleSummary.setSettleId(settle.getSettleId());
-            cmcSettleSummary.setContent("实际结算总金额");
-            if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
-                CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
-                if (settleSummary.getAmount() != null)
-                    pAmount = pAmount.add(settleSummary.getAmount());
-            }
+            if (settle.getAmount() != null)
+                pAmount = pAmount.add(settle.getAmount());
         }
         typeAmountObject.put("项目结算", pAmount);
         for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
             BigDecimal pyAmount = new BigDecimal(0);
             int count = 0;
             for (CmcSettle settle : typeList) {
-                CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
-                cmcSettleSummary.setSettleId(settle.getSettleId());
-                cmcSettleSummary.setContent("实际结算总金额");
-                if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
-                    CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
-                    if (settleSummary.getAmount() != null && settle.getProjectNumber() != null && settle.getProjectNumber().contains(String.valueOf(i))) {
-                        pyAmount = pyAmount.add(settleSummary.getAmount());
-                        count ++;
-                    }
+                if (settle.getAmount() != null && settle.getProjectNumber() != null && settle.getProjectNumber().contains(String.valueOf(i))) {
+                    pyAmount = pyAmount.add(settle.getAmount());
+                    count ++;
                 }
             }
             yearProjectCountObject.put(i + "项目", count);
@@ -223,14 +199,8 @@ public class CmcSettleController extends BaseController
         typeObject.put("其他结算", typeList.size());
         BigDecimal oAmount = new BigDecimal(0);
         for (CmcSettle settle : typeList) {
-            CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
-            cmcSettleSummary.setSettleId(settle.getSettleId());
-            cmcSettleSummary.setContent("实际结算总金额");
-            if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
-                CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
-                if (settleSummary.getAmount() != null)
-                    oAmount = oAmount.add(settleSummary.getAmount());
-            }
+            if (settle.getAmount() != null)
+                oAmount = oAmount.add(settle.getAmount());
         }
         typeAmountObject.put("其他结算", oAmount);
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettle.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 com.ruoyi.common.core.domain.entity.SysDept;
@@ -35,6 +36,10 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "其他项目名称")
     private String xmName;
 
+    /** 实际结算总金额 */
+    @Excel(name = "实际结算总金额")
+    private BigDecimal amount;
+
     /** 工作量上报说明 */
     @Excel(name = "工作量上报说明")
     private String workloadReport;
@@ -542,6 +547,16 @@ public class CmcSettle extends BaseEntity
     {
         return dszUser;
     }
+    public void setAmount(BigDecimal amount)
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount()
+    {
+        return amount;
+    }
+
 
     @Override
     public String toString() {

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

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settleDocument"    column="settle_document"    />
         <result property="modifyDocument"    column="modify_document"    />
         <result property="finalDocument"    column="final_document"    />
+        <result property="amount"    column="amount"    />
         <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
@@ -95,9 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcSettleVo">
-        select s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as report_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
+        select distinct s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as report_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
                s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, 
-               s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment,
+               s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment, ss.amount,
                s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document, s.report_dept, d.dept_name from cmc_settle as s
         left join sys_user as u on u.user_id = s.reporter
         left join sys_user as u1 on u1.user_id = s.zh_user_id
@@ -108,12 +109,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user as u6 on u6.user_id = s.dsz_user_id
         left join cmc_project as p on p.project_id = s.project_id
         left join sys_dept as d on d.dept_id = s.report_dept
+        left join cmc_settle_summary as ss on ss.settle_id = s.settle_id
     </sql>
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         <where>
-
+            ss.content = '实际结算总金额'
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
@@ -141,11 +143,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) != '2000' "> and YEAR(s.gm_time) = YEAR(#{gmTime})</if>
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
+        group by s.settle_id
         order by s.report_time desc
     </select>
     
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
+        group by s.settle_id
         where s.settle_id = #{settleId}
     </select>