结算统计

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

@@ -97,9 +97,9 @@ public class CmcBorrowController extends BaseController
         JSONArray yearProjectAmountArray = new JSONArray();
         JSONObject yearProjectAmountObject = new JSONObject();
         //每年借款金额
-        if (cmcBorrow.getApplyDate() == null) {
+        if (cmcBorrow.getLendTime() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
-                cmcBorrow.setApplyDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                cmcBorrow.setLendTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
                 List<CmcBorrow> yearList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
                 yearObject.put(String.valueOf(i), yearList.size());
                 BigDecimal amount = new BigDecimal(0);
@@ -109,16 +109,16 @@ public class CmcBorrowController extends BaseController
                 }
                 amountObject.put(String.valueOf(i), amount);
             }
-            cmcBorrow.setApplyDate(null);
+            cmcBorrow.setLendTime(null);
         }
         else {
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getApplyDate()), cmcBorrowService.selectCmcBorrowList(cmcBorrow).size());
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getLendTime()), cmcBorrowService.selectCmcBorrowList(cmcBorrow).size());
             BigDecimal amount = new BigDecimal(0);
             for (CmcBorrow borrow : cmcBorrowService.selectCmcBorrowList(cmcBorrow)) {
                 if (borrow.getManagerAmount() != null)
                     amount = amount.add(borrow.getManagerAmount());
             }
-            amountObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getApplyDate()), amount);
+            amountObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getLendTime()), amount);
         }
         getBorrowUsageStatistic(cmcBorrow, usageObject, usageAmountObject, yearProjectCountObject, yearProjectAmountObject);
         yearArray.add(yearObject);
@@ -210,8 +210,8 @@ public class CmcBorrowController extends BaseController
                     count ++;
                 }
             }
-            yearProjectCountObject.put(String.valueOf(i), count);
-            yearProjectAmountObject.put(String.valueOf(i), pyAmount);
+            yearProjectCountObject.put(i + "项目", count);
+            yearProjectAmountObject.put(i + "项目", pyAmount);
         }
         cmcBorrow.setBorrowUsage("1");
         usageList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);

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

@@ -87,11 +87,18 @@ public class CmcSettleController extends BaseController
         JSONObject yearObject = new JSONObject();
         JSONArray amountArray = new JSONArray();
         JSONObject amountObject = new JSONObject();
-        //每年结算金额
-        if (cmcSettle.getProjectNumber() == null) {
+        JSONArray typeArray = new JSONArray();
+        JSONObject typeObject = new JSONObject();
+        JSONArray typeAmountArray = new JSONArray();
+        JSONObject typeAmountObject = new JSONObject();
+        JSONArray yearProjectCountArray = new JSONArray();
+        JSONObject yearProjectCountObject = new JSONObject();
+        JSONArray yearProjectAmountArray = new JSONArray();
+        JSONObject yearProjectAmountObject = new JSONObject();
+        //每年借款金额
+        if (cmcSettle.getGmTime() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
-                cmcSettle.setProjectNumber(String.valueOf(i));
-                cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
                 List<CmcSettle> yearList = cmcSettleService.selectCmcSettleList(cmcSettle);
                 yearObject.put(String.valueOf(i), yearList.size());
                 BigDecimal amount = new BigDecimal(0);
@@ -110,8 +117,7 @@ public class CmcSettleController extends BaseController
             cmcSettle.setGmTime(null);
         }
         else {
-            cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
-            yearObject.put(cmcSettle.getProjectNumber(), cmcSettleService.selectCmcSettleList(cmcSettle).size());
+            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();
@@ -125,10 +131,19 @@ public class CmcSettleController extends BaseController
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), amount);
         }
+        getSettleTypeStatistic(cmcSettle, typeObject, typeAmountObject, yearProjectCountObject, yearProjectAmountObject);
         yearArray.add(yearObject);
         amountArray.add(amountObject);
