分包合同按月统计

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

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.*;
 import org.apache.poi.hpsf.Decimal;
@@ -74,61 +75,68 @@ public class CmcContractController extends BaseController
     @GetMapping("/statistic")
     public AjaxResult getContractStatistic(CmcContract cmcContract) throws ParseException {
         JSONObject jsonObject = new JSONObject();
-        JSONArray yearArray = new JSONArray();
-        JSONObject yearObject = new JSONObject();
-        JSONArray monthArray = new JSONArray();
-        JSONObject monthObject = new JSONObject();
-        JSONArray sourceArray = new JSONArray();
-        JSONObject sourceObject = new JSONObject();
-        JSONArray amountArray = new JSONArray();
-        JSONObject amountObject = new JSONObject();
-        JSONArray cwAmountArray = new JSONArray();
-        JSONObject cwAmountObject = new JSONObject();
-        JSONArray paidYearArray = new JSONArray();
-        JSONObject paidYearObject = new JSONObject();
-        JSONArray paidSourceArray = new JSONArray();
-        JSONObject paidSourceObject = new JSONObject();
-        JSONArray paidAmountArray = new JSONArray();
-        JSONObject paidAmountObject = new JSONObject();
-        JSONArray paidCwAmountArray = new JSONArray();
-        JSONObject paidCwAmountObject = new JSONObject();
-        int count = 0;
-        int paidCount = 0;
-        BigDecimal amount = new BigDecimal(0);
-        BigDecimal paidAmount = new BigDecimal(0);
+        JSONArray yearCountArray = new JSONArray();
+        JSONObject yearCountObject = new JSONObject();
+        JSONArray monthCountArray = new JSONArray();
+        JSONObject monthCountObject = new JSONObject();
+        JSONArray sourceCountArray = new JSONArray();
+        JSONObject sourceCountObject = new JSONObject();
+        JSONArray yearAmountArray = new JSONArray();
+        JSONObject yearAmountObject = new JSONObject();
+        JSONArray monthAmountArray = new JSONArray();
+        JSONObject monthAmountObject = new JSONObject();
+        JSONArray sourceAmountArray = new JSONArray();
+        JSONObject sourceAmountObject = new JSONObject();
+        JSONArray paidYearCountArray = new JSONArray();
+        JSONObject paidYearCountObject = new JSONObject();
+        JSONArray paidMonthCountArray = new JSONArray();
+        JSONObject paidMonthCountObject = new JSONObject();
+        JSONArray paidSourceCountArray = new JSONArray();
+        JSONObject paidSourceCountObject = new JSONObject();
+        JSONArray paidYearAmountArray = new JSONArray();
+        JSONObject paidYearAmountObject = new JSONObject();
+        JSONArray paidMonthAmountArray = new JSONArray();
+        JSONObject paidMonthAmountObject = new JSONObject();
+        JSONArray paidSourceAmountArray = new JSONArray();
+        JSONObject paidSourceAmountObject = new JSONObject();
+        int yearCount = 0;
+        int paidYearCount = 0;
+        BigDecimal yearAmount = new BigDecimal(0);
+        BigDecimal paidYearAmount = new BigDecimal(0);
         //每年合同数量及金额
         if (cmcContract.getSignDate() == null) {
             if (cmcContract.getParams().size() == 0) {
                 for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                     cmcContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
-                    List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
-                    int countI = yearList.size();
-                    count += countI;
-                    yearObject.put(String.valueOf(i), countI);
-                    int paidCountI = 0;
-                    BigDecimal amountI = new BigDecimal(0);
+                    List<CmcContract> yearContractList = cmcContractService.selectCmcContractList(cmcContract);
+                    int yearCountI = yearContractList.size();
+                    int paidYearCountI = 0;
+                    BigDecimal yearAmountI = new BigDecimal(0);
                     BigDecimal paidAmountI = new BigDecimal(0);
-                    for (CmcContract contract : yearList) {
-                        if (contract.getAmount() != null)
-                            amountI = amountI.add(contract.getAmount());
-                        if (contract.getPaidAmount() != null) {
-                            paidAmountI = paidAmountI.add(contract.getPaidAmount());
-                            if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                                paidCountI++;
+                    for (CmcContract contract : yearContractList) {
+                        if (contract.getAmount() != null) {
+                            yearAmountI = yearAmountI.add(contract.getAmount());
+                            if (contract.getPaidAmount() != null) {
+                                paidAmountI = paidAmountI.add(contract.getPaidAmount());
+                                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                                    paidYearCountI++;
+                            }
                         }
                     }
-                    paidCount += paidCountI;
-                    amount = amount.add(amountI);
-                    paidAmount = paidAmount.add(paidAmountI);
-                    paidYearObject.put(String.valueOf(i), paidCountI);
-                    amountObject.put(String.valueOf(i), amountI);
-                    paidAmountObject.put(String.valueOf(i), paidAmountI);
+                    yearCount += yearCountI;
+                    paidYearCount += paidYearCountI;
+                    yearAmount = yearAmount.add(yearAmountI);
+                    paidYearAmount = paidYearAmount.add(paidAmountI);
+                    yearCountObject.put(String.valueOf(i), yearCountI);
+                    paidYearCountObject.put(String.valueOf(i), paidYearCountI);
+                    yearAmountObject.put(String.valueOf(i), yearAmountI);
+                    paidYearAmountObject.put(String.valueOf(i), paidAmountI);
                 }
             }
             else {
                 String beginTime = (String) cmcContract.getParams().get("beginTime");
                 String endTime = (String) cmcContract.getParams().get("endTime");
-                List<String> monthList = getMonthBetweenDate(beginTime, endTime);
+                List<String> monthList = DateUtils.getMonthBetweenDate(beginTime, endTime);
                 for (int i = 0; i < monthList.size(); i++) {
                     String beginTimeString = monthList.get(i) + "-01";
                     Calendar calendar = Calendar.getInstance();
@@ -140,15 +148,33 @@ public class CmcContractController extends BaseController
                     params.put("beginTime", beginTimeString + " 00:00:00");
                     params.put("endTime", endTimeString + " 23:59:59");
                     cmcContract.setParams(params);
-                    monthObject.put(monthList.get(i) + "月", cmcContractService.selectCmcContractListByRange(cmcContract).size());
+                    List<CmcContract> monthContractList = cmcContractService.selectCmcContractListByRange(cmcContract);
+                    int monthCount = monthContractList.size();
+                    int paidMonthCount = 0;
+                    BigDecimal monthAmount = new BigDecimal(0);
+                    BigDecimal paidMonthAmount = new BigDecimal(0);
+                    for (CmcContract contract : monthContractList) {
+                        if (contract.getAmount() != null) {
+                            monthAmount = monthAmount.add(contract.getAmount());
+                            if (contract.getPaidAmount() != null) {
+                                paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                                    paidMonthCount++;
+                            }
+                        }
+                    }
+                    monthCountObject.put(monthList.get(i), monthCount);
+                    monthAmountObject.put(monthList.get(i),monthAmount);
+                    paidMonthCountObject.put(monthList.get(i), paidMonthCount);
+                    paidMonthAmountObject.put(monthList.get(i), paidMonthAmount);
                 }
             }
             cmcContract.setSignDate(null);
         }
         else if (cmcContract.getSignDate() != null) {
             //输入年份合同数量及金额
-            count = cmcContractService.selectCmcContractList(cmcContract).size();
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), count);
+            yearCount = cmcContractService.selectCmcContractList(cmcContract).size();
+            yearCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), yearCount);
             for (int i = 1; i <= 12; i++) {
                 String month = i < 10 ? "0" + i : String.valueOf(i);
                 String beginTimeString = new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month + "-01";
@@ -161,40 +187,64 @@ public class CmcContractController extends BaseController
                 params.put("beginTime", beginTimeString + " 00:00:00");
                 params.put("endTime", endTimeString + " 23:59:59");
                 cmcContract.setParams(params);
-                monthObject.put(i + "月", cmcContractService.selectCmcContractListByRange(cmcContract).size());
+                List<CmcContract> monthContractList = cmcContractService.selectCmcContractListByRange(cmcContract);
+                int monthCount = monthContractList.size();
+                int paidMonthCount = 0;
+                BigDecimal monthAmount = new BigDecimal(0);
+                BigDecimal paidMonthAmount = new BigDecimal(0);
+                for (CmcContract contract : monthContractList) {
+                    if (contract.getAmount() != null) {
+                        monthAmount = monthAmount.add(contract.getAmount());
+                        if (contract.getPaidAmount() != null) {
+                            paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                            if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                                paidMonthCount++;
+                        }
+                    }
+                }
+                monthCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month, monthCount);
+                monthAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month,monthAmount);
+                paidMonthCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month, paidMonthCount);
+                paidMonthAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month, paidMonthAmount);
             }
             for (CmcContract contract : cmcContractService.selectCmcContractList(cmcContract)) {
                 if (contract.getAmount() != null)
-                    amount = amount.add(contract.getAmount());
+                    yearAmount = yearAmount.add(contract.getAmount());
                 if (contract.getPaidAmount() != null) {
-                    paidAmount = paidAmount.add(contract.getPaidAmount());
+                    paidYearAmount = paidYearAmount.add(contract.getPaidAmount());
                     if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                        paidCount ++;
+                        paidYearCount ++;
                 }
             }
