已完成回款合同数

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

@@ -82,6 +82,10 @@ public class CmcContractController extends BaseController
         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();
@@ -92,14 +96,19 @@ public class CmcContractController extends BaseController
                 cmcContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
                 List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
                 yearObject.put(String.valueOf(i), yearList.size());
+                int count = 0;
                 BigDecimal amount = new BigDecimal(0);
                 BigDecimal paidAmount = new BigDecimal(0);
                 for (CmcContract contract : yearList) {
                     if (contract.getAmount() != null)
                         amount = amount.add(contract.getAmount());
-                    if (contract.getPaidAmount() != null)
+                    if (contract.getPaidAmount() != null) {
                         paidAmount = paidAmount.add(contract.getPaidAmount());
+                        if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                            count ++;
+                    }
                 }
+                paidYearObject.put(String.valueOf(i), count);
                 amountObject.put(String.valueOf(i), amount);
                 paidAmountObject.put(String.valueOf(i), paidAmount);
             }
@@ -108,28 +117,37 @@ public class CmcContractController extends BaseController
         else {
             //输入年份合同数量及金额
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), cmcContractService.selectCmcContractList(cmcContract).size());
+            int count = 0;
             BigDecimal amount = new BigDecimal(0);
             BigDecimal paidAmount = new BigDecimal(0);
             for (CmcContract contract : cmcContractService.selectCmcContractList(cmcContract)) {
                 if (contract.getAmount() != null)
                     amount = amount.add(contract.getAmount());
-                if (contract.getPaidAmount() != null)
+                if (contract.getPaidAmount() != null) {
                     paidAmount = paidAmount.add(contract.getPaidAmount());
+                    if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                        count ++;
+                }
             }
+            paidYearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), count);
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), amount);
             paidAmountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), paidAmount);
         }
-        getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject, paidCwAmountObject);
+        getProjectSourceStatistic(cmcContract, 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("cwAmount", cwAmountArray);
+        jsonObject.put("paidYear", paidYearArray);
+        jsonObject.put("paidSource", paidSourceArray);
         jsonObject.put("paidAmount", paidAmountArray);
         jsonObject.put("paidCwAmount", paidCwAmountArray);
         return success(jsonObject);
@@ -226,31 +244,41 @@ public class CmcContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject) {
+    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject paidSourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject) {
         cmcContract.setProjectSource("1");
         List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        int cCount = 0;
+        int wCount = 0;
         BigDecimal cAmount = new BigDecimal(0);
         BigDecimal wAmount = new BigDecimal(0);
         BigDecimal paidCAmount = new BigDecimal(0);
         BigDecimal paidWAmount = new BigDecimal(0);
         for (CmcContract contract : sourceList) {
-            if(contract.getAmount() != null)
+            if (contract.getAmount() != null)
                 wAmount = wAmount.add(contract.getAmount());
-            if(contract.getPaidAmount() != null)
+            if (contract.getPaidAmount() != null) {
                 paidWAmount = paidWAmount.add(contract.getPaidAmount());
+                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                    wCount ++;
+            }
         }
         sourceObject.put("院外项目", sourceList.size());
+        paidSourceObject.put("已完成回款院外项目", wCount);
         cwAmountObject.put("院外项目承接金额", wAmount);
         paidCwAmountObject.put("院外项目回款金额", paidWAmount);
         cmcContract.setProjectSource("0");
         sourceList = cmcContractService.selectCmcContractList(cmcContract);
         for (CmcContract contract : sourceList) {
-            if(contract.getAmount() != null)
+            if (contract.getAmount() != null)
                 cAmount = cAmount.add(contract.getAmount());
-            if(contract.getPaidAmount() != null)
+            if (contract.getPaidAmount() != null) {
                 paidCAmount = paidCAmount.add(contract.getPaidAmount());
+                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
+                    cCount ++;
+            }
         }
         sourceObject.put("院内项目", sourceList.size());
+        paidSourceObject.put("已完成回款院内项目", cCount);
         cwAmountObject.put("院内项目承接金额", cAmount);
         paidCwAmountObject.put("院内项目回款金额", paidCAmount);
         cmcContract.setProjectSource(null);

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

@@ -92,6 +92,10 @@ public class CmcSubContractController extends BaseController
         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();
@@ -102,14 +106,19 @@ public class CmcSubContractController extends BaseController
                 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)
+                    if (subContract.getPaidAmount() != null) {
                         paidAmount = paidAmount.add(subContract.getPaidAmount());
+                        if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
+                            count ++;
+                    }
                 }
+                paidYearObject.put(String.valueOf(i), count);
                 amountObject.put(String.valueOf(i), amount);
                 paidAmountObject.put(String.valueOf(i), paidAmount);
             }
@@ -118,27 +127,36 @@ public class CmcSubContractController extends BaseController
         else {
             //输入年份合同数量及金额
             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)
+                if (subContract.getPaidAmount() != null) {
                     paidAmount = paidAmount.add(subContract.getPaidAmount());
+                    if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
+                        count ++;
+                }
             }
+            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);
         }
-        getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject, paidCwAmountObject);
+        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);
@@ -176,31 +194,41 @@ public class CmcSubContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject) {
+    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;
         BigDecimal cAmount = new BigDecimal(0);
         BigDecimal wAmount = new BigDecimal(0);
         BigDecimal paidCAmount = new BigDecimal(0);
         BigDecimal paidWAmount = new BigDecimal(0);
         for (CmcSubContract subContract : sourceList) {
-            if(subContract.getSubAmount() != null)
+            if (subContract.getSubAmount() != null)
                 wAmount = wAmount.add(subContract.getSubAmount());
-            if(subContract.getPaidAmount() != null)
+            if (subContract.getPaidAmount() != null) {
                 paidWAmount = paidWAmount.add(subContract.getPaidAmount());
+                if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
+                    wCount ++;
+            }
         }
         sourceObject.put("院外项目", sourceList.size());
+        paidSourceObject.put("已完成付款院外项目", wCount);
         cwAmountObject.put("院外项目分包金额", wAmount);
         paidCwAmountObject.put("院外项目付款金额", paidWAmount);
         cmcSubContract.setProjectSource("0");
         sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
         for (CmcSubContract subContract : sourceList) {
-            if(subContract.getSubAmount() != null)
+            if (subContract.getSubAmount() != null)
                 cAmount = cAmount.add(subContract.getSubAmount());
-            if(subContract.getPaidAmount() != null)
+            if (subContract.getPaidAmount() != null) {
                 paidCAmount = paidCAmount.add(subContract.getPaidAmount());
+                if (subContract.getPaidAmount().compareTo(subContract.getSubAmount()) >= 0)
+                    cCount ++;
+            }
         }
         sourceObject.put("院内项目", sourceList.size());
+        paidSourceObject.put("已完成付款院内项目", cCount);
         cwAmountObject.put("院内项目分包金额", cAmount);
         paidCwAmountObject.put("院内项目付款金额", paidCAmount);
         cmcSubContract.setProjectSource(null);