+        typeArray.add(typeObject);
+        typeAmountArray.add(typeAmountObject);
+        yearProjectCountArray.add(yearProjectCountObject);
+        yearProjectAmountArray.add(yearProjectAmountObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("amount", amountArray);
+        jsonObject.put("type", typeArray);
+        jsonObject.put("typeAmount", typeAmountArray);
+        jsonObject.put("yearProjectCount", yearProjectCountArray);
+        jsonObject.put("yearProjectAmount", yearProjectAmountArray);
         return success(jsonObject);
     }
 
@@ -166,4 +181,57 @@ public class CmcSettleController extends BaseController
     {
         return success(cmcSettleService.deleteCmcSettleBySettleIds(settleIds));
     }
+
+    //各用途结算次数
+    public void getSettleTypeStatistic(CmcSettle cmcSettle, JSONObject typeObject, JSONObject typeAmountObject, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) {
+        cmcSettle.setXmName(" ");
+        List<CmcSettle> typeList = cmcSettleService.selectCmcSettleList(cmcSettle);
+        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());
+            }
+        }
+        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 ++;
+                    }
+                }
+            }
+            yearProjectCountObject.put(i + "项目", count);
+            yearProjectAmountObject.put(i + "项目", pyAmount);
+        }
+        cmcSettle.setXmName(null);
+        cmcSettle.setProjectId("0");
+        typeList = cmcSettleService.selectCmcSettleList(cmcSettle);
+        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());
+            }
+        }
+        typeAmountObject.put("其他结算", oAmount);
+    }
 }

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

@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyDept != null  and applyDept != ''"> and b.apply_dept = #{applyDept}</if>
             <if test="applier != null "> and b.applier = #{applier}</if>
             <if test="remark != null "> and b.remark = #{remark}</if>
-            <if test="applyDate != null "> and YEAR(b.apply_date) = YEAR(#{applyDate})</if>
+            <if test="applyDate != null "> and b.apply_date = #{applyDate}</if>
             <if test="applyAmount != null "> and b.apply_amount = #{applyAmount}</if>
             <if test="managerAmount != null "> and b.manager_amount = #{managerAmount}</if>
             <if test="deptComment != null  and deptComment != ''"> and b.dept_comment = #{deptComment}</if>
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null "> and b.manager_time = #{managerTime}</if>
             <if test="zjlTime != null "> and b.zjl_time = #{zjlTime}</if>
             <if test="dszTime != null "> and b.dsz_time = #{dszTime}</if>
-            <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
+            <if test="lendTime != null "> and YEAR(b.lend_time) = YEAR(#{lendTime})</if>
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
         order by b.apply_date desc

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

@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
             <if test="reportDept != null  and reportDept != ''"> and s.report_dept = #{reportDept}</if>
-            <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
+            <if test="xmName != null"> and s.xm_name = #{xmName}</if>
             <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and s.reporter = #{reporter}</if>
             <if test="reportTime != null "> and s.report_time = #{reportTime}</if>
@@ -138,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerComment != null  and managerComment != ''"> and s.manager_comment = #{managerComment}</if>
             <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) == '2000' "> and s.gm_time is not null</if>
+            <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>
         order by s.report_time desc

oa-ui/src/views/statistics/components/borrowStatistics.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-23 17:00:10
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-10-24 14:54:45
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -107,7 +107,7 @@ export default {
             year = ''
           }
           that.dataLoading = true
-          getBorrowStatistic({ applyDate: year }).then(res => {
+          getBorrowStatistic({ lendTime: year }).then(res => {
             that.borrowUsage = res.data.usage[0];
             that.borrowUsageAmount = res.data.usageAmount[0];
             that.dataLoading = false
@@ -328,7 +328,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: Object.keys(this.yearProjectAmount).map(item => item + '项目'),
+            data: Object.keys(this.yearProjectAmount),
             axisPointer: {
               type: 'shadow'
             }