月份统计下穿

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

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.file.service.IFilesStorageService;
 import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcProjectService;
 import com.ruoyi.system.service.ISysDeptService;
@@ -41,9 +40,6 @@ public class FilesProjectController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
-    @Autowired
-    private IFilesStorageService filesStorageService;
-
     @Value("${cmc.profile}")
     private String profile;
 

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

@@ -9,7 +9,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 

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

@@ -4,7 +4,10 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
@@ -81,8 +84,13 @@ public class CmcBorrowController extends BaseController
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
+        JSONArray monthArray = new JSONArray();
+        JSONObject monthObject = new JSONObject();
+        JSONArray monthAmountArray = new JSONArray();
+        JSONObject monthAmountObject = new JSONObject();
         JSONArray amountArray = new JSONArray();
         JSONObject amountObject = new JSONObject();
+        
         JSONArray usageArray = new JSONArray();
         JSONObject usageObject = new JSONObject();
         JSONArray usageAmountArray = new JSONArray();
@@ -91,8 +99,9 @@ public class CmcBorrowController extends BaseController
         JSONObject yearProjectCountObject = new JSONObject();
         JSONArray yearProjectAmountArray = new JSONArray();
         JSONObject yearProjectAmountObject = new JSONObject();
-        //每年借款金额
+        //整体
         if (cmcBorrow.getLendTime() == null) {
+            //每年借款金额
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 cmcBorrow.setLendTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
                 List<CmcBorrow> yearList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
@@ -106,23 +115,54 @@ public class CmcBorrowController extends BaseController
             }
             cmcBorrow.setLendTime(null);
         }
+        //年度
         else {
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getLendTime()), cmcBorrowService.selectCmcBorrowList(cmcBorrow).size());
-            BigDecimal amount = new BigDecimal(0);
-            for (CmcBorrow borrow : cmcBorrowService.selectCmcBorrowList(cmcBorrow)) {
+            String year = new SimpleDateFormat("yyyy").format(cmcBorrow.getLendTime());
+            //该年借款次数
+            cmcBorrow.setLendTime(new SimpleDateFormat("yyyy").parse(year));
+            List<CmcBorrow> yearList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
+            yearObject.put(year, yearList.size());
+            BigDecimal yearAmount = new BigDecimal(0);
+            for (CmcBorrow borrow : yearList) {
                 if (borrow.getManagerAmount() != null)
-                    amount = amount.add(borrow.getManagerAmount());
+                    yearAmount = yearAmount.add(borrow.getManagerAmount());
+            }
+            amountObject.put(year, yearAmount);
+            
+            //按月份统计
+            for (int i = 1; i <= 12; i++) {
+                String monthStr = String.format("%02d", i);
+                String monthKey = year + "-" + monthStr;
+                String beginTimeString = monthKey + "-01";
+                
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                cmcBorrow.setParams(params);
+                cmcBorrow.setLendTime(new SimpleDateFormat("yyyy-MM").parse(beginTimeString));
+                List<CmcBorrow> monthBorrowList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
+                monthObject.put(monthKey, monthBorrowList.size());
+                
+                BigDecimal monthAmount = new BigDecimal(0);
+                for (CmcBorrow borrow : monthBorrowList) {
+                    if (borrow.getManagerAmount() != null)
+                        monthAmount = monthAmount.add(borrow.getManagerAmount());
+                }
+                monthAmountObject.put(monthKey, monthAmount);
             }
-            amountObject.put(new SimpleDateFormat("yyyy").format(cmcBorrow.getLendTime()), amount);
+            cmcBorrow.setParams(null);
         }
         getBorrowUsageStatistic(cmcBorrow, usageObject, usageAmountObject, yearProjectCountObject, yearProjectAmountObject);
         yearArray.add(yearObject);
+        monthArray.add(monthObject);
+        monthAmountArray.add(monthAmountObject);
         amountArray.add(amountObject);
         usageArray.add(usageObject);
         usageAmountArray.add(usageAmountObject);
         yearProjectCountArray.add(yearProjectCountObject);
         yearProjectAmountArray.add(yearProjectAmountObject);
         jsonObject.put("year", yearArray);
+        jsonObject.put("month", monthArray);
+        jsonObject.put("monthAmount", monthAmountArray);
         jsonObject.put("amount", amountArray);
         jsonObject.put("usage", usageArray);
         jsonObject.put("usageAmount", usageAmountArray);

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

@@ -91,6 +91,8 @@ public class CmcCarController extends BaseController
         JSONObject usageObject = new JSONObject();
         JSONArray approvalArray = new JSONArray();
         JSONArray dayArray = new JSONArray();
+        JSONArray monthArray = new JSONArray();
+        JSONObject monthObject = new JSONObject();
         CmcCar cmcCar = new CmcCar();
         cmcCar.setIsRent("0");
         cmcCar.setStatus("0");
@@ -117,20 +119,42 @@ public class CmcCarController extends BaseController
         }
         //年度
         else {
+            String yearStr = new SimpleDateFormat("yyyy").format(cmcCarApproval.getApplyDate());
             //输入年份派车次数
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcCarApproval.getApplyDate()), cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+            cmcCarApproval.setApplyDate(new SimpleDateFormat("yyyy").parse(yearStr));
+            List<CmcCarApproval> yearList = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+            yearObject.put(yearStr, yearList.size());
+            
+            //月度统计
+            for (int i = 1; i <= 12; i++) {
+                String monthStr = String.format("%02d", i);
+                String monthKey = yearStr + "-" + monthStr;
+                String beginTimeString = monthKey + "-01";
+                
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                cmcCarApproval.setParams(params);
+                cmcCarApproval.setApplyDate(new SimpleDateFormat("yyyy-MM").parse(beginTimeString));
+                
+                List<CmcCarApproval> monthList = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+                monthObject.put(monthKey, monthList.size());
+                cmcCarApproval.setParams(null);
+            }
         }
         getCarUsageStatistic(cmcCarApproval, usageObject);
         getCarApprovalStatistic(cmcCarApproval, approvalArray);
         getCarDayStatistic(cmcCarApproval, dayArray);
+        cmcCarApproval.setApplyDate(null);
         yearArray.add(yearObject);
         statusArray.add(statusObject);
         usageArray.add(usageObject);
+        monthArray.add(monthObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("status", statusArray);
         jsonObject.put("usage", usageArray);
         jsonObject.put("approval", approvalArray);
         jsonObject.put("day", dayArray);
+        jsonObject.put("month", monthArray);
         jsonObject.getJSONArray("approval").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
         jsonObject.getJSONArray("day").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
         return success(jsonObject);

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

@@ -4,13 +4,14 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.oa.domain.CmcCheck;
-import com.ruoyi.oa.service.ICmcBudgetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -41,9 +42,6 @@ public class CmcCheckController extends BaseController
     @Autowired
     private ICmcCheckService cmcCheckService;
 
-    @Autowired
-    private ICmcBudgetService cmcBudgetService;
-
     /**
      * 查询cmc项目核算列表
      */
@@ -90,7 +88,11 @@ public class CmcCheckController extends BaseController
         JSONObject yearProjectCountObject = new JSONObject();
         JSONArray yearProjectAmountArray = new JSONArray();
         JSONObject yearProjectAmountObject = new JSONObject();
-        //每年核算金额
+        JSONArray monthArray = new JSONArray();
+        JSONObject monthObject = new JSONObject();
+        JSONArray monthAmountArray = new JSONArray();
+        JSONObject monthAmountObject = new JSONObject();
+        //每年核算数量和金额
         if (cmcCheck.getCheckTime() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
@@ -105,23 +107,53 @@ public class CmcCheckController extends BaseController
             cmcCheck.setCheckTime(null);
         }
         else {
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcCheck.getCheckTime()), cmcCheckService.selectCmcCheckList(cmcCheck).size());
+            String yearStr = new SimpleDateFormat("yyyy").format(cmcCheck.getCheckTime());
+            cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse(yearStr));
+            List<CmcCheck> yearList = cmcCheckService.selectCmcCheckList(cmcCheck);
+            yearObject.put(yearStr, yearList.size());
             BigDecimal amount = new BigDecimal(0);
-            for (CmcCheck check : cmcCheckService.selectCmcCheckList(cmcCheck)) {
+            for (CmcCheck check : yearList) {
                 if (check.getTotalAdjust() != null)
                     amount = amount.add(check.getTotalAdjust());
             }
-            amountObject.put(new SimpleDateFormat("yyyy").format(cmcCheck.getCheckTime()), amount);
+            amountObject.put(yearStr, amount);
+            
+            //月度统计
+            for (int i = 1; i <= 12; i++) {
+                String monthStr = String.format("%02d", i);
+                String monthKey = yearStr + "-" + monthStr;
+                String beginTimeString = monthKey + "-01";
+                
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                cmcCheck.setParams(params);
+                cmcCheck.setCheckTime(new SimpleDateFormat("yyyy-MM").parse(beginTimeString));
+                
+                List<CmcCheck> monthList = cmcCheckService.selectCmcCheckList(cmcCheck);
+                monthObject.put(monthKey, monthList.size());
+                BigDecimal monthAmount = new BigDecimal(0);
+                for (CmcCheck check : monthList) {
+                    if (check.getTotalAdjust() != null)
+                        monthAmount = monthAmount.add(check.getTotalAdjust());
+                }
+                monthAmountObject.put(monthKey, monthAmount);
+                cmcCheck.setParams(null);
+            }
         }
+        cmcCheck.setCheckTime(null);
         getCheckProjectStatistic(cmcCheck, yearProjectCountObject, yearProjectAmountObject);
         yearArray.add(yearObject);
         amountArray.add(amountObject);
         yearProjectCountArray.add(yearProjectCountObject);
         yearProjectAmountArray.add(yearProjectAmountObject);
+        monthArray.add(monthObject);
+        monthAmountArray.add(monthAmountObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("amount", amountArray);
         jsonObject.put("yearProjectCount", yearProjectCountArray);
         jsonObject.put("yearProjectAmount", yearProjectAmountArray);
+        jsonObject.put("month", monthArray);
+        jsonObject.put("monthAmount", monthAmountArray);
         return success(jsonObject);
     }
 

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

@@ -42,9 +42,6 @@ public class CmcContractController extends BaseController
     @Autowired
     private ICmcContractService cmcContractService;
 
-    @Autowired
-    private ICmcContractPaidService cmcContractPaidService;
-
     /**
      * 查询cmc合同评审列表
      */

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

@@ -99,6 +99,8 @@ public class CmcDeviceController extends BaseController
         JSONArray statusArray = new JSONArray();
         JSONObject statusObject = new JSONObject();
         JSONArray approvalArray = new JSONArray();
+        JSONArray monthArray = new JSONArray();
+        JSONObject monthObject = new JSONObject();
         CmcDevice cmcDevice = new CmcDevice();
         cmcDevice.setStatus("0");
         statusObject.put("被领用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
@@ -114,7 +116,7 @@ public class CmcDeviceController extends BaseController
         statusObject.put("已处置", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
         //整体
         if (cmcDeviceApproval.getApplyDate() == null) {
-            //每年派车次数
+            //每年设备申请次数
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 //总数
                 cmcDeviceApproval.setApplyDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
@@ -125,15 +127,37 @@ public class CmcDeviceController extends BaseController
         }
         //年度
         else {
-            //输入年份派车次数
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcDeviceApproval.getApplyDate()), cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval).size());
+            String yearStr = new SimpleDateFormat("yyyy").format(cmcDeviceApproval.getApplyDate());
+            //输入年份设备申请次数
+            cmcDeviceApproval.setApplyDate(new SimpleDateFormat("yyyy").parse(yearStr));
+            List<CmcDeviceApproval> yearList = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+            yearObject.put(yearStr, yearList.size());
+            
+            //月度统计
+            for (int i = 1; i <= 12; i++) {
+                String monthStr = String.format("%02d", i);
+                String monthKey = yearStr + "-" + monthStr;
+                String beginTimeString = monthKey + "-01";
+                
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                cmcDeviceApproval.setParams(params);
+                cmcDeviceApproval.setApplyDate(new SimpleDateFormat("yyyy-MM").parse(beginTimeString));
+                
+                List<CmcDeviceApproval> monthList = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+                monthObject.put(monthKey, monthList.size());
+                cmcDeviceApproval.setParams(null);
+            }
         }
         getDeviceApprovalStatistic(cmcDeviceApproval, approvalArray);
+        cmcDeviceApproval.setApplyDate(null);
         yearArray.add(yearObject);
         statusArray.add(statusObject);
+        monthArray.add(monthObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("status", statusArray);
         jsonObject.put("approval", approvalArray);
+        jsonObject.put("month", monthArray);
         jsonObject.getJSONArray("approval").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
         return success(jsonObject);
     }

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

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.file.domain.FilesAchievement;
@@ -17,7 +18,6 @@ import com.ruoyi.file.service.IFilesAchievementService;
 import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.*;
 import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.controller.qyweixin.MessageController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/oa/project")
