项目相关借款分项目年份统计

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

         JSONObject usageObject = new JSONObject();
         JSONArray usageAmountArray = new JSONArray();
         JSONObject usageAmountObject = new JSONObject();
+        JSONArray yearProjectCountArray = new JSONArray();
+        JSONObject yearProjectCountObject = new JSONObject();
+        JSONArray yearProjectAmountArray = new JSONArray();
+        JSONObject yearProjectAmountObject = new JSONObject();
         //每年借款金额
         if (cmcBorrow.getApplyDate() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getApplyDate()), amount);
         }
-        getBorrowUsageStatistic(cmcBorrow, usageObject, usageAmountObject);
+        getBorrowUsageStatistic(cmcBorrow, usageObject, usageAmountObject, yearProjectCountObject, yearProjectAmountObject);
         yearArray.add(yearObject);
         amountArray.add(amountObject);
         usageArray.add(usageObject);
         usageAmountArray.add(usageAmountObject);
+        yearProjectCountArray.add(yearProjectCountObject);
+        yearProjectAmountArray.add(yearProjectAmountObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("amount", amountArray);
         jsonObject.put("usage", usageArray);
         jsonObject.put("usageAmount", usageAmountArray);
+        jsonObject.put("yearProjectCount", yearProjectCountArray);
+        jsonObject.put("yearProjectAmount", yearProjectAmountArray);
         return success(jsonObject);
     }
 
     }
 
     //各用途借款次数
-    public void getBorrowUsageStatistic(CmcBorrow cmcBorrow, JSONObject usageObject, JSONObject usageAmountObject) {
+    public void getBorrowUsageStatistic(CmcBorrow cmcBorrow, JSONObject usageObject, JSONObject usageAmountObject, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) {
         cmcBorrow.setBorrowUsage("0");
         List<CmcBorrow> usageList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
         usageObject.put("项目借款", usageList.size());
                 pAmount = pAmount.add(borrow.getManagerAmount());
         }
         usageAmountObject.put("项目借款", pAmount);
+        for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+            BigDecimal pyAmount = new BigDecimal(0);
+            int count = 0;
+            for (CmcBorrow borrow : usageList) {
+                if (borrow.getManagerAmount() != null && borrow.getProjectNumber() != null && borrow.getProjectNumber().contains(String.valueOf(i))) {
+                    pyAmount = pyAmount.add(borrow.getManagerAmount());
+                    count ++;
+                }
+            }
+            yearProjectCountObject.put(String.valueOf(i), count);
+            yearProjectAmountObject.put(String.valueOf(i), pyAmount);
+        }
         cmcBorrow.setBorrowUsage("1");
         usageList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
         usageObject.put("非项目借款", usageList.size());

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

     {
         return projectId;
     }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
     public void setProject(CmcProject project)
     {
         this.project = project;

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

     <resultMap type="CmcBorrow" id="CmcBorrowResult">
         <result property="borrowId"    column="borrow_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
         <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="borrowUsage"    column="borrow_usage"    />
         <include refid="selectCmcBorrowVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
+            <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="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
             <if test="borrowUsage != null  and borrowUsage != ''"> and b.borrow_usage = #{borrowUsage}</if>