根据时间范围合同统计数据修正

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

         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);
+        int totalCount = 0;
+        int paidTotalCount = 0;
+        BigDecimal totalAmount = new BigDecimal(0);
+        BigDecimal paidTotalAmount = new BigDecimal(0);
+        String beginTime = "";
+        String endTime = "";
         //每年合同数量及金额
         if (cmcContract.getSignDate() == null) {
             if (cmcContract.getParams().size() == 0) {
                             }
                         }
                     }
-                    yearCount += yearCountI;
-                    paidYearCount += paidYearCountI;
-                    yearAmount = yearAmount.add(yearAmountI);
-                    paidYearAmount = paidYearAmount.add(paidAmountI);
+                    totalCount += yearCountI;
+                    paidTotalCount += paidYearCountI;
+                    totalAmount = totalAmount.add(yearAmountI);
+                    paidTotalAmount = paidTotalAmount.add(paidAmountI);
                     yearCountObject.put(String.valueOf(i), yearCountI);
                     paidYearCountObject.put(String.valueOf(i), paidYearCountI);
                     yearAmountObject.put(String.valueOf(i), yearAmountI);
                 }
             }
             else {
-                String beginTime = (String) cmcContract.getParams().get("beginTime");
-                String endTime = (String) cmcContract.getParams().get("endTime");
+                beginTime = (String) cmcContract.getParams().get("beginTime");
+                endTime = (String) cmcContract.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.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);
-                    cmcContract.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");
                         if (contract.getAmount() != null) {
                             monthAmount = monthAmount.add(contract.getAmount());
                             if (contract.getPaidAmount() != null) {
-                                paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                                paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
                                 if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
                                     paidMonthCount++;
                             }
                         }
                     }
+                    totalCount += monthCount;
+                    paidTotalCount += paidMonthCount;
+                    totalAmount = totalAmount.add(monthAmount);
+                    paidTotalAmount = paidTotalAmount.add(paidMonthAmount);
                     monthCountObject.put(monthList.get(i), monthCount);
                     monthAmountObject.put(monthList.get(i),monthAmount);
                     paidMonthCountObject.put(monthList.get(i), paidMonthCount);
         }
         else if (cmcContract.getSignDate() != null) {
             //输入年份合同数量及金额
-            yearCount = cmcContractService.selectCmcContractList(cmcContract).size();
-            yearCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), yearCount);
+            totalCount = cmcContractService.selectCmcContractList(cmcContract).size();
+            yearCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), totalCount);
             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";
                 calendar.set(Calendar.YEAR, Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate())));
                 calendar.set(Calendar.MONTH, i - 1);
                 String endTimeString = new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month + "-" + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
-                cmcContract.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");
                     if (contract.getAmount() != null) {
                         monthAmount = monthAmount.add(contract.getAmount());
                         if (contract.getPaidAmount() != null) {
-                            paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                            paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
                             if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
                                 paidMonthCount++;
                         }
                 paidMonthAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()) + "-" + month, paidMonthAmount);
             }
             for (CmcContract contract : cmcContractService.selectCmcContractList(cmcContract)) {
-                if (contract.getAmount() != null)
-                    yearAmount = yearAmount.add(contract.getAmount());
-                if (contract.getPaidAmount() != null) {
-                    paidYearAmount = paidYearAmount.add(contract.getPaidAmount());
-                    if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                        paidYearCount ++;
+                if (contract.getAmount() != null) {
+                    totalAmount = totalAmount.add(contract.getAmount());
+                    if (contract.getPaidAmount() != null) {
+                        paidTotalAmount = paidTotalAmount.add(contract.getPaidAmount());
+                        if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                            paidTotalCount++;
+                    }
                 }
             }
-            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);
+            paidYearCountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidTotalCount);
+            yearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), totalAmount);
+            paidYearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidTotalAmount);
         }
-        getProjectSourceStatistic(cmcContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, yearCount, paidYearCount, yearAmount, paidYearAmount);
+        getProjectSourceStatistic(cmcContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, totalCount, paidTotalCount, totalAmount, paidTotalAmount, beginTime, endTime);
         yearCountArray.add(yearCountObject);
         monthCountArray.add(monthCountObject);
         sourceCountArray.add(sourceCountObject);
 
     //院内外项目数量及金额
     public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceCountObject, JSONObject paidSourceCountObject, JSONObject sourceAmountObject, JSONObject paidSourceAmountObject,