-public class CmcProjectController extends BaseController
-{
+public class CmcProjectController extends BaseController {
     @Autowired
     private ICmcProjectService cmcProjectService;
 
@@ -60,9 +59,6 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ISysUserService userService;
 
-    @Autowired
-    private ISysRoleService roleService;
-
     @Autowired
     private ICmcManageDeptService cmcManageDeptService;
 
@@ -82,8 +78,7 @@ public class CmcProjectController extends BaseController
      * 查询cmc项目列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(CmcProject cmcProject)
-    {
+    public TableDataInfo list(CmcProject cmcProject) {
         startPage();
         List<CmcProject> list = new ArrayList<>();
         if (cmcProject.getUndertakingDept() != null && cmcProject.getUndertakingDept().equals("113"))
@@ -105,8 +100,7 @@ public class CmcProjectController extends BaseController
      * 模糊查询cmc项目列表
      */
     @GetMapping("/listFuzzy")
-    public TableDataInfo listFuzzy(CmcProject cmcProject)
-    {
+    public TableDataInfo listFuzzy(CmcProject cmcProject) {
         startPage();
         List<CmcProject> list = cmcProjectService.selectCmcProjectListFuzzy(cmcProject);
         for (CmcProject project : list) {
@@ -125,8 +119,7 @@ public class CmcProjectController extends BaseController
      */
     @Log(title = "cmc项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, CmcProject cmcProject)
-    {
+    public void export(HttpServletResponse response, CmcProject cmcProject) {
         List<CmcProject> list = new ArrayList<>();
         if (cmcProject.getUndertakingDept() != null && cmcProject.getUndertakingDept().equals("113"))
             list = cmcProjectService.selectCmcInvestProjectList(cmcProject);
@@ -152,8 +145,7 @@ public class CmcProjectController extends BaseController
      * 获取cmc项目详细信息
      */
     @GetMapping(value = "/{projectId}")
-    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
-    {
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId) {
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
         if (cmcProject != null) {
             cmcProject.setUndertakingDeptName(deptIdToName(cmcProject));
@@ -170,8 +162,7 @@ public class CmcProjectController extends BaseController
      * 项目自动编号
      */
     @GetMapping("/projectNumber")
-    public AjaxResult getProjectNumberByYear(CmcProject cmcProject)
-    {
+    public AjaxResult getProjectNumberByYear(CmcProject cmcProject) {
         List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(cmcProject);
         String number = "0";
         String projectNumber = "";
@@ -188,10 +179,10 @@ public class CmcProjectController extends BaseController
      * 项目类型列表
      */
     @GetMapping("/projectType")
-    public AjaxResult getProjectType()
-    {
+    public AjaxResult getProjectType() {
         List<String> typeList = new ArrayList<>();
-        Map<Object, List<CmcProject>> projectType = cmcProjectService.selectCmcAllProjectList(new CmcProject()).stream().collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getProjectType())));
+        Map<Object, List<CmcProject>> projectType = cmcProjectService.selectCmcAllProjectList(new CmcProject()).stream()
+                .collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getProjectType())));
         projectType.forEach((k, v) -> {
             if (k != Optional.empty())
                 typeList.add(k.toString().substring(k.toString().indexOf("[") + 1, k.toString().indexOf("]")));
@@ -208,6 +199,16 @@ public class CmcProjectController extends BaseController
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
+        JSONArray monthArray = new JSONArray();
+        JSONObject monthObject = new JSONObject();
+        JSONArray monthCompleteArray = new JSONArray();
+        JSONObject monthCompleteObject = new JSONObject();
+        JSONArray monthArchiveArray = new JSONArray();
+        JSONObject monthArchiveObject = new JSONObject();
+        JSONArray monthSettleArray = new JSONArray();
+        JSONObject monthSettleObject = new JSONObject();
+        JSONArray monthCheckArray = new JSONArray();
+        JSONObject monthCheckObject = new JSONObject();
         JSONArray sourceArray = new JSONArray();
         JSONObject sourceObject = new JSONObject();
         JSONArray typeArray = new JSONArray();
@@ -222,96 +223,294 @@ public class CmcProjectController extends BaseController
         JSONObject settleObject = new JSONObject();
         JSONArray checkArray = new JSONArray();
         JSONObject checkObject = new JSONObject();
-        //整体
+        String beginTime = "";
+        String endTime = "";
+        // 整体
         if (cmcProject.getProjectNumber() == null) {
-            //每年项目数量
-            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
-                //总数
-                cmcProject.setProjectNumber(String.valueOf(i));
-                List<CmcProject> yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
-                yearObject.put(String.valueOf(i), yearList.size());
-                //已完成
-                cmcProject.setIsComplete("1");
-                List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
-                completeObject.put(cmcProject.getProjectNumber(), completeList.size());
-                cmcProject.setIsComplete(null);
-                //已归档
-                List<String> projectNumberList = new ArrayList<>();
-                CmcArchive cmcArchive = new CmcArchive();
-                cmcArchive.setProjectNumber(String.valueOf(i));
-                cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
-                List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
-                for (CmcArchive archive : archiveList) {
-                    projectNumberList.add(archive.getProjectNumber());
+            // 每年项目数量
+            if (cmcProject.getParams().size() == 0) {
+                for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                    // 总数
+                    cmcProject.setProjectNumber(String.valueOf(i));
+                    List<CmcProject> yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+                    yearObject.put(String.valueOf(i), yearList.size());
+                    // 已完成
+                    cmcProject.setIsComplete("1");
+                    List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+                    completeObject.put(cmcProject.getProjectNumber(), completeList.size());
+                    cmcProject.setIsComplete(null);
+                    // 获取当年登记的项目ID列表
+                    List<String> yearProjectIds = yearList.stream()
+                            .map(p -> p.getProjectId())
+                            .filter(id -> id != null)
+                            .collect(Collectors.toList());
+
+                    // 已归档 - 统计当年登记的项目中有多少已归档
+                    List<String> yearArchiveProjectIds = new ArrayList<>();
+                    CmcArchive cmcArchive = new CmcArchive();
+                    cmcArchive.setProjectNumber(String.valueOf(i));
+                    cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                    List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
+                    for (CmcArchive archive : archiveList) {
+                        if (yearProjectIds.contains(archive.getProjectId())) {
+                            yearArchiveProjectIds.add(archive.getProjectId());
+                        }
+                    }
+                    FilesAchievement filesAchievement = new FilesAchievement();
+                    filesAchievement.setProjectNumber(String.valueOf(i));
+                    List<FilesAchievement> achievementList = filesAchievementService
+                            .selectProjectAchievementList(filesAchievement);
+                    for (FilesAchievement achievement : achievementList) {
+                        if (achievement.getProjectId() != null && yearProjectIds.contains(achievement.getProjectId())) {
+                            yearArchiveProjectIds.add(achievement.getProjectId());
+                        }
+                    }
+                    archiveObject.put(String.valueOf(i), yearArchiveProjectIds.stream().distinct().count());
+
+                    // 已结算 - 统计当年登记的项目中有多少已结算
+                    CmcSettle cmcSettle = new CmcSettle();
+                    cmcSettle.setProjectNumber(String.valueOf(i));
+                    cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                    List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
+                    long yearSettleCount = settleList.stream()
+                            .filter(s -> s.getProjectId() != null && yearProjectIds.contains(s.getProjectId()))
+                            .count();
+                    settleObject.put(String.valueOf(i), yearSettleCount);
+
+                    // 已核算 - 统计当年登记的项目中有多少已核算
+                    CmcCheck cmcCheck = new CmcCheck();
+                    cmcCheck.setProjectNumber(String.valueOf(i));
+                    cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                    List<CmcCheck> checkList = cmcCheckService.selectCmcCheckList(cmcCheck);
+                    long yearCheckCount = checkList.stream()
+                            .filter(c -> c.getProjectId() != null && yearProjectIds.contains(c.getProjectId()))
+                            .count();
+                    checkObject.put(String.valueOf(i), yearCheckCount);
                 }
-                FilesAchievement filesAchievement = new FilesAchievement();
-                filesAchievement.setProjectNumber(String.valueOf(i));
-                List<FilesAchievement> achievementList = filesAchievementService.selectProjectAchievementList(filesAchievement);
-                for (FilesAchievement achievement : achievementList) {
-                    projectNumberList.add(achievement.getProjectNumber());
+                cmcProject.setProjectNumber(null);
+            } else {
+                beginTime = (String) cmcProject.getParams().get("beginTime");
+                endTime = (String) cmcProject.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);
+                    Map<String, Object> params = new HashMap<>();
+                    params.put("beginTime", beginTimeString + " 00:00:00");
+                    params.put("endTime", endTimeString + " 23:59:59");
+                    cmcProject.setParams(params);
+                    List<CmcProject> monthProjectList = cmcProjectService.selectCmcProjectListByRange(cmcProject);
+                    monthObject.put(monthList.get(i), monthProjectList.size());
+
+                    // 已完成
+                    cmcProject.setIsComplete("1");
+                    List<CmcProject> monthCompleteList = cmcProjectService.selectCmcProjectListByRange(cmcProject);
+                    monthCompleteObject.put(monthList.get(i), monthCompleteList.size());
+                    cmcProject.setIsComplete(null);
+
+                    // 获取当月登记的项目ID列表
+                    List<String> monthProjectIds = monthProjectList.stream()
+                            .map(p -> p.getProjectId())
+                            .filter(id -> id != null)
+                            .collect(Collectors.toList());
+
+                    // 已归档 - 统计当月登记的项目中有多少已归档
+                    List<String> monthArchiveProjectIds = new ArrayList<>();
+                    CmcArchive monthCmcArchive = new CmcArchive();
+                    monthCmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                    List<CmcArchive> monthArchiveList = cmcArchiveService.selectCmcArchiveList(monthCmcArchive);
+                    for (CmcArchive archive : monthArchiveList) {
+                        if (monthProjectIds.contains(archive.getProjectId())) {
+                            monthArchiveProjectIds.add(archive.getProjectId());
+                        }
+                    }
+                    FilesAchievement monthFilesAchievement = new FilesAchievement();
+                    List<FilesAchievement> monthAchievementList = filesAchievementService
+                            .selectProjectAchievementList(monthFilesAchievement);
+                    for (FilesAchievement achievement : monthAchievementList) {
+                        if (achievement.getProjectId() != null
+                                && monthProjectIds.contains(achievement.getProjectId())) {
+                            monthArchiveProjectIds.add(achievement.getProjectId());
+                        }
+                    }
+                    monthArchiveObject.put(monthList.get(i), monthArchiveProjectIds.stream().distinct().count());
+
+                    // 已结算 - 统计当月登记的项目中有多少已结算
+                    CmcSettle monthCmcSettle = new CmcSettle();
+                    monthCmcSettle.setProjectNumber(cmcProject.getProjectNumber());
+                    monthCmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                    List<CmcSettle> monthSettleList = cmcSettleService.selectCmcSettleList(monthCmcSettle);
+                    long monthSettleCount = monthSettleList.stream()
+                            .filter(s -> s.getProjectId() != null && monthProjectIds.contains(s.getProjectId()))
+                            .count();
+                    monthSettleObject.put(monthList.get(i), monthSettleCount);
+
+                    // 已核算 - 统计当月登记的项目中有多少已核算
+                    CmcCheck monthCmcCheck = new CmcCheck();
+                    monthCmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                    List<CmcCheck> monthCheckList = cmcCheckService.selectCmcCheckList(monthCmcCheck);
+                    long monthCheckCount = monthCheckList.stream()
+                            .filter(c -> c.getProjectId() != null && monthProjectIds.contains(c.getProjectId()))
+                            .count();
+                    monthCheckObject.put(monthList.get(i), monthCheckCount);
                 }
-                archiveObject.put(String.valueOf(i), projectNumberList.stream().distinct().count());
-                //已结算
-                CmcSettle cmcSettle = new CmcSettle();
-                cmcSettle.setProjectNumber(String.valueOf(i));
-                cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
-                List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
-                settleObject.put(String.valueOf(i), settleList.size());
-                //已核算
-                CmcCheck cmcCheck = new CmcCheck();
-                cmcCheck.setProjectNumber(String.valueOf(i));
-                cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
-                List<CmcCheck> checkList = cmcCheckService.selectCmcCheckList(cmcCheck);
-                checkObject.put(String.valueOf(i), checkList.size());
             }
-            cmcProject.setProjectNumber(null);
 
         }
-        //年度
+        // 年度
         else {
-            //输入年份项目数量
+            // 输入年份项目数量
             List<CmcProject> yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
-            //总数
-            yearObject.put(cmcProject.getProjectNumber(),  yearList.size());
-            //已完成
+            // 总数
+            yearObject.put(cmcProject.getProjectNumber(), yearList.size());
+            // 按月份统计
+            for (int i = 1; i <= 12; i++) {
+                String month = i < 10 ? "0" + i : String.valueOf(i);
+                String beginTimeString = cmcProject.getProjectNumber() + "-" + month + "-01";
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.YEAR, Integer.parseInt(cmcProject.getProjectNumber()));
+                calendar.set(Calendar.MONTH, i - 1);
+                String endTimeString = cmcProject.getProjectNumber() + "-" + month + "-"
+                        + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+                String monthKey = cmcProject.getProjectNumber() + "-" + month;
+
+                // 总数
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                params.put("endTime", endTimeString + " 23:59:59");
+                cmcProject.setParams(params);
+                List<CmcProject> monthProjectList = cmcProjectService.selectCmcProjectListByRange(cmcProject);
+                monthObject.put(monthKey, monthProjectList.size());
+
+                // 已完成
+                cmcProject.setIsComplete("1");
+                List<CmcProject> monthCompleteList = cmcProjectService.selectCmcProjectListByRange(cmcProject);
+                monthCompleteObject.put(monthKey, monthCompleteList.size());
+                cmcProject.setIsComplete(null);
+
+                // 获取当月登记的项目ID列表
+                List<String> monthProjectIds = monthProjectList.stream()
+                        .map(p -> p.getProjectId())
+                        .filter(id -> id != null)
+                        .collect(Collectors.toList());
+
+                // 已归档 - 统计当月登记的项目中有多少已归档
+                List<String> monthArchiveProjectIds = new ArrayList<>();
+                CmcArchive monthCmcArchive = new CmcArchive();
+                monthCmcArchive.setProjectNumber(cmcProject.getProjectNumber());
+                monthCmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                List<CmcArchive> monthArchiveList = cmcArchiveService.selectCmcArchiveList(monthCmcArchive);
+                for (CmcArchive archive : monthArchiveList) {
+                    if (monthProjectIds.contains(archive.getProjectId())) {
+                        monthArchiveProjectIds.add(archive.getProjectId());
+                    }
+                }
+                FilesAchievement monthFilesAchievement = new FilesAchievement();
+                monthFilesAchievement.setProjectNumber(cmcProject.getProjectNumber());
+                List<FilesAchievement> monthAchievementList = filesAchievementService
+                        .selectProjectAchievementList(monthFilesAchievement);
+                for (FilesAchievement achievement : monthAchievementList) {
+                    if (achievement.getProjectId() != null && monthProjectIds.contains(achievement.getProjectId())) {
+                        monthArchiveProjectIds.add(achievement.getProjectId());
+                    }
+                }
+                monthArchiveObject.put(monthKey, monthArchiveProjectIds.stream().distinct().count());
+
+                // 已结算 - 统计当月登记的项目中有多少已结算
+                CmcSettle monthCmcSettle = new CmcSettle();
+                monthCmcSettle.setProjectNumber(cmcProject.getProjectNumber());
+                monthCmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                List<CmcSettle> monthSettleList = cmcSettleService.selectCmcSettleList(monthCmcSettle);
+                long monthSettleCount = monthSettleList.stream()
+                        .filter(s -> s.getProjectId() != null && monthProjectIds.contains(s.getProjectId()))
+                        .count();
+                monthSettleObject.put(monthKey, monthSettleCount);
+
+                // 已核算 - 统计当月登记的项目中有多少已核算
+                CmcCheck monthCmcCheck = new CmcCheck();
+                monthCmcCheck.setProjectNumber(cmcProject.getProjectNumber());
+                monthCmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                List<CmcCheck> monthCheckList = cmcCheckService.selectCmcCheckList(monthCmcCheck);
+                long monthCheckCount = monthCheckList.stream()
+                        .filter(c -> c.getProjectId() != null && monthProjectIds.contains(c.getProjectId()))
+                        .count();
+                monthCheckObject.put(monthKey, monthCheckCount);
+            }
+            // 已完成
             cmcProject.setIsComplete("1");
             List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
             completeObject.put(cmcProject.getProjectNumber(), completeList.size());
             cmcProject.setIsComplete(null);
-            //已归档
-            List<String> projectNumberList = new ArrayList<>();
+
+            // 获取当年登记的项目ID列表
+            List<CmcProject> yearProjectList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+            List<String> yearProjectIds = yearProjectList.stream()
+                    .map(p -> p.getProjectId())
+                    .filter(id -> id != null)
+                    .collect(Collectors.toList());
+
+            // 已归档 - 统计当年登记的项目中有多少已归档
+            List<String> yearArchiveProjectIds = new ArrayList<>();
             CmcArchive cmcArchive = new CmcArchive();
             cmcArchive.setProjectNumber(cmcProject.getProjectNumber());
             cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
             List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
             for (CmcArchive archive : archiveList) {
-                projectNumberList.add(archive.getProjectNumber());
+                if (yearProjectIds.contains(archive.getProjectId())) {
+                    yearArchiveProjectIds.add(archive.getProjectId());
+                }
             }
             FilesAchievement filesAchievement = new FilesAchievement();
             filesAchievement.setProjectNumber(cmcProject.getProjectNumber());
-            List<FilesAchievement> achievementList = filesAchievementService.selectProjectAchievementList(filesAchievement);
+            List<FilesAchievement> achievementList = filesAchievementService
+                    .selectProjectAchievementList(filesAchievement);
             for (FilesAchievement achievement : achievementList) {
-                projectNumberList.add(achievement.getProjectNumber());
+                if (achievement.getProjectId() != null && yearProjectIds.contains(achievement.getProjectId())) {
+                    yearArchiveProjectIds.add(achievement.getProjectId());
+                }
             }
-            archiveObject.put(cmcProject.getProjectNumber(), projectNumberList.stream().distinct().count());
-            //已结算
+            archiveObject.put(cmcProject.getProjectNumber(), yearArchiveProjectIds.stream().distinct().count());
+
+            // 已结算 - 统计当年登记的项目中有多少已结算
             CmcSettle cmcSettle = new CmcSettle();
             cmcSettle.setProjectNumber(cmcProject.getProjectNumber());
             cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
             List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
-            settleObject.put(cmcProject.getProjectNumber(), settleList.size());
-            //已核算
+            long yearSettleCount = settleList.stream()
+                    .filter(s -> s.getProjectId() != null && yearProjectIds.contains(s.getProjectId()))
+                    .count();
+            settleObject.put(cmcProject.getProjectNumber(), yearSettleCount);
+
+            // 已核算 - 统计当年登记的项目中有多少已核算
             CmcCheck cmcCheck = new CmcCheck();
             cmcCheck.setProjectNumber(cmcProject.getProjectNumber());
             cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
             List<CmcCheck> checkList = cmcCheckService.selectCmcCheckList(cmcCheck);
-            checkObject.put(cmcProject.getProjectNumber(), checkList.size());
+            long yearCheckCount = checkList.stream()
+                    .filter(c -> c.getProjectId() != null && yearProjectIds.contains(c.getProjectId()))
+                    .count();
+            checkObject.put(cmcProject.getProjectNumber(), yearCheckCount);
 
         }
-        getProjectSourceStatistic(cmcProject, sourceObject);
-        getProjectTypeStatistic(cmcProject, typeObject);
-        getProjectDeptStatistic(cmcProject, deptObject);
+        if (!endTime.equals("")) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.YEAR, Integer.parseInt(endTime.split("-")[0]));
+            calendar.set(Calendar.MONTH, Integer.parseInt(endTime.split("-")[1]) - 1);
+            endTime = endTime.split("-")[0] + "-" + endTime.split("-")[1] + "-"
+                    + calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        }
+        getProjectSourceStatistic(cmcProject, sourceObject, beginTime, endTime);
+        getProjectTypeStatistic(cmcProject, typeObject, beginTime, endTime);
+        getProjectDeptStatistic(cmcProject, deptObject, beginTime, endTime);
         yearArray.add(yearObject);
+        monthArray.add(monthObject);
+        monthCompleteArray.add(monthCompleteObject);
+        monthArchiveArray.add(monthArchiveObject);
+        monthSettleArray.add(monthSettleObject);
+        monthCheckArray.add(monthCheckObject);
         sourceArray.add(sourceObject);
         deptArray.add(deptObject);
         typeArray.add(typeObject);
@@ -320,6 +519,11 @@ public class CmcProjectController extends BaseController
         settleArray.add(settleObject);
         checkArray.add(checkObject);
         jsonObject.put("year", yearArray);
+        jsonObject.put("month", monthArray);
+        jsonObject.put("monthComplete", monthCompleteArray);
+        jsonObject.put("monthArchive", monthArchiveArray);
+        jsonObject.put("monthSettle", monthSettleArray);
+        jsonObject.put("monthCheck", monthCheckArray);
         jsonObject.put("source", sourceArray);
         jsonObject.put("dept", deptArray);
         jsonObject.put("type", typeArray);
@@ -339,10 +543,9 @@ public class CmcProjectController extends BaseController
         cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
         if (cmcProject.getUndertakingDept().contains(",")) {
-            cmcProject.setLeadDept(cmcProject.getUndertakingDept().substring(0,3));
+            cmcProject.setLeadDept(cmcProject.getUndertakingDept().substring(0, 3));
             cmcProject.setJoinDept(cmcProject.getUndertakingDept().substring(4));
-        }
-        else
+        } else
             cmcProject.setLeadDept(cmcProject.getUndertakingDept());
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
@@ -352,8 +555,7 @@ public class CmcProjectController extends BaseController
      */
     @Log(title = "cmc项目", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CmcProject cmcProject)
-    {
+    public AjaxResult edit(@RequestBody CmcProject cmcProject) {
         if (cmcProject.getProjectLeader() != null) {
             SysUser user = userService.selectUserById(cmcProject.getProjectLeader());
             List<SysRole> sysRoleList = user.getRoles();
@@ -365,7 +567,7 @@ public class CmcProjectController extends BaseController
                     isProjectLeader = true;
                 }
             }
-            //新增项目负责人角色
+            // 新增项目负责人角色
             if (!isProjectLeader) {
                 Long[] newRoles = new Long[roles.length + 1];
                 System.arraycopy(roles, 0, newRoles, 0, roles.length);
@@ -382,13 +584,15 @@ public class CmcProjectController extends BaseController
     @PostMapping("/sendMessage")
     public AjaxResult sendMessage(@RequestBody CmcProject cmcProject) throws IOException {
         String message = "经营发展部已发起项目登记：  \n>" +
-                "登记人： <font color='info'>" + userService.selectUserById(cmcProject.getProjectRegistrant()).getNickName() + "</font>  \n>" +
+                "登记人： <font color='info'>" + userService.selectUserById(cmcProject.getProjectRegistrant()).getNickName()
+                + "</font>  \n>" +
                 "项目编号：" + cmcProject.getProjectNumber() + "  \n>" +
                 "项目名称：" + cmcProject.getProjectName() + "  \n>" +
                 "  \n>" +
                 "项目类型：<font color='comment'>" + cmcProject.getProjectType() + "</font>  \n>" +
-                "项目来源：" + (cmcProject.getProjectSource().equals("0") ? "院内" : "院外") +"  \n>" +
-                "甲方单位：" + cmcPartyAService.selectCmcPartyAByPartyAId(cmcProject.getPartyAId()).getPartyAName() + "  \n>" +
+                "项目来源：" + (cmcProject.getProjectSource().equals("0") ? "院内" : "院外") + "  \n>" +
+                "甲方单位：" + cmcPartyAService.selectCmcPartyAByPartyAId(cmcProject.getPartyAId()).getPartyAName() + "  \n>"
+                +
                 "  \n>" +
                 "承担部门：<font color='warning'>" + deptIdToName(cmcProject) + "</font>  \n>" +
                 "请您确认承担部门，及时跟进项目流转  \n>" +
@@ -400,9 +604,9 @@ public class CmcProjectController extends BaseController
             managerList.add("YuSiHan");
             String[] deptId = deptString.split(",");
             for (String dept : deptId) {
-                    List<SysUser> manageList = getManageId(dept, "");
-                    for (SysUser manager : manageList) {
-                        managerList.add(manager.getPinyin());
+                List<SysUser> manageList = getManageId(dept, "");
+                for (SysUser manager : manageList) {
+                    managerList.add(manager.getPinyin());
 
                 }
             }
@@ -415,9 +619,8 @@ public class CmcProjectController extends BaseController
      * 删除cmc项目
      */
     @Log(title = "cmc项目", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{projectIds}")
-    public AjaxResult remove(@PathVariable String[] projectIds)
-    {
+    @DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds) {
         cmcProjectWorkService.deleteCmcProjectWorkByProjectIds(projectIds);
         return success(cmcProjectService.deleteCmcProjectByProjectIds(projectIds));
     }
@@ -426,7 +629,8 @@ public class CmcProjectController extends BaseController
         String underTakingDept = cmcProject.getUndertakingDept();
         String undertakingDeptName = cmcProject.getUndertakingDeptName();
         StringBuilder underTakingDeptNames = new StringBuilder();
-        if (underTakingDept != null && !underTakingDept.equals("") && (undertakingDeptName == null || undertakingDeptName.equals(""))) {
+        if (underTakingDept != null && !underTakingDept.equals("")
+                && (undertakingDeptName == null || undertakingDeptName.equals(""))) {
             for (String dept : underTakingDept.split(","))
                 underTakingDeptNames.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
             cmcProject.setUndertakingDeptName(underTakingDeptNames.substring(0, underTakingDeptNames.length() - 1));
@@ -438,38 +642,41 @@ public class CmcProjectController extends BaseController
         String qualityInspector = cmcProject.getQualityInspector();
         String qualityInspectorName = cmcProject.getQualityInspectorName();
         StringBuilder qualityInspectorNames = new StringBuilder();
-        if (qualityInspector != null && !qualityInspector.equals("") && (qualityInspectorName == null || qualityInspectorName.equals(""))) {
+        if (qualityInspector != null && !qualityInspector.equals("")
+                && (qualityInspectorName == null || qualityInspectorName.equals(""))) {
             for (String inspector : qualityInspector.split(","))
-                qualityInspectorNames.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+                qualityInspectorNames.append(userService.selectUserById(Long.parseLong(inspector)).getNickName())
+                        .append(",");
             cmcProject.setQualityInspectorName(qualityInspectorNames.substring(0, qualityInspectorNames.length() - 1));
         }
     }
 
     public CmcContract joinContract(CmcProject cmcProject) {
         CmcContract contract = new CmcContract();
-            CmcProjectContract cmcProjectContract = new CmcProjectContract();
-            cmcProjectContract.setProjectId(cmcProject.getProjectId());
-            List<CmcProjectContract> cmcProjectContractList = cmcProjectContractService.selectCmcProjectContractList(cmcProjectContract);
-            cmcProjectContractList.forEach(projectContract -> {
-                try {
-                    CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(projectContract.getContractId());
-                    if (contract.getContractCode() != null)
-                        contract.setContractCode(contract.getContractCode() + "、" + cmcContract.getContractCode());
-                    else
-                        contract.setContractCode(cmcContract.getContractCode());
-                    if (contract.getContractNumber() != null)
-                        contract.setContractNumber(contract.getContractNumber() + "、" + cmcContract.getContractNumber());
-                    else
-                        contract.setContractNumber(cmcContract.getContractNumber());
-                    if (contract.getContractName() != null)
-                        contract.setContractName(contract.getContractName() + "、" + cmcContract.getContractName());
-                    else
-                        contract.setContractName(cmcContract.getContractName());
-                }
-                catch (Exception e){
-                    System.out.println(cmcProjectContractList);
-                }
-            });
+        CmcProjectContract cmcProjectContract = new CmcProjectContract();
+        cmcProjectContract.setProjectId(cmcProject.getProjectId());
+        List<CmcProjectContract> cmcProjectContractList = cmcProjectContractService
+                .selectCmcProjectContractList(cmcProjectContract);
+        cmcProjectContractList.forEach(projectContract -> {
+            try {
+                CmcContract cmcContract = cmcContractService
+                        .selectCmcContractByContractId(projectContract.getContractId());
+                if (contract.getContractCode() != null)
+                    contract.setContractCode(contract.getContractCode() + "、" + cmcContract.getContractCode());
+                else
+                    contract.setContractCode(cmcContract.getContractCode());
+                if (contract.getContractNumber() != null)
+                    contract.setContractNumber(contract.getContractNumber() + "、" + cmcContract.getContractNumber());
+                else
+                    contract.setContractNumber(cmcContract.getContractNumber());
+                if (contract.getContractName() != null)
+                    contract.setContractName(contract.getContractName() + "、" + cmcContract.getContractName());
+                else
+                    contract.setContractName(cmcContract.getContractName());
+            } catch (Exception e) {
+                System.out.println(cmcProjectContractList);
+            }
+        });
         return contract;
     }
 
@@ -484,37 +691,76 @@ public class CmcProjectController extends BaseController
         return userList;
     }
 
-    //院内外项目数量
-    public void getProjectSourceStatistic(CmcProject cmcProject, JSONObject sourceObject) {
+    // 院内外项目数量
+    public void getProjectSourceStatistic(CmcProject cmcProject, JSONObject sourceObject, String beginTime,
+            String endTime) {
         cmcProject.setProjectSource("1");
-        sourceObject.put("院外", cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+        if (beginTime.equals("")) {
+            sourceObject.put("院外", cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+        } else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcProject.setParams(params);
+            sourceObject.put("院外", cmcProjectService.selectCmcProjectListByRange(cmcProject).size());
+        }
         cmcProject.setProjectSource("0");
-        sourceObject.put("院内", cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+        if (beginTime.equals("")) {
+            sourceObject.put("院内", cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+        } else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcProject.setParams(params);
+            sourceObject.put("院内", cmcProjectService.selectCmcProjectListByRange(cmcProject).size());
+        }
         cmcProject.setProjectSource(null);
     }
 
-    //各类型项目数量
-    public void getProjectTypeStatistic(CmcProject cmcProject, JSONObject typeObject) {
-        //类型太多，循环效率不高-直接用Java特性进行分组统计
-        Map<Object, Long> typeGroup = cmcProjectService.selectCmcAllProjectList(cmcProject).stream().collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getProjectType()), Collectors.counting()));
+    // 各类型项目数量
+    public void getProjectTypeStatistic(CmcProject cmcProject, JSONObject typeObject, String beginTime,
+            String endTime) {
+        List<CmcProject> projectList;
+        if (beginTime.equals("")) {
+            projectList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+        } else {
+            Map<String, Object> params = new HashMap<>();
+            params.put("beginTime", beginTime + " 00:00:00");
+            params.put("endTime", endTime + " 23:59:59");
+            cmcProject.setParams(params);
+            projectList = cmcProjectService.selectCmcProjectListByRange(cmcProject);
+        }
+        Map<Object, Long> typeGroup = projectList.stream().collect(
+                Collectors.groupingBy(item -> Optional.ofNullable(item.getProjectType()), Collectors.counting()));
         List<Map.Entry<Object, Long>> typeList = new ArrayList<>(typeGroup.entrySet());
         typeList.sort(Map.Entry.comparingByValue());
         typeList.forEach((item) -> {
             if (item.getKey() != Optional.empty())
-                typeObject.put(item.toString().substring(item.toString().indexOf("[") + 1, item.toString().indexOf("]")), item.getValue());
+                typeObject.put(
+                        item.toString().substring(item.toString().indexOf("[") + 1, item.toString().indexOf("]")),
+                        item.getValue());
         });
     }
 
-    //各部门承担项目数量
-    public void getProjectDeptStatistic(CmcProject cmcProject, JSONObject deptObject) {
+    // 各部门承担项目数量
+    public void getProjectDeptStatistic(CmcProject cmcProject, JSONObject deptObject, String beginTime,
+            String endTime) {
         for (int i = 107; i <= 115; i++) {
             cmcProject.setUndertakingDept(String.valueOf(i));
             List<CmcProject> deptList = new ArrayList<>();
-            if (i != 113)
-                deptList = cmcProjectService.selectCmcProjectList(cmcProject);
-            else
-                deptList = cmcProjectService.selectCmcInvestProjectList(cmcProject);
-            deptObject.put(deptService.selectDeptById((long)i).getDeptName(), deptList.size());
+            if (beginTime.equals("")) {
+                if (i != 113)
+                    deptList = cmcProjectService.selectCmcProjectList(cmcProject);
+                else
+                    deptList = cmcProjectService.selectCmcInvestProjectList(cmcProject);
+            } else {
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTime + " 00:00:00");
+                params.put("endTime", endTime + " 23:59:59");
+                cmcProject.setParams(params);
+                deptList = cmcProjectService.selectCmcProjectListByRange(cmcProject);
+            }
+            deptObject.put(deptService.selectDeptById((long) i).getDeptName(), deptList.size());
         }
         cmcProject.setUndertakingDept(null);
     }

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

@@ -141,7 +141,11 @@ public class CmcSettleController extends BaseController
         JSONObject yearProjectCountObject = new JSONObject();
         JSONArray yearProjectAmountArray = new JSONArray();
         JSONObject yearProjectAmountObject = new JSONObject();
-        //每年借款金额
+        JSONArray monthArray = new JSONArray();
+        JSONObject monthObject = new JSONObject();
+        JSONArray monthAmountArray = new JSONArray();
+        JSONObject monthAmountObject = new JSONObject();
+        //每年结算数量和金额
         if (cmcSettle.getGmTime() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
@@ -156,27 +160,57 @@ public class CmcSettleController extends BaseController
             cmcSettle.setGmTime(null);
         }
         else {
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), cmcSettleService.selectCmcSettleList(cmcSettle).size());
+            String yearStr = new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime());
+            cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse(yearStr));
+            List<CmcSettle> yearList = cmcSettleService.selectCmcSettleList(cmcSettle);
+            yearObject.put(yearStr, yearList.size());
             BigDecimal amount = new BigDecimal(0);
-            for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
+            for (CmcSettle settle : yearList) {
                 if (settle.getAmount() != null)
                     amount = amount.add(settle.getAmount());
             }
-            amountObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), amount);
+            amountObject.put(yearStr, amount);
+            
+            //月度统计
+            for (int i = 1; i <= 12; i++) {
+                String monthStr = String.format("%02d", i);
+                String monthKey = yearStr + "-" + monthStr;
+                String beginTimeString = monthKey + "-01";
+                
+                Map<String, Object> params = new HashMap<>();
+                params.put("beginTime", beginTimeString + " 00:00:00");
+                cmcSettle.setParams(params);
+                cmcSettle.setGmTime(new SimpleDateFormat("yyyy-MM").parse(beginTimeString));
+                
+                List<CmcSettle> monthList = cmcSettleService.selectCmcSettleList(cmcSettle);
+                monthObject.put(monthKey, monthList.size());
+                BigDecimal monthAmount = new BigDecimal(0);
+                for (CmcSettle settle : monthList) {
+                    if (settle.getAmount() != null)
+                        monthAmount = monthAmount.add(settle.getAmount());
+                }
+                monthAmountObject.put(monthKey, monthAmount);
+                cmcSettle.setParams(null);
+            }
         }
         getSettleTypeStatistic(cmcSettle, typeObject, typeAmountObject, yearProjectCountObject, yearProjectAmountObject);
+        cmcSettle.setGmTime(null);
         yearArray.add(yearObject);
         amountArray.add(amountObject);
         typeArray.add(typeObject);
         typeAmountArray.add(typeAmountObject);
         yearProjectCountArray.add(yearProjectCountObject);
         yearProjectAmountArray.add(yearProjectAmountObject);
+        monthArray.add(monthObject);
+        monthAmountArray.add(monthAmountObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("amount", amountArray);
         jsonObject.put("type", typeArray);
         jsonObject.put("typeAmount", typeAmountArray);
         jsonObject.put("yearProjectCount", yearProjectCountArray);
         jsonObject.put("yearProjectAmount", yearProjectAmountArray);
+        jsonObject.put("month", monthArray);
+        jsonObject.put("monthAmount", monthAmountArray);
         return success(jsonObject);
     }
 

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

@@ -11,9 +11,7 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
 import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.Seq;
 
 /**
  * 文件上传工具类

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/dto/FlowNextDto.java

@@ -1,12 +1,8 @@
 package com.ruoyi.flowable.domain.dto;
 
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
-
 /**
  * 动态人员、组
  * @author Tony

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/dto/FlowTaskDto.java

@@ -1,7 +1,6 @@
 package com.ruoyi.flowable.domain.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -9,9 +8,6 @@ import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>工作流任务<p>
  *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/vo/FlowQueryVo.java

@@ -4,9 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>流程任务<p>
  *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/vo/ReturnTaskNodeVo.java

@@ -3,10 +3,6 @@ package com.ruoyi.flowable.domain.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>可退回节点<p>
  *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FindNextNodeUtil.java

@@ -5,12 +5,9 @@ import com.googlecode.aviator.Expression;
 //import com.greenpineyu.fel.FelEngine;
 //import com.greenpineyu.fel.FelEngineImpl;
 //import com.greenpineyu.fel.context.FelContext;
-import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.*;
 import org.flowable.engine.RepositoryService;
-import org.flowable.engine.TaskService;
-import org.flowable.engine.repository.Model;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.task.api.history.HistoricTaskInstance;
 
@@ -188,7 +185,6 @@ public class FindNextNodeUtil {
 
                 SubProcess sp = (SubProcess) flowElement1;
                 if (sp.getLoopCharacteristics() != null) {
-                    String inputDataItem = sp.getLoopCharacteristics().getInputDataItem();
                     UserTask userTask = new UserTask();
                     userTask.setId(sp.getId());
                     userTask.setLoopCharacteristics(sp.getLoopCharacteristics());

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableUtils.java

@@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.model.*;
 import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
 import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
-import org.flowable.task.api.Task;
 import org.flowable.task.api.history.HistoricTaskInstance;
 
 import java.util.*;

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/FlowExecutionListener.java

@@ -1,7 +1,6 @@
 package com.ruoyi.flowable.listener;
 
 import lombok.extern.slf4j.Slf4j;
-import org.flowable.common.engine.api.delegate.Expression;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
 import org.springframework.stereotype.Component;
@@ -27,7 +26,6 @@ public class FlowExecutionListener implements ExecutionListener {
     /**
      * 流程设计器添加的参数
      */
-    private Expression param;
 
     @Override
     public void notify(DelegateExecution execution) {

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowInstanceServiceImpl.java

@@ -31,7 +31,6 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
      */
     @Override
     public void stopProcessInstance(FlowTaskVo vo) {
-        String taskId = vo.getTaskId();
 
     }
 

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

@@ -34,6 +34,12 @@ import io.milvus.v2.service.vector.request.SearchReq;
 import io.milvus.v2.service.vector.request.data.BaseVector;
 import io.milvus.v2.service.vector.request.data.FloatVec;
 import io.milvus.v2.service.vector.response.SearchResp;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.Paragraph;
 import org.apache.poi.hwpf.usermodel.Range;
@@ -53,6 +59,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.llm.domain.ChapterStreamResponse;
 
@@ -1074,7 +1081,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
 
     /**
      * 调用LLM生成回答
-     * 
+     *
      * @return
      */
     public String generateAnswer(String prompt) throws IOException {
@@ -1093,6 +1100,69 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
         return content;
     }
 
+    // /**
+    // * 调用LLM生成回答
+    // *
+    // * @return
+    // */
+    // public String generateAnswer(String prompt) throws IOException {
+    // String apiUrl = "https://dashscope.aliyuncs.com/compatible-mode/v1"; // 注意没有
+    // /chat/completions
+    // String apiKey = "sk-750a17cc723847f28b31fa1bc17c255c";
+    // String model = "Qwen/Qwen3-Next-80B-A3B-Instruct";
+
+    // // 方式1：确保 ChatModel 内部正确拼接 /chat/completions
+    // ChatModel chatModel = ChatModel.of(apiUrl)
+    // .model(model)
+    // .apiKey(apiKey)
+    // .timeout(java.time.Duration.ofSeconds(240))
+    // .build();
+
+    // // 方式2：直接构造请求，避免框架问题
+    // // 构建 messages 列表
+    // List<Map<String, String>> messages = new ArrayList<>();
+    // Map<String, String> userMessage = new HashMap<>();
+    // userMessage.put("role", "user");
+    // userMessage.put("content", prompt);
+    // messages.add(userMessage);
+
+    // // 构建请求体
+    // Map<String, Object> requestBody = new HashMap<>();
+    // requestBody.put("model", model);
+    // requestBody.put("messages", messages);
+    // requestBody.put("stream", false);
+
+    // // 发送 HTTP 请求
+    // OkHttpClient client = new OkHttpClient.Builder()
+    // .connectTimeout(240, TimeUnit.SECONDS)
+    // .readTimeout(240, TimeUnit.SECONDS)
+    // .build();
+
+    // String jsonBody = new ObjectMapper().writeValueAsString(requestBody);
+
+    // Request request = new Request.Builder()
+    // .url("https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions")
+    // .addHeader("Content-Type", "application/json")
+    // .addHeader("Authorization", "Bearer " + apiKey)
+    // .post(RequestBody.create(jsonBody, MediaType.parse("application/json")))
+    // .build();
+
+    // try (Response response = client.newCall(request).execute()) {
+    // String responseBody = response.body().string();
+    // if (!response.isSuccessful()) {
+    // // 打印原始响应，帮助诊断
+    // System.err.println("HTTP Error: " + response.code());
+    // System.err.println("Response: " + responseBody);
+    // throw new RuntimeException("API call failed: " + responseBody);
+    // }
+    // // 解析 JSON 响应
+    // JsonNode jsonNode = new ObjectMapper().readTree(responseBody);
+    // String content =
+    // jsonNode.path("choices").get(0).path("message").path("content").asText();
+    // return content;
+    // }
+    // }
+
     /**
      * 流式调用LLM生成回答 - 使用Flux
      * 
@@ -1114,6 +1184,26 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                 .filter(content -> content != null && !content.isEmpty());
     }
 
+    // /**
+    // * 流式调用LLM生成回答 - NVIDIA API
+    // *
+    // * @param prompt 提示词
+    // * @return Flux<String> 流式输出
+    // */
+    // public Flux<String> generateAnswerFlux(String prompt) {
+    // String apiUrl = "https://dashscope.aliyuncs.com/compatible-mode/v1";
+    // String apiKey = "sk-750a17cc723847f28b31fa1bc17c255c";
+    // String model = "Qwen/Qwen3-Next-80B-A3B-Instruct";
+
+    // ChatModel chatModel = ChatModel.of(apiUrl)
+    // .model(model).apiKey(apiKey)
+    // .timeout(java.time.Duration.ofSeconds(240))
+    // .build();
+    // return chatModel.prompt(Prompt.of(prompt)).stream()
+    // .map(resp -> resp.getContent())
+    // .filter(content -> content != null && !content.isEmpty());
+    // }
+
     /**
      * 从Milvus检索相关文档
      * 
@@ -1513,7 +1603,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
      */
     private List<String> extractTitlesFromOutput(String output) {
         List<String> titles = new ArrayList<>();
-        
+
         // 提取【详细目录】部分
         if (output.contains("【详细目录】")) {
             int startIndex = output.indexOf("【详细目录】") + "【详细目录】".length();
@@ -1522,27 +1612,27 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
             if (nextTagIndex > startIndex) {
                 endIndex = nextTagIndex;
             }
-            
+
             String directoryContent = output.substring(startIndex, endIndex).trim();
             String[] lines = directoryContent.split("\n");
-            
+
             // 使用栈来跟踪当前路径，只提取叶子节点标题
             Stack<String> levelStack = new Stack<>();
-            
+
             for (String line : lines) {
                 line = line.trim().replace("*", "").replace("#", "").replace("-", "");
                 if (!line.contains("6.") || line.isEmpty()) {
                     continue;
                 }
-                
+
                 String[] parts = line.split(" ", 2);
                 if (parts.length < 2) {
                     continue;
                 }
-                
+
                 String number = parts[0].trim();
                 int dotCount = number.split("\\.").length - 1;
-                
+
                 // 维护栈：弹出同级或更高级别的标题
                 while (!levelStack.isEmpty()) {
                     String topNumber = levelStack.peek().split(" ", 2)[0].trim();
@@ -1553,11 +1643,10 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                         break;
                     }
                 }
-                
+
                 // 如果栈顶是当前标题的直接父节点，且下一行不是子标题，则当前标题是叶子节点
-                boolean isLeaf = true;
                 levelStack.push(line);
-                
+
                 // 检查是否是叶子节点（没有子标题）
                 // 通过检查该行后面是否有更高级别的标题来判断
                 // 这里我们采用简化策略：只有三级标题（6.x.x）才视为叶子节点
@@ -1565,7 +1654,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                     titles.add(line);
                 }
             }
-            
+
             // 如果没有三级标题，则返回二级标题作为叶子节点
             if (titles.isEmpty()) {
                 for (String line : lines) {
@@ -1573,22 +1662,22 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                     if (!line.contains("6.") || line.isEmpty()) {
                         continue;
                     }
-                    
+
                     String[] parts = line.split(" ", 2);
                     if (parts.length < 2) {
                         continue;
                     }
-                    
+
                     String number = parts[0].trim();
                     int dotCount = number.split("\\.").length - 1;
-                    
+
                     if (dotCount == 2) {
                         titles.add(line);
                     }
                 }
             }
         }
-        
+
         return titles;
     }
 
@@ -2295,12 +2384,12 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                 // 从数据库output字段中提取最新的章节标题列表（而不是从Word文件中提取）
                 // 这样可以确保使用用户修改并保存后的目录结构
                 List<String> allTitles = extractTitlesFromOutput(output);
-                
+
                 // 如果从数据库中没有提取到标题，回退到从Word文件中提取
                 if (allTitles.isEmpty()) {
                     allTitles = extractSubTitles(profilePath + "/" + file.getOriginalFilename(), "技术文件");
                 }
-                
+
                 List<String> targetTitles = new ArrayList<>();
 
                 if (selectedNode != null && !selectedNode.isEmpty()) {

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

@@ -36,12 +36,6 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "其他项目名称")
     private String xmName;
 
-    /** 结算内容 */
-    private String content;
-
-    /** 表格编号 */
-    private String tableNumber;
-
     /** 实际结算总金额 */
     @Excel(name = "实际结算总金额")
     private BigDecimal amount;

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

@@ -59,6 +59,14 @@ public interface CmcProjectMapper
      */
     public List<CmcProject> selectCmcAllProjectList(CmcProject cmcProject);
 
+    /**
+     * 按时间范围查询cmc项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListByRange(CmcProject cmcProject);
+
     /**
      * 新增cmc项目
      * 

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

@@ -1,9 +1,6 @@
 package com.ruoyi.oa.service;
 
 import java.util.List;
-import java.util.Map;
-
-import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.oa.domain.CmcContract;
 
 /**

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

@@ -2,7 +2,6 @@ package com.ruoyi.oa.service;
 
 import java.util.List;
 import com.ruoyi.oa.domain.CmcProject;
-import com.ruoyi.oa.domain.CmcProject;
 
 /**
  * cmc项目Service接口
@@ -60,6 +59,14 @@ public interface ICmcProjectService
      */
     public List<CmcProject> selectCmcAllProjectList(CmcProject cmcProject);
 
+    /**
+     * 按时间范围查询cmc项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcProjectListByRange(CmcProject cmcProject);
+
     /**
      * 新增cmc项目
      * 

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

@@ -91,6 +91,18 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcAllProjectList(cmcProject);
     }
 
+    /**
+     * 按时间范围查询cmc项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    @Override
+    public List<CmcProject> selectCmcProjectListByRange(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.selectCmcProjectListByRange(cmcProject);
+    }
+
     /**
      * 新增cmc项目
      * 

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

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.service.ISysDeptService;
 
 import java.io.Serializable;
 import java.util.List;

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

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectProjectAchievementList" parameterType="FilesAchievement" resultMap="FilesAchievementResult">
-        select distinct p.project_number from files_achievement as f LEFT JOIN cmc_project as p on f.project_id = p.project_id
+        select distinct p.project_number, p.project_id from files_achievement as f LEFT JOIN cmc_project as p on f.project_id = p.project_id
         <where>
             (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>

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

@@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dszTime != null "> and b.dsz_time = #{dszTime}</if>
             <if test="lendTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', lendTime) == '2000' "> and b.lend_time is not null</if>
             <if test="lendTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', lendTime) != '2000' "> and YEAR(b.lend_time) = YEAR(#{lendTime})</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(b.lend_time) = MONTH(#{lendTime})</if>
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
         order by b.apply_date desc

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

@@ -137,7 +137,9 @@
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>
-            <if test="applyDate != null "> and YEAR(ca.apply_date) = YEAR(#{applyDate})</if>
+            <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) == '2000' "> and ca.apply_date is not null</if>
+            <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) != '2000' "> and YEAR(ca.apply_date) = YEAR(#{applyDate})</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(ca.apply_date) = MONTH(#{applyDate})</if>
             <if test="beginDate != null "> and ca.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and ca.end_date = #{endDate}</if>
             <if test="days != null "> and ca.days = #{days}</if>
@@ -273,4 +275,13 @@
             #{carApplyId}
         </foreach>
     </delete>
+
+    <select id="selectCmcCarApprovalListByRange" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
+        <include refid="selectCmcCarApprovalVo"/>
+        <where>
+            <if test="params.beginTime != null and params.beginTime != ''"> and ca.apply_date &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''"> and ca.apply_date &lt;= #{params.endTime}</if>
+        </where>
+        order by ca.apply_date desc
+    </select>
 </mapper>

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

@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlUserId != null "> and c.zjl_user_id = #{zjlUserId}</if>
             <if test="checkTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', checkTime) == '2000' "> and c.check_time is not null</if>
             <if test="checkTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', checkTime) != '2000' "> and YEAR(c.check_time) = YEAR(#{checkTime})</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(c.check_time) = MONTH(#{checkTime})</if>
             <if test="zjlComment != null  and zjlComment != ''"> and c.zjl_comment = #{zjlComment}</if>
         </where>
     </select>
@@ -162,4 +163,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{checkId}
         </foreach>
     </delete>
+
+    <select id="selectCmcCheckListByRange" parameterType="CmcCheck" resultMap="CmcCheckResult">
+        <include refid="selectCmcCheckVo"/>
+        <where>
+            <if test="params.beginTime != null and params.beginTime != ''"> and c.check_time &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''"> and c.check_time &lt;= #{params.endTime}</if>
+        </where>
+        order by c.check_time desc
+    </select>
 </mapper>

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

@@ -81,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="repairDevices != null  and repairDevices != ''"> and find_in_set(#{repairDevices}, da.repair_devices)</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
-            <if test="applyDate != null "> and YEAR(da.apply_date) = YEAR(#{applyDate})</if>
+            <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) == '2000' "> and da.apply_date is not null</if>
+            <if test="applyDate != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', applyDate) != '2000' "> and YEAR(da.apply_date) = YEAR(#{applyDate})</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(da.apply_date) = MONTH(#{applyDate})</if>
             <if test="returnDate != null "> and da.return_date = #{returnDate}</if>
             <if test="beginDate != null "> and da.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and da.end_date = #{endDate}</if>
@@ -190,4 +192,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{deviceApplyId}
         </foreach>
     </delete>
+
+    <select id="selectCmcDeviceApprovalListByRange" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
+        <include refid="selectCmcDeviceApprovalVo"/>
+        <where>
+            <if test="params.beginTime != null and params.beginTime != ''"> and da.apply_date &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''"> and da.apply_date &lt;= #{params.endTime}</if>
+        </where>
+        order by da.apply_date desc
+    </select>
 </mapper>

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

@@ -436,4 +436,39 @@
             #{projectId}
         </foreach>
     </delete>
+
+    <select id="selectCmcProjectListByRange" parameterType="CmcProject" resultMap="CmcProjectResult">
+        <include refid="selectCmcProjectVo"/>
+        <where>
+            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
+            <if test="projectId != null  and projectId != ''"> and p.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>
+            <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
+            <if test="isComplete != null  and isComplete != ''"> and p.is_complete = #{isComplete}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="partyAId != null  and partyAId != ''"> and p.party_a_id = #{partyAId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and p.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and p.telephone = #{telephone}</if>
+            <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
+            <if test="projectRegistrant != null "> and p.project_registrant = #{projectRegistrant}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept like concat('%', #{undertakingDept}, '%')</if>
+            <if test="projectPlanner != null "> and p.project_planner = #{projectPlanner}</if>
+            <if test="siteLeader != null "> and p.site_leader = #{siteLeader}</if>
+            <if test="planTime != null "> and p.plan_time = #{planTime}</if>
+            <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
+            <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
+            <if test="participates != null  and participates != ''"> and find_in_set(#{participates}, p.participates)</if>
+            <if test="params.beginTime != null and params.beginTime != ''">
+                and date_format(p.register_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                and date_format(p.register_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+        group by p.project_id
+        order by p.register_time desc, p.project_number desc
+    </select>
 </mapper>

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

@@ -153,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) == '2000' "> and s.gm_time is not null</if>
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) != '2000' "> and YEAR(s.gm_time) = YEAR(#{gmTime})</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and MONTH(s.gm_time) = MONTH(#{gmTime})</if>
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
         group by s.settle_id
@@ -285,4 +286,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{settleId}
         </foreach>
     </delete>
+
+    <select id="selectCmcSettleListByRange" parameterType="CmcSettle" resultMap="CmcSettleResult">
+        <include refid="selectCmcSettleVo"/>
+        <where>
+            ss.content = '实际结算总金额'
+            <if test="params.beginTime != null and params.beginTime != ''"> and s.gm_time &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''"> and s.gm_time &lt;= #{params.endTime}</if>
+        </where>
+        order by s.gm_time desc
+    </select>
 </mapper>

oa-ui/src/api/oa/device/device.js

@@ -67,9 +67,10 @@ export function delDevice(deviceId) {
 }
 
 // 设备统计
-export function getDeviceStatistic() {
+export function getDeviceStatistic(params) {
   return request({
     url: '/oa/device/statistic',
     method: 'get',
+    params: params
   })
 }

oa-ui/src/utils/echarts.js

@@ -18,7 +18,7 @@ export  function echartsSetoption(chart, option) {
     chart.resize();
   });
 }
-export function ehcartsInit(myCharts,id,options){
+export function echartsInit(myCharts,id,options){
   disposeCharts(myCharts);
   let chartDom = document.getElementById(id);
   myCharts = echarts.init(chartDom);

oa-ui/src/views/statistics/components/borrowStatistics.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { ehcartsInit } from '@/utils/echarts'
+import { echartsInit } from '@/utils/echarts'
 import { getBorrowStatistic } from '@/api/oa/borrow/borrow';
 let borrowYearChart, borrowAmountChart, borrowUsageChart, borrowProjectChart
 export default {
@@ -37,6 +37,20 @@ export default {
     },
     borrowUsageAmount() {
       // this.initBorrowUsageAmountPie(this.activeYear)
+    },
+    borrowYear() {
+      if (this.isYearView) {
+        this.initBorrowYearBar();
+      }
+    },
+    borrowData: {
+      handler(newVal) {
+        if (newVal) {
+          this.initDatas();
+        }
+      },
+      immediate: true,
+      deep: true
     }
   },
   data() {
@@ -46,11 +60,15 @@ export default {
       borrowUsage: {},
       borrowUsageAmount: {},
       borrowYear: {},
+      borrowMonth: {},
+      borrowMonthAmount: {},
       yearProjectAmount: {},
       yearProjectCount: {},
       sumBorrowAmount: 0,
       dataLoading: false,
-      activeYear: ''
+      activeYear: '',
+      isYearView: true,
+      mainChart: null
     }
   },
   created() {
@@ -72,35 +90,48 @@ export default {
         this.borrowUsage = this.borrowData.usage[0];
         this.borrowUsageAmount = this.borrowData.usageAmount[0];
         this.borrowYear = this.borrowData.year[0];
+        this.borrowMonth = this.borrowData.month ? this.borrowData.month[0] : {};
+        this.borrowMonthAmount = this.borrowData.monthAmount ? this.borrowData.monthAmount[0] : {};
         this.yearProjectAmount = this.borrowData.yearProjectAmount[0];
         this.yearProjectCount = this.borrowData.yearProjectCount[0];
         let sum = Object.values(this.borrowAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
-        this.sumBorrowAmount = (sum / 10000).toFixed(1)
+        this.sumBorrowAmount = (sum / 10000).toFixed(2)
       }
     },
     clickYear(charts) {
       let that = this;
-      charts.on('click', function (event) {
+      that.mainChart = charts;
+      charts.off('click');
+      charts.on('click', async function (event) {
         if (event) {
-          that.activeYear = event.name;
-          let year = event.name + '-01-01'
-          if (event.name == "") {
-            year = ''
-          }
-          that.dataLoading = true
-          getBorrowStatistic({ lendTime: year }).then(res => {
+          if (event.name === '' || event.name === undefined) {
+            that.isYearView = true;
+            that.activeYear = '';
+            that.initBorrowYearBar();
+            that.initBorrowAmountLine();
+          } else {
+            that.activeYear = event.name;
+            that.isYearView = false;
+            that.dataLoading = true;
+            let res = await getBorrowStatistic({ lendTime: event.name + '-01-01' });
+            that.borrowYear = res.data.year[0];
+            that.borrowAmount = res.data.amount[0];
+            that.borrowMonth = res.data.month ? res.data.month[0] : {};
+            that.borrowMonthAmount = res.data.monthAmount ? res.data.monthAmount[0] : {};
             that.borrowUsage = res.data.usage[0];
             that.borrowUsageAmount = res.data.usageAmount[0];
-            that.dataLoading = false
-          })
+            that.dataLoading = false;
+            that.initBorrowMonthChart();
+            that.initBorrowAmountLine();
+          }
         }
       })
     },
     initBorrowYearBar() {
       let option = {
         title: {
-          text: '各年借款次数',
-          subtext: '共计借款次数：' + Object.values(this.borrowYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次'
+          text: '借款次数',
+          subtext: '借款次数：' + Object.values(this.borrowYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次'
         },
         grid: {
           left: '1%',
@@ -156,15 +187,20 @@ export default {
           }
         ]
       };
-      let charts = ehcartsInit(borrowYearChart, 'borrowBar', option);
+      let charts = echartsInit(borrowYearChart, 'borrowBar', option);
       this.clickYear(charts)
     },
     initBorrowAmountLine() {
+      let xData = this.isYearView ? Object.keys(this.borrowAmount) : Object.keys(this.borrowMonthAmount);
+      let amountData = this.isYearView ? Object.values(this.borrowAmount) : Object.values(this.borrowMonthAmount);
+      let titleText = this.isYearView ? '借款金额' : this.activeYear + '年借款金额';
+      let sumAmount = amountData.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+      
       let option = {
         title: {
-          text: '各年借款金额',
-          subtext: '借款总额：' + (Object.values(this.borrowAmount).reduce((accumulator, currentValue) => { return accumulator + currentValue }, 0)).toFixed(2) + '元' +
-            '（约' + this.sumBorrowAmount + '万元）'
+          text: titleText,
+          subtext: '借款总额：' + sumAmount.toFixed(2) + '元' +
+            '（约' + (sumAmount / 10000).toFixed(2) + '万元）'
         },
         grid: {
           left: '1%',
@@ -184,7 +220,7 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: Object.keys(this.borrowAmount),
+          data: xData,
         },
         yAxis: {
           type: 'value',
@@ -193,7 +229,7 @@ export default {
         series: [
           {
             min: 0,
-            data: Object.values(this.borrowAmount),
+            data: amountData,
             type: 'line',
             smooth: true,
             label: {
@@ -202,14 +238,14 @@ export default {
               formatter: function (params) {
                 let value = params.value;
                 if (value >= 10000) {
-                  return '约' + (value / 10000).toFixed(1) + '万元'
+                  return '约' + (value / 10000).toFixed(2) + '万元'
                 }
               }
             }
           }
         ]
       };
-      ehcartsInit(borrowAmountChart, 'borrowLine', option);
+      echartsInit(borrowAmountChart, 'borrowLine', option);
     },
     initBorrowUsagePie(year) {
       let option = {
@@ -286,7 +322,7 @@ export default {
           },
         ]
       };
-      ehcartsInit(borrowUsageChart, 'borrowUsagePie', option);
+      echartsInit(borrowUsageChart, 'borrowUsagePie', option);
     },
     initBorrowProjectLineBar(year) {
       let option = {
@@ -337,14 +373,85 @@ export default {
               formatter: function (params) {
                 let value = params.value;
                 if (value >= 10000) {
-                  return '约' + (value / 10000).toFixed(1) + '万元'
+                  return '约' + (value / 10000).toFixed(2) + '万元'
                 }
               }
             }
           },
         ]
       };
-      ehcartsInit(borrowProjectChart, 'borrowProject', option);
+      echartsInit(borrowProjectChart, 'borrowProject', option);
+    },
+    initBorrowMonthChart() {
+      let option = {
+        title: {
+          text: this.activeYear + '年借款次数',
+          subtext: '借款次数：' + Object.values(this.borrowMonth).reduce((a, b) => a + b, 0) + '次'
+        },
+        grid: {
+          left: '1%',
+          right: '1%',
+          bottom: '0%',
+          height: '60%',
+          containLabel: true
+        },
+        graphic: [
+          {
+            type: 'text',
+            name: '',
+            right: '0',
+            top: '20%',
+            style: {
+              text: '返回',
+              fill: '#409EFF',
+              fontSize: 12,
+              fontWeight: ''
+            },
+            onclick: () => { this.goBackToYear(); }
+          }
+        ],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'none',
+            label: {
+              backgroundColor: '#6a7985'
+            }
+          }
+        },
+        xAxis: {
+          name: '月',
+          type: 'category',
+          data: Object.keys(this.borrowMonth),
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位：次'
+        },
+        series: [
+          {
+            data: Object.values(this.borrowMonth),
+            type: 'bar',
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top'
+            },
+            itemStyle: {
+              color: '#3498DB'
+            }
+          }
+        ]
+      };
+      let charts = echartsInit(borrowYearChart, 'borrowBar', option);
+    },
+    goBackToYear() {
+      this.isYearView = true;
+      this.activeYear = '';
+      this.initDatas();
+      this.initBorrowYearBar();
+      this.initBorrowAmountLine();
+      this.initBorrowUsagePie('');
     },
   },
 }

oa-ui/src/views/statistics/components/carDeviceStatistics.vue

@@ -12,14 +12,14 @@
         <div class="left-top" id="deviceYearBar"></div>
         <div class="left-top" id="deviceStatusPie"></div>
       </div>
-      <div class="middle">
+      <div class="middle" v-loading="deviceDataLoading">
         <div class="middle-chart" id="deviceApprovalBar"></div>
       </div>
       <div class="right">
         <div class="right-top" id="carYearBar"></div>
-        <div class="right-top" id="carStatusPie" v-loading="dataLoading"></div>
+        <div class="right-top" id="carStatusPie" v-loading="carDataLoading"></div>
       </div>
-      <div class="right" v-loading="dataLoading">
+      <div class="right" v-loading="carDataLoading">
         <div class="right-top" id="carApprovalBar"></div>
         <div class="right-top" id="carDayBar"></div>
       </div>
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { ehcartsInit } from '@/utils/echarts'
+import { echartsInit } from '@/utils/echarts'
 import { getCarStatistic } from '@/api/oa/car/car';
 import { getDeviceStatistic } from '@/api/oa/device/device';
 let deviceYearChart, deviceStatusChart, deviceApprovalChart, carYearChart, carStatusChart, carApprovalChart, carDayChart
@@ -65,7 +65,12 @@ export default {
       carYear: {},
       carUsage: {},
       carDay: {},
-      dataLoading:false,
+      deviceDataLoading: false,
+      carDataLoading: false,
+      isYearView: true,
+      activeYear: '',
+      deviceMonth: {},
+      carMonth: {}
     }
   },
   created() {
@@ -89,6 +94,9 @@ export default {
         this.deviceApproval = this.deviceData.approval;
         this.deviceStatus = this.deviceData.status[0];
         this.deviceYear = this.deviceData.year[0];
+        if (this.deviceData.month) {
+          this.deviceMonth = this.deviceData.month[0];
+        }
       }
     },
     async initCarDatas() {
@@ -98,32 +106,104 @@ export default {
         this.carYear = this.carData.year[0];
         this.carUsage = this.carData.usage[0];
         this.carDay = this.carData.day;
+        if (this.carData.month) {
+          this.carMonth = this.carData.month[0];
+        }
       }
     },
-    clickYear(charts) {
+    clickDeviceYear(charts) {
       let that = this;
+      charts.off('click');
       charts.on('click', function (event) {
         if (event) {
-          that.activeYear = event.name;
-          let year = event.name + '-01-01'
-          if (event.name == "") {
-            year = ''
+          if (event.name === '' || event.name === undefined) {
+            that.isYearView = true;
+            that.activeYear = '';
+            that.initDeviceYearBar();
+          } else {
+            that.activeYear = event.name;
+            that.isYearView = false;
+            that.deviceDataLoading = true;
+            getDeviceStatistic({ applyDate: event.name + '-01-01' }).then(res => {
+              if (res.data.month) {
+                that.deviceMonth = res.data.month[0];
+              }
+              that.deviceApproval = res.data.approval;
+              that.deviceYear = res.data.year[0];
+              that.deviceDataLoading = false;
+              that.initDeviceYearBar();
+              that.initDeviceApprovalBar();
+            })
+          }
+        }
+      })
+    },
+    clickCarYear(charts) {
+      let that = this;
+      charts.off('click');
+      charts.on('click', function (event) {
+        if (event) {
+          if (event.name === '' || event.name === undefined) {
+            that.isYearView = true;
+            that.activeYear = '';
+            that.initCarYearBar();
+          } else {
+            that.activeYear = event.name;
+            that.isYearView = false;
+            that.carDataLoading = true;
+            getCarStatistic({ applyDate: event.name + '-01-01' }).then(res => {
+              if (res.data.month) {
+                that.carMonth = res.data.month[0];
+              }
+              that.carApproval = res.data.approval;
+              that.carUsage = res.data.usage[0];
+              that.carDay = res.data.day;
+              that.carYear = res.data.year[0];
+              that.carDataLoading = false;
+              that.initCarYearBar();
+              that.initCarUsagePie();
+              that.initCarApprovalBar();
+              that.initCarDayBar();
+            })
           }
-          that.dataLoading = true
-          getCarStatistic({ applyDate: year }).then(res => {
-            that.carApproval = res.data.approval;
-            that.carUsage = res.data.usage[0];
-            that.carDay = res.data.day;
-            that.dataLoading = false
-          })
         }
       })
     },
+    goBackToYear() {
+      this.isYearView = true;
+      this.activeYear = '';
+      this.deviceMonth = {};
+      this.carMonth = {};
+      this.initDeviceDatas();
+      this.initCarDatas();
+      this.initDeviceYearBar();
+      this.initDeviceApprovalBar();
+      this.initCarYearBar();
+      this.initCarUsagePie();
+      this.initCarApprovalBar();
+      this.initCarDayBar();
+    },
+    goBackToCarYear() {
+      this.isYearView = true;
+      this.activeYear = '';
+      this.carMonth = {};
+      this.initCarDatas();
+      this.initCarYearBar();
+      this.initCarUsagePie();
+      this.initCarApprovalBar();
+      this.initCarDayBar();
+    },
     initDeviceYearBar() {
+      let xData = this.isYearView ? Object.keys(this.deviceYear) : Object.keys(this.deviceMonth);
+      let deviceData = this.isYearView ? Object.values(this.deviceYear) : Object.values(this.deviceMonth);
+      let titleText = this.isYearView ? '设备申领次数' : this.activeYear + '年设备申领次数';
+      let subtext = this.isYearView ? '设备申领次数：' + Object.values(this.deviceYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次' : '设备申领次数：' + Object.values(this.deviceMonth).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次';
+      let xName = this.isYearView ? '年' : '月';
+      
       let option = {
         title: {
-          text: '各年设备申领次数',
-          subtext: ''
+          text: titleText,
+          subtext: subtext
         },
         grid: {
           left: '1%',
@@ -132,6 +212,19 @@ export default {
           height: '60%',
           containLabel: true
         },
+        graphic: this.isYearView ? [] : [{
+          type: 'text',
+          name: '',
+          right: '0',
+          top: '20%',
+          style: {
+            text: '返回',
+            fill: '#409EFF',
+            fontSize: 12,
+            fontWeight: ''
+          },
+          onclick: () => { this.goBackToYear(); }
+        }],
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -142,9 +235,9 @@ export default {
           }
         },
         xAxis: {
-          name: '年',
+          name: xName,
           type: 'category',
-          data: Object.keys(this.deviceYear),
+          data: xData,
         },
         yAxis: {
           type: 'value',
@@ -152,7 +245,7 @@ export default {
         },
         series: [
           {
-            data: Object.values(this.deviceYear),
+            data: deviceData,
             type: 'bar',
             smooth: true,
             label: {
@@ -165,7 +258,8 @@ export default {
           }
         ]
       };
-      let charts = ehcartsInit(deviceYearChart, 'deviceYearBar', option);
+      let charts = echartsInit(deviceYearChart, 'deviceYearBar', option);
+      this.clickDeviceYear(charts);
     },
     initDeviceStatusPie() {
       let option = {
@@ -241,14 +335,15 @@ export default {
           },
         ]
       };
-      ehcartsInit(deviceStatusChart, 'deviceStatusPie', option);
+      echartsInit(deviceStatusChart, 'deviceStatusPie', option);
     },
     initDeviceApprovalBar() {
       let xData = this.deviceApproval.map(item => item.count)
       let yData = this.deviceApproval.map(item => item.name)
+      let titleText = this.isYearView ? '设备申请次数榜' : this.activeYear + '年设备申请次数榜';
       let option = {
         title: {
-          text: '各类设备申请次数榜'
+          text: titleText
         },
         tooltip: {
           trigger: 'axis',
@@ -313,13 +408,19 @@ export default {
           }
         ]
       };
-      ehcartsInit(deviceApprovalChart, 'deviceApprovalBar', option);
+      echartsInit(deviceApprovalChart, 'deviceApprovalBar', option);
     },
     initCarYearBar(){
+      let xData = this.isYearView ? Object.keys(this.carYear) : Object.keys(this.carMonth);
+      let carData = this.isYearView ? Object.values(this.carYear) : Object.values(this.carMonth);
+      let titleText = this.isYearView ? '用车申请次数' : this.activeYear + '年用车申请次数';
+      let subtext = this.isYearView ? '用车申请次数：' + Object.values(this.carYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次' : '用车申请次数：' + Object.values(this.carMonth).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次';
+      let xName = this.isYearView ? '年' : '月';
+      
       let option = {
         title: {
-          text: '各年用车申请次数',
-          subtext: ''
+          text: titleText,
+          subtext: subtext
         },
         grid: {
           left: '1%',
@@ -328,21 +429,30 @@ export default {
           height: '60%',
           containLabel: true
         },
-        // legend: {},
-        graphic: [
-          {
-            type: 'text',
-            name: '',
-            right: '0',
-            top: '20%',
-            style: {
-              text: '全部年份',
-              fill: '#000', // 文本颜色  
-              fontSize: 12, // 文本大小  
-              fontWeight: '' // 文本粗细  
-            }
+        graphic: this.isYearView ? [{
+          type: 'text',
+          name: '',
+          right: '0',
+          top: '20%',
+          style: {
+            text: '全部年份',
+            fill: '#000',
+            fontSize: 12,
+            fontWeight: ''
           }
-        ],
+        }] : [{
+          type: 'text',
+          name: '',
+          right: '0',
+          top: '20%',
+          style: {
+            text: '返回',
+            fill: '#409EFF',
+            fontSize: 12,
+            fontWeight: ''
+          },
+          onclick: () => { this.goBackToCarYear(); }
+        }],
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -353,9 +463,9 @@ export default {
           }
         },
         xAxis: {
-          name: '年',
+          name: xName,
           type: 'category',
-          data: Object.keys(this.carYear),
+          data: xData,
         },
         yAxis: {
           type: 'value',
@@ -363,7 +473,7 @@ export default {
         },
         series: [
           {
-            data: Object.values(this.carYear),
+            data: carData,
             type: 'bar',
             smooth: true,
             label: {
@@ -376,13 +486,14 @@ export default {
           }
         ]
       };
-      let charts = ehcartsInit(carYearChart, 'carYearBar', option);
-      this.clickYear(charts)
+      let charts = echartsInit(carYearChart, 'carYearBar', option);
+      this.clickCarYear(charts)
     },
     initCarUsagePie(){
+      let titleText = this.isYearView ? '车辆申请类型' : this.activeYear + '年车辆申请类型';
       let option = {
         title: {
-          text: '车辆申请类型',
+          text: titleText,
         },
         tooltip: {
           trigger: 'item',
@@ -423,14 +534,15 @@ export default {
           },
         ]
       };
-      ehcartsInit(carStatusChart, 'carStatusPie', option);
+      echartsInit(carStatusChart, 'carStatusPie', option);
     },
     initCarApprovalBar(){
       let xData = this.carApproval.map(item => item.count)
       let yData = this.carApproval.map(item => item.name)
+      let titleText = this.isYearView ? '车辆使用次数榜' : this.activeYear + '年车辆使用次数榜';
       let option = {
         title: {
-          text: '车辆使用次数榜'
+          text: titleText
         },
         tooltip: {
           trigger: 'axis',
@@ -495,14 +607,15 @@ export default {
           }
         ]
       };
-      ehcartsInit(carApprovalChart, 'carApprovalBar', option);
+      echartsInit(carApprovalChart, 'carApprovalBar', option);
     },
     initCarDayBar(){
       let xData = this.carDay.map(item => item.count)
       let yData = this.carDay.map(item => item.name)
+      let titleText = this.isYearView ? '车辆使用天数榜' : this.activeYear + '年车辆使用天数榜';
       let option = {
         title: {
-          text: '车辆使用天数榜'
+          text: titleText
         },
         tooltip: {
           trigger: 'axis',
@@ -567,7 +680,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(carDayChart, 'carDayBar', option);
+      echartsInit(carDayChart, 'carDayBar', option);
     }
   },
 }

oa-ui/src/views/statistics/components/contractStatistics.vue

@@ -8,7 +8,7 @@
             range-separator="-" start-placeholder="开始月份" end-placeholder="结束月份" :default-time="['00:00:00', '23:59:59']"
             @change="queryList"></el-date-picker>
         </div>
-        <!-- 每年合同额柱状图 -->
+        <!-- 每合同额柱状图 -->
         <div class="left-top" id="amountBar"></div>
         <div class="left-bottom">
           <div class="pie1" id="cwamountPie"></div>
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { ehcartsInit } from "@/utils/echarts";
+import { echartsInit } from "@/utils/echarts";
 import { getContractStatistic } from "@/api/oa/contract/contract";
 import { getSubContractStatistic } from "@/api/oa/contract/subContract";
 let amountChart,
@@ -243,9 +243,10 @@ export default {
       });
     },
     initChartSubYear() {
+      let yearTitle = this.activeYear ? this.activeYear + "合同数统计" : "合同数统计";
       let option = {
         title: {
-          text: "各年合同数统计",
+          text: yearTitle,
           subtext:
             "承接合同总数：" +
             Object.values(this.contractYear).reduce(
@@ -293,7 +294,7 @@ export default {
           },
         },
         xAxis: {
-          // name: '年',
+          // name: '',
           type: "category",
           data: Object.keys(this.contractYear),
         },
@@ -348,12 +349,13 @@ export default {
           },
         ],
       };
-      this.mainChart = ehcartsInit(amountChart, "amountBar", option);
+      this.mainChart = echartsInit(amountChart, "amountBar", option);
     },
     initAmountBar() {
+      let yearTitle = this.activeYear ? this.activeYear + "合同额统计" : "合同额统计";
       let option = {
         title: {
-          text: "各年合同额统计",
+          text: yearTitle,
           subtext:
             "承接合同总额：" +
             Object.values(this.contractAmount)
@@ -392,7 +394,7 @@ export default {
           },
         },
         xAxis: {
-          name: "年",
+          name: "",
           type: "category",
           data: Object.keys(this.contractAmount),
         },
@@ -507,7 +509,7 @@ export default {
           },
         ],
       };
-      ehcartsInit(subYearChart, "subYearLine", option);
+      echartsInit(subYearChart, "subYearLine", option);
     },
     initChartCwAomunt(year) {
       let option = {
@@ -564,7 +566,7 @@ export default {
           },
         ],
       };
-      ehcartsInit(cwAmountChart, "cwamountPie", option);
+      echartsInit(cwAmountChart, "cwamountPie", option);
     },
     initChartCwSource(year) {
       let option = {
@@ -610,14 +612,14 @@ export default {
           },
         ],
       };
-      ehcartsInit(cwSourceChart, "cwSourcePie", option);
+      echartsInit(cwSourceChart, "cwSourcePie", option);
     },
     initChartSubAmount() {
       let option = {
         title: {
-          text: "各年分包合同额统计",
+          text: "分包合同额统计",
           subtext:
-            "共计合同额：" +
+            "合同额：" +
             Object.values(this.subAmount).reduce(
               (accumulator, currentValue) => accumulator + currentValue,
               0
@@ -644,7 +646,7 @@ export default {
           },
         },
         xAxis: {
-          name: "年",
+          name: "",
           type: "category",
           data: Object.keys(this.subAmount),
         },
@@ -678,7 +680,7 @@ export default {
           },
         ],
       };
-      ehcartsInit(subAmountChart, "subAmountBar", option);
+      echartsInit(subAmountChart, "subAmountBar", option);
     },
 
     initChartSubCwAomunt(year) {
@@ -736,7 +738,7 @@ export default {
           },
         ],
       };
-      ehcartsInit(subCwAmountChart, "subCwAmountPie", option);
+      echartsInit(subCwAmountChart, "subCwAmountPie", option);
     },
     initChartSubCwSource(year) {
       let option = {
@@ -782,7 +784,7 @@ export default {
           },
         ],
       };
-      ehcartsInit(subSourceChart, "subSourcePie", option);
+      echartsInit(subSourceChart, "subSourcePie", option);
     },
   },
 };
@@ -808,7 +810,7 @@ export default {
       position: absolute;
       right: 66px;
       top: 54px;
-      z-index: 9999;
+      z-index: 1;
     }
 
     .left-top {
@@ -867,8 +869,5 @@ export default {
     }
   }
 
-  .right {
-    // flex: 1;
-  }
 }
 </style>

oa-ui/src/views/statistics/components/projectStatistics.vue

@@ -9,7 +9,12 @@
     <div class="titles">项目统计</div>
     <div class="warpper">
       <div class="left">
-        <!-- 年份项目柱状图 -->
+        <div class="date-range">
+          <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="monthrange"
+            range-separator="-" start-placeholder="开始月份" end-placeholder="结束月份" :default-time="['00:00:00', '23:59:59']"
+            @change="queryList"></el-date-picker>
+        </div>
+        <!-- 年份/月度项目图表 -->
         <div class="bar" id="yearNumber"></div>
         <div class="pie-box" v-loading="dataLoading">
           <!-- 院内院外饼图 -->
@@ -29,7 +34,7 @@
 
 <script>
 import * as echarts from 'echarts'
-import { disposeCharts, echartsSetoption, ehcartsInit } from '@/utils/echarts'
+import { disposeCharts, echartsSetoption, echartsInit } from '@/utils/echarts'
 import { getProjectStatistic } from '@/api/oa/project/project'
 let barYearChart, sourceChart, deptChart, typeChart
 export default {
@@ -42,6 +47,11 @@ export default {
   data() {
     return {
       year: {},
+      month: {},
+      monthComplete: {},
+      monthArchive: {},
+      monthSettle: {},
+      monthCheck: {},
       type: {},
       source: {},
       dept: {},
@@ -52,11 +62,16 @@ export default {
       loading: true,
       activeYear: '',
       dataLoading: false,
+      isYearView: true,
+      mainChart: null,
+      dateRange: [],
     }
   },
   watch: {
     year() {
-      this.initChartBar();
+      if (this.isYearView) {
+        this.initChartBar();
+      }
     },
     source() {
       this.initChartSource(this.activeYear);
@@ -86,8 +101,10 @@ export default {
   methods: {
     async initDatas() {
       this.loading = true;
+      this.isYearView = true;
       if (Object.keys(this.datas).length !== 0) {
         this.year = this.datas.year[0];
+        this.month = this.datas.month ? this.datas.month[0] : {};
         this.type = this.datas.type[0];
         this.source = this.datas.source[0];
         this.dept = this.datas.dept[0];
@@ -99,11 +116,42 @@ export default {
       }
 
     },
+    async queryList() {
+      this.loading = true;
+      let params = {};
+      if (this.dateRange && this.dateRange.length === 2) {
+        params.params = {
+          beginTime: this.dateRange[0],
+          endTime: this.dateRange[1]
+        };
+      }
+      let res = await getProjectStatistic(params);
+      if (this.dateRange && this.dateRange.length === 2) {
+        this.year = res.data.month ? res.data.month[0] : {};
+        this.month = res.data.month ? res.data.month[0] : {};
+        this.archive = res.data.monthArchive ? res.data.monthArchive[0] : {};
+        this.complete = res.data.monthComplete ? res.data.monthComplete[0] : {};
+        this.settle = res.data.monthSettle ? res.data.monthSettle[0] : {};
+        this.check = res.data.monthCheck ? res.data.monthCheck[0] : {};
+      } else {
+        this.year = res.data.year[0];
+        this.month = res.data.month ? res.data.month[0] : {};
+        this.archive = res.data.archive[0];
+        this.complete = res.data.complete[0];
+        this.settle = res.data.settle[0];
+        this.check = res.data.check[0];
+      }
+      this.type = res.data.type[0];
+      this.source = res.data.source[0];
+      this.dept = res.data.dept[0];
+      this.loading = false;
+      this.initChartBar();
+    },
     initChartBar() {
       let option = {
         title: {
-          text: '各年项目个数统计',
-          subtext: '共计项目：' + Object.values(this.year).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '个'
+          text: '项目个数统计',
+          subtext: '项目数量：' + Object.values(this.year).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '个'
         },
         grid: {
           left: '1%',
@@ -120,7 +168,7 @@ export default {
             right: '0',
             top: '20%',
             style: {
-              text: '全部年份',
+              text: '返回',
               fill: '#000', // 文本颜色  
               fontSize: 12, // 文本大小  
               fontWeight: '' // 文本粗细  
@@ -137,7 +185,7 @@ export default {
           }
         },
         xAxis: {
-          name: '年',
+          name: '',
           type: 'category',
           data: Object.keys(this.year),
         },
@@ -217,28 +265,152 @@ export default {
           },
         ]
       };
-      let charts = ehcartsInit(barYearChart, 'yearNumber', option);
-      this.clickYear(charts)
+      this.mainChart = echartsInit(barYearChart, 'yearNumber', option);
+      this.clickYear(this.mainChart)
     },
     clickYear(charts) {
       let that = this;
-      charts.on('click', function (event) {
+      that.mainChart = charts;
+      charts.off('click');
+      charts.on('click', async function (event) {
         if (event) {
-          that.activeYear = event.name;
-          let projectNumber = event.name
-          if (event.name == "") {
-            projectNumber = ''
-          }
-          that.dataLoading = true
-          getProjectStatistic({ projectNumber }).then(res => {
+          if (event.name === '' || event.name === undefined) {
+            that.initDatas();
+            that.isYearView = true;
+            that.activeYear = '';
+          } else {
+            that.activeYear = event.name;
+            that.isYearView = false;
+            that.dataLoading = true;
+            let res = await getProjectStatistic({ projectNumber: event.name });
+            that.year = res.data.year[0];
+            that.month = res.data.month ? res.data.month[0] : {};
+            that.monthComplete = res.data.monthComplete ? res.data.monthComplete[0] : {};
+            that.monthArchive = res.data.monthArchive ? res.data.monthArchive[0] : {};
+            that.monthSettle = res.data.monthSettle ? res.data.monthSettle[0] : {};
+            that.monthCheck = res.data.monthCheck ? res.data.monthCheck[0] : {};
             that.type = res.data.type[0];
             that.source = res.data.source[0];
             that.dept = res.data.dept[0];
-            that.dataLoading = false
-          })
+            that.archive = res.data.archive[0];
+            that.complete = res.data.complete[0];
+            that.settle = res.data.settle[0];
+            that.check = res.data.check[0];
+            that.dataLoading = false;
+            that.initMonthChart();
+          }
         }
       })
     },
+    initMonthChart() {
+      let option = {
+        title: {
+          text: this.activeYear + '月度项目个数统计',
+          subtext: '项目数量：' + Object.values(this.month).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '个'
+        },
+        grid: {
+          left: '1%',
+          right: '1%',
+          bottom: '0%',
+          height: '60%',
+          containLabel: true
+        },
+        legend:{},
+        graphic: [
+          {
+            type: 'text',
+            name: '',
+            right: '0',
+            top: '20%',
+            style: {
+              text: '返回',
+              fill: '#000',
+              fontSize: 12,
+              fontWeight: ''
+            }
+          }
+        ],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'none',
+            label: {
+              backgroundColor: '#6a7985'
+            }
+          }
+        },
+        xAxis: {
+          name: '月',
+          type: 'category',
+          data: Object.keys(this.month),
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位：个'
+        },
+        series: [{
+            name:'已归档',
+            type: 'line',
+            data: Object.values(this.monthArchive),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:4
+          },
+          {
+            name:'已完成',
+            type: 'line',
+            data: Object.values(this.monthComplete),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:2
+          },
+          {
+            name:'已结算',
+            type: 'line',
+            data: Object.values(this.monthSettle),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:3
+          },
+          {
+            name:'已核算',
+            type: 'line',
+            data: Object.values(this.monthCheck),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:5
+          },
+          {
+            name:'总数',
+            type: 'line',
+            data: Object.values(this.month),
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top',
+            },
+          }
+        ]
+      };
+      this.mainChart = echartsInit(barYearChart, 'yearNumber', option);
+      this.clickYear(this.mainChart);
+    },
     initChartSource(year) {
       let option = {
         title: {
@@ -283,12 +455,12 @@ export default {
           }
         ]
       };
-      ehcartsInit(sourceChart, 'sourceNumber', option);
+      echartsInit(sourceChart, 'sourceNumber', option);
     },
     initChartDept(year) {
       let option = {
         title: {
-          text: year + '各部门承担项目情况',
+          text: year + '部门承担项目情况',
         },
         tooltip: {
           trigger: 'item',
@@ -332,7 +504,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(deptChart, 'deptNumber', option);
+      echartsInit(deptChart, 'deptNumber', option);
     },
     initTypeBar(year) {
       let option = {
@@ -402,7 +574,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(typeChart, 'typeNumber', option);
+      echartsInit(typeChart, 'typeNumber', option);
     },
   },
 }
@@ -422,15 +594,23 @@ export default {
 
   .left {
     flex: 1.5;
+    position: relative;
 
-    .bar {
-      width: 100%;
-      height: 300px;
-      padding: 10px;
-      border: 1px solid #ececec;
+    .date-range {
+      position: absolute;
+      right: 66px;
+      top: 54px;
+      z-index: 1;
     }
 
-    .pie-box {
+    .bar {
+        width: 100%;
+        height: 300px;
+        padding: 10px;
+        border: 1px solid #ececec;
+      }
+
+      .pie-box {
       width: 100%;
       height: 300px;
       display: flex;
@@ -461,10 +641,5 @@ export default {
       border: 1px solid #ececec;
     }
   }
-
-  .right {
-    // flex: 1;
-    // display: flex;
-  }
 }
 </style>

oa-ui/src/views/statistics/components/settleStatistics.vue

@@ -21,8 +21,9 @@
 </template>
 
 <script>
-import { ehcartsInit } from '@/utils/echarts'
+import { echartsInit } from '@/utils/echarts'
 import { getSettleStatistic } from '@/api/oa/settle/settle';
+import { getCheckStatistic } from '@/api/oa/budget/check';
 let settleYearChart, settleAmountChart, settleTypeChart, settleProjectChart
 export default {
   props: {
@@ -62,7 +63,12 @@ export default {
       checkYear: {},
       checkAmount: {},
       dataLoading: false,
-      activeYear: ''
+      activeYear: '',
+      isYearView: true,
+      settleMonth: {},
+      settleMonthAmount: {},
+      checkMonth: {},
+      checkMonthAmount: {}
     }
   },
   created() {
@@ -86,8 +92,14 @@ export default {
         this.settleYear = this.settleData.year[0];
         this.yearSettleProjectAmount = this.settleData.yearProjectAmount[0];
         this.yearSettleProjectCount = this.settleData.yearProjectCount[0];
+        if (this.settleData.month) {
+          this.settleMonth = this.settleData.month[0];
+        }
+        if (this.settleData.monthAmount) {
+          this.settleMonthAmount = this.settleData.monthAmount[0];
+        }
         let sum = Object.values(this.settleAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
-        this.sumSettleAmount = (sum / 10000).toFixed(1)
+        this.sumSettleAmount = (sum / 10000).toFixed(2)
         this.loading = false;
       } else {
         this.loading = true;
@@ -99,8 +111,14 @@ export default {
         this.checkYear = this.checkData.year[0];
         this.yearCheckProjectAmount = this.checkData.yearProjectAmount[0];
         this.yearCheckProjectCount = this.checkData.yearProjectCount[0];
+        if (this.checkData.month) {
+          this.checkMonth = this.checkData.month[0];
+        }
+        if (this.checkData.monthAmount) {
+          this.checkMonthAmount = this.checkData.monthAmount[0];
+        }
         let sum = Object.values(this.checkAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
-        this.sumCheckAmount = (sum / 10000).toFixed(1)
+        this.sumCheckAmount = (sum / 10000).toFixed(2)
         this.loading = false;
       } else {
         this.loading = true;
@@ -108,27 +126,84 @@ export default {
     },
     clickYear(charts) {
       let that = this;
+      charts.off('click');
       charts.on('click', function (event) {
         if (event) {
-          that.activeYear = event.name;
-          let year = event.name + '-01-01'
-          if (event.name == "") {
-            year = ''
+          if (event.name === '' || event.name === undefined) {
+            that.isYearView = true;
+            that.activeYear = '';
+            that.initSettleYearBar();
+            that.initSettleAmountLine();
+          } else {
+            that.activeYear = event.name;
+            that.isYearView = false;
+            that.dataLoading = true;
+            Promise.all([
+              getSettleStatistic({ gmTime: event.name + '-01-01' }),
+              getCheckStatistic({ checkTime: event.name + '-01-01' })
+            ]).then(([settleRes, checkRes]) => {
+              // 处理结算数据
+              if (settleRes.data.month) {
+                that.settleMonth = settleRes.data.month[0];
+              }
+              if (settleRes.data.monthAmount) {
+                that.settleMonthAmount = settleRes.data.monthAmount[0];
+              }
+              that.settleType = settleRes.data.type[0];
+              that.settleTypeAmount = settleRes.data.typeAmount[0];
+              if (settleRes.data.year) {
+                that.settleYear = settleRes.data.year[0];
+              }
+              if (settleRes.data.amount) {
+                that.settleAmount = settleRes.data.amount[0];
+              }
+              // 处理核算数据
+              if (checkRes.data.month) {
+                that.checkMonth = checkRes.data.month[0];
+              }
+              if (checkRes.data.monthAmount) {
+                that.checkMonthAmount = checkRes.data.monthAmount[0];
+              }
+              if (checkRes.data.year) {
+                that.checkYear = checkRes.data.year[0];
+              }
+              if (checkRes.data.amount) {
+                that.checkAmount = checkRes.data.amount[0];
+              }
+              that.dataLoading = false;
+              that.initSettleYearBar();
+              that.initSettleAmountLine();
+            })
           }
-          that.dataLoading = true
-          getSettleStatistic({ gmTime: year }).then(res => {
-            that.settleType = res.data.type[0];
-            that.settleTypeAmount = res.data.typeAmount[0];
-            that.dataLoading = false
-          })
         }
       })
     },
+    goBackToYear() {
+      this.isYearView = true;
+      this.activeYear = '';
+      this.settleMonth = {};
+      this.settleMonthAmount = {};
+      this.checkMonth = {};
+      this.checkMonthAmount = {};
+      this.initSettleDatas();
+      this.initCheckDatas();
+      this.initSettleYearBar();
+      this.initSettleAmountLine();
+    },
     initSettleYearBar() {
+      let xData = this.isYearView ? Object.keys(this.settleYear) : Object.keys(this.settleMonth);
+      let settleData = this.isYearView ? Object.values(this.settleYear) : Object.values(this.settleMonth);
+      let checkData = this.isYearView ? Object.values(this.checkYear) : Object.values(this.checkMonth);
+      let titleText = this.isYearView ? '结算次数' : this.activeYear + '年结算次数';
+      let settleSum = this.isYearView ? Object.values(this.settleYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) : Object.values(this.settleMonth).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+      let checkSum = this.isYearView ? Object.values(this.checkYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) : Object.values(this.checkMonth).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+      let subtext = '结算次数：' + settleSum + '次\n核算次数：' + checkSum + '次';
+      let xName = this.isYearView ? '年' : '月';
+      
       let option = {
         title: {
-          text: '各年结算次数',
-          subtext: '共计结算次数：' + Object.values(this.settleYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '次'
+          text: titleText,
+          subtext: subtext
         },
         grid: {
           left: '1%',
@@ -138,20 +213,30 @@ export default {
           containLabel: true
         },
         legend: {},
-        graphic: [
-          {
-            type: 'text',
-            name: '',
-            right: '0',
-            top: '20%',
-            style: {
-              text: '全部年份',
-              fill: '#000', // 文本颜色  
-              fontSize: 12, // 文本大小  
-              fontWeight: '' // 文本粗细  
-            }
+        graphic: this.isYearView ? [{
+          type: 'text',
+          name: '',
+          right: '0',
+          top: '20%',
+          style: {
+            text: '全部年份',
+            fill: '#000',
+            fontSize: 12,
+            fontWeight: ''
           }
-        ],
+        }] : [{
+          type: 'text',
+          name: '',
+          right: '0',
+          top: '20%',
+          style: {
+            text: '返回',
+            fill: '#409EFF',
+            fontSize: 12,
+            fontWeight: ''
+          },
+          onclick: () => { this.goBackToYear(); }
+        }],
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -162,9 +247,9 @@ export default {
           }
         },
         xAxis: {
-          name: '年',
+          name: xName,
           type: 'category',
-          data: Object.keys(this.settleYear),
+          data: xData,
         },
         yAxis: {
           type: 'value',
@@ -173,7 +258,7 @@ export default {
         series: [
           {
             name: "结算",
-            data: Object.values(this.settleYear),
+            data: settleData,
             type: 'bar',
             smooth: true,
             label: {
@@ -186,7 +271,7 @@ export default {
           },
           {
             name: "核算",
-            data: Object.values(this.checkYear),
+            data: checkData,
             type: 'bar',
             smooth: true,
             label: {
@@ -199,18 +284,26 @@ export default {
           }
         ]
       };
-      let charts = ehcartsInit(settleYearChart, 'settleBar', option);
+      let charts = echartsInit(settleYearChart, 'settleBar', option);
       this.clickYear(charts)
     },
     initSettleAmountLine() {
+      let xData = this.isYearView ? Object.keys(this.settleAmount) : Object.keys(this.settleMonthAmount);
+      let settleData = this.isYearView ? Object.values(this.settleAmount) : Object.values(this.settleMonthAmount);
+      let checkData = this.isYearView ? Object.values(this.checkAmount) : Object.values(this.checkMonthAmount);
+      let titleText = this.isYearView ? '结算金额' : this.activeYear + '年结算金额';
+      
+      let settleSum = settleData.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+      let checkSum = checkData.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+      
       let option = {
         title: {
-          text: '各年结算金额',
-          subtext: '结算总额：' + (Object.values(this.settleAmount).reduce((accumulator, currentValue) => {return accumulator + currentValue}, 0)).toFixed(2) + '元' +
-            '（约' + this.sumSettleAmount + '万元）' +
+          text: titleText,
+          subtext: '结算总额：' + settleSum.toFixed(2) + '元' +
+            '（约' + (settleSum / 10000).toFixed(2) + '万元）' +
             "\n" + 
-            '核算总额：' + (Object.values(this.checkAmount).reduce((accumulator, currentValue) => {return accumulator + currentValue}, 0)).toFixed(2) + '元' +
-            '（约' + this.sumCheckAmount + '万元）'
+            '核算总额：' + checkSum.toFixed(2) + '元' +
+            '（约' + (checkSum / 10000).toFixed(2) + '万元）'
         },
         grid: {
           left: '1%',
@@ -234,7 +327,7 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: Object.keys(this.settleAmount),
+          data: xData,
         },
         yAxis: {
           type: 'value',
@@ -243,7 +336,7 @@ export default {
         series: [
           {
             name: "结算",
-            data: Object.values(this.settleAmount),
+            data: settleData,
             type: 'line',
             smooth: true,
             label: {
@@ -252,14 +345,14 @@ export default {
               formatter: function (params) {
                 let value = params.value;
                 if (value >= 10000) {
-                  return '约' + (value / 10000).toFixed(1) + '万元'
+                  return '约' + (value / 10000).toFixed(2) + '万元'
                 }
               }
             }
           },
           {
             name: "核算",
-            data: Object.values(this.checkAmount),
+            data: checkData,
             type: 'line',
             smooth: true,
             label: {
@@ -268,14 +361,14 @@ export default {
               formatter: function (params) {
                 let value = params.value;
                 if (value >= 10000) {
-                  return '约' + (value / 10000).toFixed(1) + '万元'
+                  return '约' + (value / 10000).toFixed(2) + '万元'
                 }
               }
             }
           }
         ]
       };
-      ehcartsInit(settleAmountChart, 'settleLine', option);
+      echartsInit(settleAmountChart, 'settleLine', option);
     },
     initSettleTypePie(year) {
       let option = {
@@ -352,7 +445,7 @@ export default {
           },
         ]
       };
-      ehcartsInit(settleTypeChart, 'settleTypePie', option);
+      echartsInit(settleTypeChart, 'settleTypePie', option);
     },
     initSettleProjectLineBar(year) {
       let option = {
@@ -404,7 +497,7 @@ export default {
               formatter: function (params) {
                 let value = params.value;
                 if (value >= 10000) {
-                  return '约' + (value / 10000).toFixed(1) + '万元'
+                  return '约' + (value / 10000).toFixed(2) + '万元'
                 }
               }
             }
@@ -425,14 +518,14 @@ export default {
               formatter: function (params) {
                 let value = params.value;
                 if (value >= 10000) {
-                  return '约' + (value / 10000).toFixed(1) + '万元'
+                  return '约' + (value / 10000).toFixed(2) + '万元'
                 }
               }
             }
           }
         ]
       };
-      ehcartsInit(settleProjectChart, 'settleProject', option);
+      echartsInit(settleProjectChart, 'settleProject', option);
     },
   },
 }

oa-ui/src/views/statistics/components/topHead.vue

@@ -82,7 +82,7 @@
 import upSrc from '@/assets/icons/up.png'
 import downSrc from '@/assets/icons/down.png'
 import * as echarts from 'echarts'
-import { ehcartsInit } from '@/utils/echarts'
+import { echartsInit } from '@/utils/echarts'
 let thisYearChart, contractYearChart, deviceYearChart, borrowYearChart, settleYearChart
 export default {
   props: {
@@ -292,7 +292,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(thisYearChart, 'thisYear', option);
+      echartsInit(thisYearChart, 'thisYear', option);
     },
     initChartTwo() {
       let option = {
@@ -334,7 +334,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(contractYearChart, 'thisContract', option);
+      echartsInit(contractYearChart, 'thisContract', option);
     },
     initChartThree() {
       let option = {
@@ -376,7 +376,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(deviceYearChart, 'thisDevice', option);
+      echartsInit(deviceYearChart, 'thisDevice', option);
     },
     initChartFour() {
       let option = {
@@ -418,7 +418,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(borrowYearChart, 'thisBorrow', option);
+      echartsInit(borrowYearChart, 'thisBorrow', option);
     },
     initChartFive() {
       let option = {
@@ -460,7 +460,7 @@ export default {
           }
         ]
       };
-      ehcartsInit(settleYearChart, 'thisSettle', option);
+      echartsInit(settleYearChart, 'thisSettle', option);
     },
     getProjectYearSub(year) {
       let arr = Object.values(year).slice(-2);