结算统计效率优化

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

@@ -82,7 +82,6 @@ public class CmcSettleController extends BaseController
      */
     @GetMapping("/statistic")
     public AjaxResult getSettleStatistic(CmcSettle cmcSettle) throws ParseException {
-        cmcSettle.setContent("实际结算总金额");
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
@@ -103,7 +102,7 @@ public class CmcSettleController extends BaseController
                 List<CmcSettle> yearList = cmcSettleService.selectCmcSettleList(cmcSettle);
                 yearObject.put(String.valueOf(i), yearList.size());
                 BigDecimal amount = new BigDecimal(0);
-                for (CmcSettle settle : yearList) {
+                for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
                     if (settle.getAmount() != null)
                         amount = amount.add(settle.getAmount());
                 }
@@ -114,7 +113,7 @@ public class CmcSettleController extends BaseController
         else {
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), cmcSettleService.selectCmcSettleList(cmcSettle).size());
             BigDecimal amount = new BigDecimal(0);
-            for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
+            for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
                 if (settle.getAmount() != null)
                     amount = amount.add(settle.getAmount());
             }
@@ -177,7 +176,7 @@ public class CmcSettleController extends BaseController
         List<CmcSettle> typeList = cmcSettleService.selectCmcSettleList(cmcSettle);
         typeObject.put("项目结算", typeList.size());
         BigDecimal pAmount = new BigDecimal(0);
-        for (CmcSettle settle : typeList) {
+        for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
             if (settle.getAmount() != null)
                 pAmount = pAmount.add(settle.getAmount());
         }
@@ -185,7 +184,7 @@ public class CmcSettleController extends BaseController
         for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
             BigDecimal pyAmount = new BigDecimal(0);
             int count = 0;
-            for (CmcSettle settle : typeList) {
+            for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
                 if (settle.getAmount() != null && settle.getProjectNumber() != null && settle.getProjectNumber().contains(String.valueOf(i))) {
                     pyAmount = pyAmount.add(settle.getAmount());
                     count ++;
@@ -199,7 +198,7 @@ public class CmcSettleController extends BaseController
         typeList = cmcSettleService.selectCmcSettleList(cmcSettle);
         typeObject.put("其他结算", typeList.size());
         BigDecimal oAmount = new BigDecimal(0);
-        for (CmcSettle settle : typeList) {
+        for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
             if (settle.getAmount() != null)
                 oAmount = oAmount.add(settle.getAmount());
         }

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

@@ -39,6 +39,9 @@ public class CmcSettle extends BaseEntity
     /** 结算内容 */
     private String content;
 
+    /** 表格编号 */
+    private String tableNumber;
+
     /** 实际结算总金额 */
     @Excel(name = "实际结算总金额")
     private BigDecimal amount;
@@ -559,15 +562,6 @@ public class CmcSettle extends BaseEntity
     {
         return amount;
     }
-    public void setContent(String content)
-    {
-        this.content = content;
-    }
-
-    public String getContent()
-    {
-        return content;
-    }
 
 
     @Override

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcSettleMapper.java

@@ -27,6 +27,14 @@ public interface CmcSettleMapper
      */
     public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle);
 
+    /**
+     * 查询cmc结算统计列表
+     *
+     * @param cmcSettle cmc结算审批
+     * @return cmc结算审批集合
+     */
+    public List<CmcSettle> selectCmcSettleStatisticList(CmcSettle cmcSettle);
+
     /**
      * 新增cmc结算审批
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcSettleService.java

@@ -27,6 +27,14 @@ public interface ICmcSettleService
      */
     public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle);
 
+    /**
+     * 查询cmc结算统计列表
+     *
+     * @param cmcSettle cmc结算审批
+     * @return cmc结算审批集合
+     */
+    public List<CmcSettle> selectCmcSettleStatisticList(CmcSettle cmcSettle);
+
     /**
      * 新增cmc结算审批
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcSettleServiceImpl.java

@@ -43,6 +43,17 @@ public class CmcSettleServiceImpl implements ICmcSettleService
         return cmcSettleMapper.selectCmcSettleList(cmcSettle);
     }
 
+    /**
+     * 查询cmc结算统计列表
+     *
+     * @param cmcSettle cmc结算审批
+     * @return cmc结算审批集合
+     */
+    public List<CmcSettle> selectCmcSettleStatisticList(CmcSettle cmcSettle)
+    {
+        return cmcSettleMapper.selectCmcSettleStatisticList(cmcSettle);
+    }
+
     /**
      * 新增cmc结算审批
      * 

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

@@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="modifyDocument"    column="modify_document"    />
         <result property="finalDocument"    column="final_document"    />
         <result property="amount"    column="amount"    />
-        <result property="content"    column="content"    />
         <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
@@ -98,8 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcSettleVo">
         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, ss.amount,
+               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.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
@@ -146,7 +145,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by s.settle_id
         order by s.report_time desc
     </select>
-    
+
+    <select id="selectCmcSettleStatisticList" parameterType="CmcSettle" resultMap="CmcSettleResult">
+        select t0.settle_id, t0.project_id, t0.project_number, t0.project_name, t0.xm_name, t0.gm_time, (t2.amount - t0.amount) as amount from
+        (select distinct s.settle_id, s.project_id, p.project_number, p.project_name, s.xm_name, ss.table_number, s.gm_time, sum(ss.amount) as amount from cmc_settle as s
+        left join cmc_project as p on p.project_id = s.project_id
+        left join cmc_settle_summary as ss on ss.settle_id = s.settle_id
+        where ss.table_number = '0' group by s.settle_id) as t0 left join
+        (select distinct s.settle_id, sum(ss.amount) as amount from cmc_settle as s
+        left join cmc_project as p on p.project_id = s.project_id
+        left join cmc_settle_summary as ss on ss.settle_id = s.settle_id
+        where ss.table_number = '2' group by s.settle_id) as t2 on t0.settle_id = t2.settle_id
+        <where>
+            <if test="projectId != null"> and t0.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and t0.project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="xmName != null"> and t0.xm_name = #{xmName}</if>
+            <if test="gmTime != null"> and YEAR(t0.gm_time) = YEAR(#{gmTime})</if>
+        </where>
+    </select>
+
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         where s.settle_id = #{settleId}