按月合同统计

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

@@ -76,6 +76,8 @@ public class CmcContractController extends BaseController
         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();
@@ -90,51 +92,93 @@ public class CmcContractController extends BaseController
         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);
         //每年合同数量及金额
         if (cmcContract.getSignDate() == null) {
-            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);
-                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) {
-                        paidAmount = paidAmount.add(contract.getPaidAmount());
-                        if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                            count ++;
+            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);
+                    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++;
+                        }
                     }
+                    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);
+                }
+            }
+            else {
+                String beginTime = (String) cmcContract.getParams().get("beginTime");
+                String endTime = (String) cmcContract.getParams().get("endTime");
+                List<String> monthList = 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);
+                    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");
+                    cmcContract.setParams(params);
+                    monthObject.put(monthList.get(i) + "月", cmcContractService.selectCmcContractListByRange(cmcContract).size());
                 }
-                paidYearObject.put(String.valueOf(i), count);
-                amountObject.put(String.valueOf(i), amount);
-                paidAmountObject.put(String.valueOf(i), paidAmount);
             }
             cmcContract.setSignDate(null);
         }
-        else {
+        else if (cmcContract.getSignDate() != null) {
             //输入年份合同数量及金额
-            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);
+            count = cmcContractService.selectCmcContractList(cmcContract).size();
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), count);
+            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 calendar = Calendar.getInstance();
+                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");
+                cmcContract.setParams(params);
+                monthObject.put(i + "月", cmcContractService.selectCmcContractListByRange(cmcContract).size());
+            }
             for (CmcContract contract : cmcContractService.selectCmcContractList(cmcContract)) {
                 if (contract.getAmount() != null)
                     amount = amount.add(contract.getAmount());
                 if (contract.getPaidAmount() != null) {
                     paidAmount = paidAmount.add(contract.getPaidAmount());
                     if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                        count ++;
+                        paidCount ++;
                 }
             }
-            paidYearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), count);
+            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);
         }
-        getProjectSourceStatistic(cmcContract, sourceObject, paidSourceObject, cwAmountObject, paidCwAmountObject);
+        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);
@@ -143,6 +187,7 @@ public class CmcContractController extends BaseController
         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);
@@ -244,44 +289,98 @@ public class CmcContractController extends BaseController
     }
 
     //院内外项目数量及金额
-    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;
+    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject paidSourceObject, JSONObject cwAmountObject, JSONObject paidCwAmountObject,
+                                          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);
+        BigDecimal paidNAmount;
+        cmcContract.setProjectSource("1");
+        List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        wCount = sourceList.size();
         for (CmcContract contract : sourceList) {
             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)
-                    wCount ++;
+                    paidWCount ++;
             }
         }
-        sourceObject.put("院外项目", sourceList.size());
-        paidSourceObject.put("已完成回款院外项目", wCount);
+        nCount = count - wCount;
+        paidNCount = paidCount - wCount;
+        nAmount = amount.subtract(wAmount);
+        paidNAmount = paidAmount.subtract(paidWAmount);
+        sourceObject.put("院外项目", wCount);
+        paidSourceObject.put("已完成回款院外项目", paidWCount);
         cwAmountObject.put("院外项目承接金额", wAmount);
         paidCwAmountObject.put("院外项目回款金额", paidWAmount);
         cmcContract.setProjectSource("0");
         sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        cCount = sourceList.size();
         for (CmcContract contract : sourceList) {
             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)
-                    cCount ++;
+                    paidCCount ++;
             }
         }
-        sourceObject.put("院内项目", sourceList.size());
-        paidSourceObject.put("已完成回款院内项目", cCount);
+        nCount = nCount - cCount;
+        paidNCount = paidNCount - cCount;
+        nAmount = nAmount.subtract(cAmount);
+        paidNAmount = paidNAmount.subtract(paidCAmount);
+        sourceObject.put("院内项目", cCount);
+        paidSourceObject.put("已完成回款院内项目", paidCCount);
         cwAmountObject.put("院内项目承接金额", cAmount);
         paidCwAmountObject.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;
     }
 
 }

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

@@ -37,6 +37,14 @@ public interface CmcContractMapper
      */
     public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
 
+    /**
+     * 按时间范围查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractListByRange(CmcContract cmcContract);
+
     /**
      * 新增cmc合同评审
      * 

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

@@ -38,6 +38,14 @@ public interface ICmcContractService
      */
     public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
 
+    /**
+     * 按时间范围查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractListByRange(CmcContract cmcContract);
+
     /**
      * 新增cmc合同评审
      * 

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

@@ -57,6 +57,18 @@ public class CmcContractServiceImpl implements ICmcContractService
         return cmcContractMapper.selectCmcContractList(cmcContract);
     }
 
+    /**
+     * 按时间范围查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审
+     */
+    @Override
+    public List<CmcContract> selectCmcContractListByRange(CmcContract cmcContract)
+    {
+        return cmcContractMapper.selectCmcContractListByRange(cmcContract);
+    }
+
     /**
      * 新增cmc合同评审
      * 

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

@@ -109,6 +109,32 @@
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
+        </where>
+        group by c.contract_id
+        order by c.draft_time desc
+    </select>
+
+    <select id="selectCmcContractListByRange" parameterType="CmcContract" resultMap="CmcContractResult">
+        <include refid="selectCmcContractVo"/>
+        <where>
+            <if test="contractId != null  and contractId != ''"> and c.contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="contractName!= null  and contractName != ''"> and c.contract_name like concat('%', #{contractName}, '%')</if>
+            <if test="contractCode!= null  and contractCode != ''"> and c.contract_code like concat('%', #{contractCode}, '%')</if>
+            <if test="tenderId != null  and tenderId != ''"> and c.tender_id = #{tenderId}</if>
+            <if test="contractNumber != null  and contractNumber != ''"> and c.contract_number = #{contractNumber}</if>
+            <if test="partyAId != null  and partyAId != ''"> and c.party_a_id = #{partyAId}</if>
+            <if test="amount != null "> and c.amount = #{amount}</if>
+            <if test="deposit != null "> and c.deposit = #{deposit}</if>
+            <if test="contractDocument != null  and contractDocument != ''"> and c.contract_document = #{contractDocument}</if>
+            <if test="drafter != null "> and c.drafter = #{drafter}</if>
+            <if test="draftTime != null "> and c.draft_time = #{draftTime}</if>
+            <if test="signDate != null"> and YEAR(c.sign_date) = YEAR(#{signDate})</if>
+            <if test="signRemark != null  and signRemark != ''"> and c.sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 and date_format(c.sign_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>