-            paidYearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidCount);
-            amountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), amount);
-            paidAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidAmount);
+            paidYearCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidYearCount);
+            yearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), yearAmount);
+            paidYearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidYearAmount);
         }
-        getProjectSourceStatistic(cmcContract, sourceObject, paidSourceObject, cwAmountObject, paidCwAmountObject, count, paidCount, amount, paidAmount);
-        yearArray.add(yearObject);
-        monthArray.add(monthObject);
-        sourceArray.add(sourceObject);
-        amountArray.add(amountObject);
-        cwAmountArray.add(cwAmountObject);
-        paidYearArray.add(paidYearObject);
-        paidSourceArray.add(paidSourceObject);
-        paidAmountArray.add(paidAmountObject);
-        paidCwAmountArray.add(paidCwAmountObject);
-        jsonObject.put("year", yearArray);
-        jsonObject.put("month", monthArray);
-        jsonObject.put("source", sourceArray);
-        jsonObject.put("amount", amountArray);
-        jsonObject.put("cwAmount", cwAmountArray);
-        jsonObject.put("paidYear", paidYearArray);
-        jsonObject.put("paidSource", paidSourceArray);
-        jsonObject.put("paidAmount", paidAmountArray);
-        jsonObject.put("paidCwAmount", paidCwAmountArray);
+        getProjectSourceStatistic(cmcContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, yearCount, paidYearCount, yearAmount, paidYearAmount);
+        yearCountArray.add(yearCountObject);
+        monthCountArray.add(monthCountObject);
+        sourceCountArray.add(sourceCountObject);
+        yearAmountArray.add(yearAmountObject);
+        monthAmountArray.add(monthAmountObject);
+        sourceAmountArray.add(sourceAmountObject);
+        paidYearCountArray.add(paidYearCountObject);
+        paidMonthCountArray.add(paidMonthCountObject);
+        paidSourceCountArray.add(paidSourceCountObject);
+        paidYearAmountArray.add(paidYearAmountObject);
+        paidMonthAmountArray.add(paidMonthAmountObject);
+        paidSourceAmountArray.add(paidSourceAmountObject);
+        jsonObject.put("yearCount", yearCountArray);
+        jsonObject.put("monthCount", monthCountArray);
+        jsonObject.put("sourceCount", sourceCountArray);
+        jsonObject.put("yearAmount", yearAmountArray);
+        jsonObject.put("monthAmount", monthAmountArray);
+        jsonObject.put("sourceAmount", sourceAmountArray);
+        jsonObject.put("paidYearCount", paidYearCountArray);
+        jsonObject.put("paidMonthCount", paidMonthCountArray);
+        jsonObject.put("paidSourceCount", paidSourceCountArray);
+        jsonObject.put("paidYearAmount", paidYearAmountArray);
+        jsonObject.put("paidMonthAmount", paidMonthAmountArray);
+        jsonObject.put("paidSourceAmount", paidSourceAmountArray);
         return success(jsonObject);
     }
 