-                                          int count, int paidCount, BigDecimal amount, BigDecimal paidAmount) {
+                                          int totalCount, int paidTotalCount, BigDecimal totalAmount, BigDecimal paidTotalAmount, String beginTime, String endTime) {
         int cCount;
         int wCount;
         int nCount;
         BigDecimal paidWAmount = new BigDecimal(0);
         BigDecimal paidNAmount;
         cmcContract.setProjectSource("1");
-        List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        List<CmcContract> sourceList;
+        if (beginTime.equals(""))
+            sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcContract.setParams(params);
+            sourceList = cmcContractService.selectCmcContractListByRange(cmcContract);
+        }
         wCount = sourceList.size();
         for (CmcContract contract : sourceList) {
-            if (contract.getAmount() != null)
+            if (contract.getAmount() != null) {
                 wAmount = wAmount.add(contract.getAmount());
-            if (contract.getPaidAmount() != null) {
-                paidWAmount = paidWAmount.add(contract.getPaidAmount());
-                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                    paidWCount ++;
+                if (contract.getPaidAmount() != null) {
+                    paidWAmount = paidWAmount.add(contract.getPaidAmount());
+                    if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                        paidWCount++;
+                }
             }
         }
-        nCount = count - wCount;
-        paidNCount = paidCount - wCount;
-        nAmount = amount.subtract(wAmount);
-        paidNAmount = paidAmount.subtract(paidWAmount);
+        nCount = totalCount - wCount;
+        paidNCount = paidTotalCount - wCount;
+        nAmount = totalAmount.subtract(wAmount);
+        paidNAmount = paidTotalAmount.subtract(paidWAmount);
         sourceCountObject.put("院外项目", wCount);
         paidSourceCountObject.put("已完成回款院外项目", paidWCount);
         sourceAmountObject.put("院外项目承接金额", wAmount);
         paidSourceAmountObject.put("院外项目回款金额", paidWAmount);
         cmcContract.setProjectSource("0");
-        sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        if (beginTime.equals(""))
+            sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcContract.setParams(params);
+            sourceList = cmcContractService.selectCmcContractListByRange(cmcContract);
+        }
         cCount = sourceList.size();
         for (CmcContract contract : sourceList) {
-            if (contract.getAmount() != null)
+            if (contract.getAmount() != null) {
                 cAmount = cAmount.add(contract.getAmount());
-            if (contract.getPaidAmount() != null) {
-                paidCAmount = paidCAmount.add(contract.getPaidAmount());
-                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                    paidCCount ++;
+                if (contract.getPaidAmount() != null) {
+                    paidCAmount = paidCAmount.add(contract.getPaidAmount());
+                    if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                        paidCCount++;
+                }
             }
         }
         nCount = nCount - cCount;

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

         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);
+        int totalCount = 0;
+        int paidTotalCount = 0;
+        BigDecimal totalAmount = new BigDecimal(0);
+        BigDecimal paidTotalAmount = new BigDecimal(0);
+        String beginTime = "";
+        String endTime = "";
         //每年合同数量及金额
         if (cmcSubContract.getSignDate() == null) {
             if (cmcSubContract.getParams().size() == 0) {
                             }
                         }
                     }
-                    yearCount += yearCountI;
-                    paidYearCount += paidYearCountI;
-                    yearAmount = yearAmount.add(yearAmountI);
-                    paidYearAmount = paidYearAmount.add(paidAmountI);
+                    totalCount += yearCountI;
+                    paidTotalCount += paidYearCountI;
+                    totalAmount = totalAmount.add(yearAmountI);
+                    paidTotalAmount = paidTotalAmount.add(paidAmountI);
                     yearCountObject.put(String.valueOf(i), yearCountI);
                     paidYearCountObject.put(String.valueOf(i), paidYearCountI);
                     yearAmountObject.put(String.valueOf(i), yearAmountI);
                 }
             }
             else {
-                String beginTime = (String) cmcSubContract.getParams().get("beginTime");
-                String endTime = (String) cmcSubContract.getParams().get("endTime");
+                beginTime = (String) cmcSubContract.getParams().get("beginTime");
+                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.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");
                         if (contract.getSubAmount() != null) {
                             monthAmount = monthAmount.add(contract.getSubAmount());
                             if (contract.getPaidAmount() != null) {
-                                paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                                paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
                                 if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
                                     paidMonthCount++;
                             }
                         }
                     }