@@ -289,7 +339,7 @@ public class CmcContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject paidSourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject,
+    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceCountObject, JSONObject paidSourceCountObject, JSONObject sourceAmountObject, JSONObject paidSourceAmountObject,
                                           int count, int paidCount, BigDecimal amount, BigDecimal paidAmount) {
         int cCount;
         int wCount;
@@ -319,10 +369,10 @@ public class CmcContractController extends BaseController
         paidNCount = paidCount - wCount;
         nAmount = amount.subtract(wAmount);
         paidNAmount = paidAmount.subtract(paidWAmount);
-        sourceObject.put("院外项目", wCount);
-        paidSourceObject.put("已完成回款院外项目", paidWCount);
-        cwAmountObject.put("院外项目承接金额", wAmount);
-        paidCwAmountObject.put("院外项目回款金额", paidWAmount);
+        sourceCountObject.put("院外项目", wCount);
+        paidSourceCountObject.put("已完成回款院外项目", paidWCount);
+        sourceAmountObject.put("院外项目承接金额", wAmount);
+        paidSourceAmountObject.put("院外项目回款金额", paidWAmount);
         cmcContract.setProjectSource("0");
         sourceList = cmcContractService.selectCmcContractList(cmcContract);
         cCount = sourceList.size();
@@ -339,48 +389,15 @@ public class CmcContractController extends BaseController
         paidNCount = paidNCount - cCount;
         nAmount = nAmount.subtract(cAmount);
         paidNAmount = paidNAmount.subtract(paidCAmount);
-        sourceObject.put("院内项目", cCount);
-        paidSourceObject.put("已完成回款院内项目", paidCCount);
-        cwAmountObject.put("院内项目承接金额", cAmount);
-        paidCwAmountObject.put("院内项目回款金额", paidCAmount);
+        sourceCountObject.put("院内项目", cCount);
+        paidSourceCountObject.put("已完成回款院内项目", paidCCount);
+        sourceAmountObject.put("院内项目承接金额", cAmount);
+        paidSourceAmountObject.put("院内项目回款金额", paidCAmount);
         cmcContract.setProjectSource(null);
-        sourceObject.put("未关联项目", nCount);
-        paidSourceObject.put("已完成回款未关联项目", paidNCount);
-        cwAmountObject.put("未关联项目承接金额", nAmount);
-        paidCwAmountObject.put("未关联项目回款金额", paidNAmount);
-    }
-    /**
-     * 获取两个日期之间的所有月份 (年月)
-     *
-     * @param startTime
-     * @param endTime
-     * @return：YYYY-MM
-     */
-    public static List<String> getMonthBetweenDate(String startTime, String endTime){
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-        // 声明保存日期集合
-        List<String> list = new ArrayList<String>();
-        try {
-            // 转化成日期类型
-            Date startDate = sdf.parse(startTime);
-            Date endDate = sdf.parse(endTime);
-
-            //用Calendar 进行日期比较判断
-            Calendar calendar = Calendar.getInstance();
-            while (startDate.getTime()<=endDate.getTime()){
-                // 把日期添加到集合
-                list.add(sdf.format(startDate));
-                // 设置日期
-                calendar.setTime(startDate);
-                //把日期增加一天
-                calendar.add(Calendar.MONTH, 1);
-                // 获取增加后的日期
-                startDate=calendar.getTime();
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return list;
+        sourceCountObject.put("未关联项目", nCount);
+        paidSourceCountObject.put("已完成回款未关联项目", paidNCount);
+        sourceAmountObject.put("未关联项目承接金额", nAmount);
+        paidSourceAmountObject.put("未关联项目回款金额", paidNAmount);
     }
 
 }

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

@@ -3,17 +3,15 @@ package com.ruoyi.web.controller.oa;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 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.oa.domain.*;
 import com.ruoyi.oa.domain.CmcSubContract;
-import com.ruoyi.oa.domain.CmcSubContract;
-import com.ruoyi.oa.domain.CmcPartner;
 import com.ruoyi.oa.service.ICmcPartnerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -84,82 +82,176 @@ public class CmcSubContractController extends BaseController
     @GetMapping("/statistic")
     public AjaxResult getSubContractStatistic(CmcSubContract cmcSubContract) throws ParseException {
         JSONObject jsonObject = new JSONObject();
-        JSONArray yearArray = new JSONArray();
-        JSONObject yearObject = new JSONObject();
-        JSONArray sourceArray = new JSONArray();
-        JSONObject sourceObject = new JSONObject();
-        JSONArray amountArray = new JSONArray();
-        JSONObject amountObject = new JSONObject();
-        JSONArray cwAmountArray = new JSONArray();
-        JSONObject cwAmountObject = new JSONObject();
-        JSONArray paidYearArray = new JSONArray();
-        JSONObject paidYearObject = new JSONObject();
-        JSONArray paidSourceArray = new JSONArray();
-        JSONObject paidSourceObject = new JSONObject();
-        JSONArray paidAmountArray = new JSONArray();
-        JSONObject paidAmountObject = new JSONObject();
-        JSONArray paidCwAmountArray = new JSONArray();
-        JSONObject paidCwAmountObject = new JSONObject();
+        JSONArray yearCountArray = new JSONArray();
+        JSONObject yearCountObject = new JSONObject();
+        JSONArray monthCountArray = new JSONArray();
+        JSONObject monthCountObject = new JSONObject();
+        JSONArray sourceCountArray = new JSONArray();
+        JSONObject sourceCountObject = new JSONObject();
+        JSONArray yearAmountArray = new JSONArray();
+        JSONObject yearAmountObject = new JSONObject();
+        JSONArray monthAmountArray = new JSONArray();
+        JSONObject monthAmountObject = new JSONObject();
+        JSONArray sourceAmountArray = new JSONArray();
+        JSONObject sourceAmountObject = new JSONObject();
+        JSONArray paidYearCountArray = new JSONArray();
+        JSONObject paidYearCountObject = new JSONObject();
+        JSONArray paidMonthCountArray = new JSONArray();
+        JSONObject paidMonthCountObject = new JSONObject();
+        JSONArray paidSourceCountArray = new JSONArray();
+        JSONObject paidSourceCountObject = new JSONObject();
+        JSONArray paidYearAmountArray = new JSONArray();
+        JSONObject paidYearAmountObject = new JSONObject();
+        JSONArray paidMonthAmountArray = new JSONArray();
+        JSONObject paidMonthAmountObject = new JSONObject();
+        JSONArray paidSourceAmountArray = new JSONArray();
+        JSONObject paidSourceAmountObject = new JSONObject();
+        int yearCount = 0;
+        int paidYearCount = 0;
+        BigDecimal yearAmount = new BigDecimal(0);
+        BigDecimal paidYearAmount = new BigDecimal(0);
         //每年合同数量及金额
         if (cmcSubContract.getSignDate() == null) {
-            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
-                cmcSubContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
-                List<CmcSubContract> yearList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
-                yearObject.put(String.valueOf(i), yearList.size());
-                int count = 0;
-                BigDecimal amount = new BigDecimal(0);
-                BigDecimal paidAmount = new BigDecimal(0);
-                for (CmcSubContract subContract : yearList) {
-                    if (subContract.getSubAmount() != null)
-                        amount = amount.add(subContract.getSubAmount());
-                    if (subContract.getPaidAmount() != null) {
-                        paidAmount = paidAmount.add(subContract.getPaidAmount());
-                        if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
-                            count ++;
+            if (cmcSubContract.getParams().size() == 0) {
+                for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                    cmcSubContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                    List<CmcSubContract> yearContractList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+                    int yearCountI = yearContractList.size();
+                    int paidYearCountI = 0;
+                    BigDecimal yearAmountI = new BigDecimal(0);
+                    BigDecimal paidAmountI = new BigDecimal(0);
+                    for (CmcSubContract contract : yearContractList) {
+                        if (contract.getSubAmount() != null) {
+                            yearAmountI = yearAmountI.add(contract.getSubAmount());
+                            if (contract.getPaidAmount() != null) {
+                                paidAmountI = paidAmountI.add(contract.getPaidAmount());
+                                if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                                    paidYearCountI++;
+                            }
+                        }
+                    }
+                    yearCount += yearCountI;
+                    paidYearCount += paidYearCountI;
+                    yearAmount = yearAmount.add(yearAmountI);
+                    paidYearAmount = paidYearAmount.add(paidAmountI);
+                    yearCountObject.put(String.valueOf(i), yearCountI);
+                    paidYearCountObject.put(String.valueOf(i), paidYearCountI);
+                    yearAmountObject.put(String.valueOf(i), yearAmountI);
+                    paidYearAmountObject.put(String.valueOf(i), paidAmountI);
+                }
+            }
+            else {
+                String beginTime = (String) cmcSubContract.getParams().get("beginTime");
+                String endTime = (String) cmcSubContract.getParams().get("endTime");
+                List<String> monthList = DateUtils.getMonthBetweenDate(beginTime, endTime);
+                for (int i = 0; i < monthList.size(); i++) {
+                    String beginTimeString = monthList.get(i) + "-01";
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.set(Calendar.YEAR, Integer.parseInt(monthList.get(i).split("-")[0]));
+                    calendar.set(Calendar.MONTH, Integer.parseInt(monthList.get(i).split("-")[1]) - 1);
+                    String endTimeString = monthList.get(i) + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+                    cmcSubContract.setSignDate(new SimpleDateFormat("yyyy").parse(beginTimeString));
+                    Map<String, Object> params = new HashMap<>();
+                    params.put("beginTime", beginTimeString + " 00:00:00");
+                    params.put("endTime", endTimeString + " 23:59:59");
+                    cmcSubContract.setParams(params);
+                    List<CmcSubContract> monthContractList = cmcSubContractService.selectCmcSubContractListByRange(cmcSubContract);
+                    int monthCount = monthContractList.size();
+                    int paidMonthCount = 0;
+                    BigDecimal monthAmount = new BigDecimal(0);
+                    BigDecimal paidMonthAmount = new BigDecimal(0);
+                    for (CmcSubContract contract : monthContractList) {
+                        if (contract.getSubAmount() != null) {
+                            monthAmount = monthAmount.add(contract.getSubAmount());
+                            if (contract.getPaidAmount() != null) {
+                                paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                                if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                                    paidMonthCount++;
+                            }
+                        }
                     }
+                    monthCountObject.put(monthList.get(i), monthCount);
+                    monthAmountObject.put(monthList.get(i),monthAmount);
+                    paidMonthCountObject.put(monthList.get(i), paidMonthCount);
+                    paidMonthAmountObject.put(monthList.get(i), paidMonthAmount);
                 }
-                paidYearObject.put(String.valueOf(i), count);
-                amountObject.put(String.valueOf(i), amount);
-                paidAmountObject.put(String.valueOf(i), paidAmount);
             }
             cmcSubContract.setSignDate(null);
         }
-        else {
+        else if (cmcSubContract.getSignDate() != null) {
             //输入年份合同数量及金额
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), cmcSubContractService.selectCmcSubContractList(cmcSubContract).size());
-            int count = 0;
-            BigDecimal amount = new BigDecimal(0);
-            BigDecimal paidAmount = new BigDecimal(0);
-            for (CmcSubContract subContract : cmcSubContractService.selectCmcSubContractList(cmcSubContract)) {
-                if (subContract.getSubAmount() != null)
-                    amount = amount.add(subContract.getSubAmount());
-                if (subContract.getPaidAmount() != null) {
-                    paidAmount = paidAmount.add(subContract.getPaidAmount());
-                    if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
-                        count ++;
+            yearCount = cmcSubContractService.selectCmcSubContractList(cmcSubContract).size();
+            yearCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), yearCount);
+            for (int i = 1; i <= 12; i++) {
+                String month = i < 10 ? "0" + i : String.valueOf(i);
+                String beginTimeString = new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month + "-01";
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.YEAR, Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate())));
+                calendar.set(Calendar.MONTH, i - 1);
+                String endTimeString = new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+                cmcSubContract.setSignDate(new SimpleDateFormat("yyyy").parse(beginTimeString));
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                params.put("endTime", endTimeString + " 23:59:59");
+                cmcSubContract.setParams(params);
+                List<CmcSubContract> monthContractList = cmcSubContractService.selectCmcSubContractListByRange(cmcSubContract);
+                int monthCount = monthContractList.size();
+                int paidMonthCount = 0;
+                BigDecimal monthAmount = new BigDecimal(0);
+                BigDecimal paidMonthAmount = new BigDecimal(0);
+                for (CmcSubContract contract : monthContractList) {
+                    if (contract.getSubAmount() != null) {
+                        monthAmount = monthAmount.add(contract.getSubAmount());
+                        if (contract.getPaidAmount() != null) {
+                            paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                            if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                                paidMonthCount++;
+                        }
+                    }
                 }
+                monthCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month, monthCount);
+                monthAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month,monthAmount);
+                paidMonthCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month, paidMonthCount);
+                paidMonthAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month, paidMonthAmount);
             }