+                    totalCount += monthCount;
+                    paidTotalCount += paidMonthCount;
+                    totalAmount = totalAmount.add(monthAmount);
+                    paidTotalAmount = paidTotalAmount.add(paidMonthAmount);
                     monthCountObject.put(monthList.get(i), monthCount);
                     monthAmountObject.put(monthList.get(i),monthAmount);
                     paidMonthCountObject.put(monthList.get(i), paidMonthCount);
         }
         else if (cmcSubContract.getSignDate() != null) {
             //输入年份合同数量及金额
-            yearCount = cmcSubContractService.selectCmcSubContractList(cmcSubContract).size();
-            yearCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), yearCount);
+            totalCount = cmcSubContractService.selectCmcSubContractList(cmcSubContract).size();
+            yearCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), totalCount);
             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.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");
                     if (contract.getSubAmount() != null) {
                         monthAmount = monthAmount.add(contract.getSubAmount());
                         if (contract.getPaidAmount() != null) {
-                            paidMonthAmount = paidYearAmount.add(contract.getPaidAmount());
+                            paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
                             if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
                                 paidMonthCount++;
                         }
                 paidMonthAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()) + "-" + month, paidMonthAmount);
             }
             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 ++;
+                if (contract.getSubAmount() != null) {
+                    totalAmount = totalAmount.add(contract.getSubAmount());
+                    if (contract.getPaidAmount() != null) {
+                        paidTotalAmount = paidTotalAmount.add(contract.getPaidAmount());
+                        if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                            paidTotalCount++;
+                    }
                 }
             }
-            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);
+            paidYearCountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidTotalCount);
+            yearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), totalAmount);
+            paidYearAmountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), paidTotalAmount);
         }
-        getProjectSourceStatistic(cmcSubContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, yearCount, paidYearCount, yearAmount, paidYearAmount);
+        getProjectSourceStatistic(cmcSubContract, sourceCountObject, paidSourceCountObject, sourceAmountObject, paidSourceAmountObject, totalCount, paidTotalCount, totalAmount, paidTotalAmount, beginTime, endTime);
         yearCountArray.add(yearCountObject);
         monthCountArray.add(monthCountObject);
         sourceCountArray.add(sourceCountObject);
 
     //院内外项目数量及金额
     public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceCountObject, JSONObject paidSourceCountObject, JSONObject sourceAmountObject, JSONObject paidSourceAmountObject,
-                                          int count, int paidCount, BigDecimal amount, BigDecimal paidAmount) {
+                                          int totalCount, int paidTotalCount, BigDecimal totalAmount, BigDecimal paidTotalAmount, String beginTime, String endTime) {
         int cCount;
         int wCount;
         int nCount;
         BigDecimal paidWAmount = new BigDecimal(0);
         BigDecimal paidNAmount;
         cmcSubContract.setProjectSource("1");
-        List<CmcSubContract> sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        List<CmcSubContract> sourceList;
+        if (beginTime.equals(""))
+            sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcSubContract.setParams(params);
+            sourceList = cmcSubContractService.selectCmcSubContractListByRange(cmcSubContract);
+        }
         wCount = sourceList.size();
         for (CmcSubContract contract : sourceList) {
-            if (contract.getSubAmount() != null)
+            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 ++;
+                if (contract.getPaidAmount() != null) {
+                    paidWAmount = paidWAmount.add(contract.getPaidAmount());
+                    if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                        paidWCount++;
+                }
             }
         }
-        nCount = count - wCount;
-        paidNCount = paidCount - wCount;
-        nAmount = amount.subtract(wAmount);
-        paidNAmount = paidAmount.subtract(paidWAmount);
+        nCount = totalCount - wCount;
+        paidNCount = paidTotalCount - wCount;
+        nAmount = totalAmount.subtract(wAmount);
+        paidNAmount = paidTotalAmount.subtract(paidWAmount);
         sourceCountObject.put("院外项目", wCount);
         paidSourceCountObject.put("已完成付款院外项目", paidWCount);
         sourceAmountObject.put("院外项目分包金额", wAmount);
         paidSourceAmountObject.put("院外项目付款金额", paidWAmount);
         cmcSubContract.setProjectSource("0");
-        sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        if (beginTime.equals(""))
+            sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcSubContract.setParams(params);
+            sourceList = cmcSubContractService.selectCmcSubContractListByRange(cmcSubContract);
+        }
         cCount = sourceList.size();
         for (CmcSubContract contract : sourceList) {
-            if (contract.getSubAmount() != null)
+            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 ++;
+                if (contract.getPaidAmount() != null) {
+                    paidCAmount = paidCAmount.add(contract.getPaidAmount());
+                    if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
+                        paidCCount++;
+                }
             }
         }
         nCount = nCount - cCount;