-            paidYearObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), count);
-            amountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), amount);
-            paidAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidAmount);
+            for (CmcSubContract contract : cmcSubContractService.selectCmcSubContractList(cmcSubContract)) {
+                if (contract.getSubAmount() != null)
+                    yearAmount = yearAmount.add(contract.getSubAmount());
+                if (contract.getPaidAmount() != null) {
+                    paidYearAmount = paidYearAmount.add(contract.getPaidAmount());
+                    if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                        paidYearCount ++;
+                }
+            }
+            paidYearCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidYearCount);
+            yearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), yearAmount);
+            paidYearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidYearAmount);
         }
-        getProjectSourceStatistic(cmcSubContract, sourceObject, paidSourceObject, cwAmountObject, paidCwAmountObject);
-        yearArray.add(yearObject);
-        sourceArray.add(sourceObject);
-        amountArray.add(amountObject);
-        cwAmountArray.add(cwAmountObject);
-        paidYearArray.add(paidYearObject);
-        paidSourceArray.add(paidSourceObject);
-        paidAmountArray.add(paidAmountObject);
-        paidCwAmountArray.add(paidCwAmountObject);
-        jsonObject.put("year", yearArray);
-        jsonObject.put("source", sourceArray);
-        jsonObject.put("amount", amountArray);
-        jsonObject.put("paidYear", paidYearArray);
-        jsonObject.put("paidSource", paidSourceArray);
-        jsonObject.put("cwAmount", cwAmountArray);
-        jsonObject.put("paidAmount", paidAmountArray);
-        jsonObject.put("paidCwAmount", paidCwAmountArray);
+        getProjectSourceStatistic(cmcSubContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, yearCount, paidYearCount, yearAmount, paidYearAmount);
+        yearCountArray.add(yearCountObject);
+        monthCountArray.add(monthCountObject);
+        sourceCountArray.add(sourceCountObject);
+        yearAmountArray.add(yearAmountObject);
+        monthAmountArray.add(monthAmountObject);
+        sourceAmountArray.add(sourceAmountObject);
+        paidYearCountArray.add(paidYearCountObject);
+        paidMonthCountArray.add(paidMonthCountObject);
+        paidSourceCountArray.add(paidSourceCountObject);
+        paidYearAmountArray.add(paidYearAmountObject);
+        paidMonthAmountArray.add(paidMonthAmountObject);
+        paidSourceAmountArray.add(paidSourceAmountObject);
+        jsonObject.put("yearCount", yearCountArray);
+        jsonObject.put("monthCount", monthCountArray);
+        jsonObject.put("sourceCount", sourceCountArray);
+        jsonObject.put("yearAmount", yearAmountArray);
+        jsonObject.put("monthAmount", monthAmountArray);
+        jsonObject.put("sourceAmount", sourceAmountArray);
+        jsonObject.put("paidYearCount", paidYearCountArray);
+        jsonObject.put("paidMonthCount", paidMonthCountArray);
+        jsonObject.put("paidSourceCount", paidSourceCountArray);
+        jsonObject.put("paidYearAmount", paidYearAmountArray);
+        jsonObject.put("paidMonthAmount", paidMonthAmountArray);
+        jsonObject.put("paidSourceAmount", paidSourceAmountArray);
         return success(jsonObject);
     }
 
@@ -194,44 +286,65 @@ public class CmcSubContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceObject, JSONObject paidSourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject) {
-        cmcSubContract.setProjectSource("1");
-        List<CmcSubContract> sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
-        int cCount = 0;
-        int wCount = 0;
+    public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceCountObject, JSONObject paidSourceCountObject, JSONObject sourceAmountObject, JSONObject paidSourceAmountObject,
+                                          int count, int paidCount, BigDecimal amount, BigDecimal paidAmount) {
+        int cCount;
+        int wCount;
+        int nCount;
+        int paidCCount = 0;
+        int paidWCount = 0;
+        int paidNCount;
         BigDecimal cAmount = new BigDecimal(0);
         BigDecimal wAmount = new BigDecimal(0);
+        BigDecimal nAmount;
         BigDecimal paidCAmount = new BigDecimal(0);
         BigDecimal paidWAmount = new BigDecimal(0);
-        for (CmcSubContract subContract : sourceList) {
-            if (subContract.getSubAmount() != null)
-                wAmount = wAmount.add(subContract.getSubAmount());
-            if (subContract.getPaidAmount() != null) {
-                paidWAmount = paidWAmount.add(subContract.getPaidAmount());
-                if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
-                    wCount ++;
+        BigDecimal paidNAmount;
+        cmcSubContract.setProjectSource("1");
+        List<CmcSubContract> sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        wCount = sourceList.size();
+        for (CmcSubContract contract : sourceList) {
+            if (contract.getSubAmount() != null)
+                wAmount = wAmount.add(contract.getSubAmount());
+            if (contract.getPaidAmount() != null) {
+                paidWAmount = paidWAmount.add(contract.getPaidAmount());
+                if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                    paidWCount ++;
             }
         }
-        sourceObject.put("院外项目", sourceList.size());
-        paidSourceObject.put("已完成付款院外项目", wCount);
-        cwAmountObject.put("院外项目分包金额", wAmount);
-        paidCwAmountObject.put("院外项目付款金额", paidWAmount);
+        nCount = count - wCount;
+        paidNCount = paidCount - wCount;
+        nAmount = amount.subtract(wAmount);
+        paidNAmount = paidAmount.subtract(paidWAmount);
+        sourceCountObject.put("院外项目", wCount);
+        paidSourceCountObject.put("已完成付款院外项目", paidWCount);
+        sourceAmountObject.put("院外项目分包金额", wAmount);
+        paidSourceAmountObject.put("院外项目付款金额", paidWAmount);
         cmcSubContract.setProjectSource("0");
         sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
-        for (CmcSubContract subContract : sourceList) {
-            if (subContract.getSubAmount() != null)
-                cAmount = cAmount.add(subContract.getSubAmount());
-            if (subContract.getPaidAmount() != null) {
-                paidCAmount = paidCAmount.add(subContract.getPaidAmount());
-                if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
-                    cCount ++;
+        cCount = sourceList.size();
+        for (CmcSubContract contract : sourceList) {
+            if (contract.getSubAmount() != null)
+                cAmount = cAmount.add(contract.getSubAmount());
+            if (contract.getPaidAmount() != null) {
+                paidCAmount = paidCAmount.add(contract.getPaidAmount());
+                if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                    paidCCount ++;
             }
         }
-        sourceObject.put("院内项目", sourceList.size());
-        paidSourceObject.put("已完成付款院内项目", cCount);
-        cwAmountObject.put("院内项目分包金额", cAmount);
-        paidCwAmountObject.put("院内项目付款金额", paidCAmount);
+        nCount = nCount - cCount;
+        paidNCount = paidNCount - cCount;
+        nAmount = nAmount.subtract(cAmount);
+        paidNAmount = paidNAmount.subtract(paidCAmount);
+        sourceCountObject.put("院内项目", cCount);
+        paidSourceCountObject.put("已完成付款院内项目", paidCCount);
+        sourceAmountObject.put("院内项目分包金额", cAmount);
+        paidSourceAmountObject.put("院内项目付款金额", paidCAmount);
         cmcSubContract.setProjectSource(null);
+        sourceCountObject.put("未关联项目", nCount);
+        paidSourceCountObject.put("已完成付款未关联项目", paidNCount);
+        sourceAmountObject.put("未关联项目分包金额", nAmount);
+        paidSourceAmountObject.put("未关联项目付款金额", paidNAmount);
     }
 
 }

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -8,8 +8,11 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
+
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
@@ -227,4 +230,38 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         }
         return age;
     }
+
+    /**
+     * 获取两个日期之间的所有月份 (年月)
+     *
+     * @param startTime
+     * @param endTime
+     * @return：YYYY-MM
+     */
+    public static List<String> getMonthBetweenDate(String startTime, String endTime){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        // 声明保存日期集合
+        List<String> list = new ArrayList<String>();
+        try {
+            // 转化成日期类型
+            Date startDate = sdf.parse(startTime);
+            Date endDate = sdf.parse(endTime);
+
+            //用Calendar 进行日期比较判断
+            Calendar calendar = Calendar.getInstance();
+            while (startDate.getTime() <= endDate.getTime()){
+                // 把日期添加到集合
+                list.add(sdf.format(startDate));
+                // 设置日期
+                calendar.setTime(startDate);
+                //把日期增加一天
+                calendar.add(Calendar.MONTH, 1);
+                // 获取增加后的日期
+                startDate = calendar.getTime();
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.oa.mapper;
 
 import java.util.List;
+
+import com.ruoyi.oa.domain.CmcSubContract;
 import com.ruoyi.oa.domain.CmcSubContract;
 
 /**
@@ -27,6 +29,14 @@ public interface CmcSubContractMapper
      */
     public List<CmcSubContract> selectCmcSubContractList(CmcSubContract cmcSubContract);
 
+    /**
+     * 按时间范围查询cmc分包合同评审列表
+     *
+     * @param cmcSubContract cmc分包合同评审
+     * @return cmc分包合同评审集合
+     */
+    public List<CmcSubContract> selectCmcSubContractListByRange(CmcSubContract cmcSubContract);
+
     /**
      * 新增cmc分包合同评审
      * 

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

@@ -27,6 +27,14 @@ public interface ICmcSubContractService
      */
     public List<CmcSubContract> selectCmcSubContractList(CmcSubContract cmcSubContract);
 
+    /**
+     * 按时间范围查询cmc分包合同评审列表
+     *
+     * @param cmcSubContract cmc分包合同评审
+     * @return cmc分包合同评审集合
+     */
+    public List<CmcSubContract> selectCmcSubContractListByRange(CmcSubContract cmcSubContract);
+
     /**
      * 新增cmc分包合同评审
      * 

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

@@ -43,6 +43,18 @@ public class CmcSubContractServiceImpl implements ICmcSubContractService
         return cmcSubContractMapper.selectCmcSubContractList(cmcSubContract);
     }
 
+    /**
+     * 按时间范围查询cmc分包合同评审列表
+     *
+     * @param cmcSubContract cmc分包合同评审
+     * @return cmc分包合同评审
+     */
+    @Override
+    public List<CmcSubContract> selectCmcSubContractListByRange(CmcSubContract cmcSubContract)
+    {
+        return cmcSubContractMapper.selectCmcSubContractListByRange(cmcSubContract);
+    }
+
     /**
      * 新增cmc分包合同评审
      * 

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

@@ -74,6 +74,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
+        <include refid="selectCmcSubContractVo"/>
+        <where>
+            <if test="subContractName != null  and subContractName != ''"> and sc.sub_contract_name like concat('%', #{subContractName}, '%')</if>
+            <if test="subAmount != null "> and sc.sub_amount = #{subAmount}</if>
+            <if test="partnerId != null  and partnerId != ''"> and sc.partner_id = #{partnerId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and sc.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and sc.telephone = #{telephone}</if>
+            <if test="contractDocument != null  and contractDocument != ''"> and sc.contract_document = #{contractDocument}</if>
+            <if test="drafter != null "> and sc.drafter = #{drafter}</if>
+            <if test="draftTime != null "> and sc.draft_time = #{draftTime}</if>
+            <if test="signDate != null "> and YEAR(sc.sign_date) = YEAR(#{signDate})</if>
+            <if test="signRemark != null  and signRemark != ''"> and sc.sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and sc.sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and sc.comment_type = #{commentType}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+        </where>
+        group by sc.sub_contract_id
+        order by sc.draft_time desc
+    </select>
+
+    <select id="selectCmcSubContractListByRange" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
         <where>
             <if test="subContractName != null  and subContractName != ''"> and sc.sub_contract_name like concat('%', #{subContractName}, '%')</if>
@@ -99,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by sc.sub_contract_id
         order by sc.draft_time desc
     </select>
-    
+
     <select id="selectCmcSubContractBySubContractId" parameterType="String" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
         where sc.sub_contract_id = #{subContractId}