合同统计

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

@@ -1,10 +1,16 @@
 package com.ruoyi.web.controller.oa;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcPartyAService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,6 +57,25 @@ public class CmcContractController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取cmc合同统计信息
+     */
+    @GetMapping("/statistic")
+    public AjaxResult getContractStatistic(CmcContract cmcContract) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
+        //每年合同数量
+        for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+            cmcContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+            List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
+            yearObject.put(String.valueOf(i), yearList.size());
+        }
+        yearArray.add(yearObject);
+        jsonObject.put("year", yearArray);
+        return success(jsonObject);
+    }
+
     /**
      * 导出cmc合同评审列表
      */

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

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oa.domain.CmcManageDept;
 import com.ruoyi.oa.service.ICmcManageDeptService;
@@ -17,7 +16,6 @@ import com.ruoyi.oa.service.ICmcProjectWorkService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.controller.qyweixin.MessageController;
-import com.ruoyi.web.controller.system.SysPostController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -135,40 +133,37 @@ public class CmcProjectController extends BaseController
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
-        if (cmcProject.getProjectNumber() == null) {
+        JSONArray sourceArray = new JSONArray();
+        JSONObject sourceObject = new JSONObject();
+        JSONArray typeArray = new JSONArray();
+        JSONObject typeObject = new JSONObject();
+        JSONArray deptArray = new JSONArray();
+        JSONObject deptObject = new JSONObject();
+        //整体
+        if (cmcProject.getProjectNumber() == null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
             //每年项目数量
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 cmcProject.setProjectNumber(String.valueOf(i));
                 List<CmcProject> yearList = cmcProjectService.selectCmcProjectList(cmcProject);
                 yearObject.put(String.valueOf(i), yearList.size());
             }
-            //输入年份院内外项目数量
-            JSONArray sourceArray = new JSONArray();
-            JSONObject sourceObject = new JSONObject();
+            //院内外项目数量
             cmcProject.setProjectNumber(null);
             cmcProject.setProjectSource("1");
             sourceObject.put("市场", cmcProjectService.selectCmcProjectList(cmcProject).size());
             cmcProject.setProjectSource("0");
             sourceObject.put("院内", cmcProjectService.selectCmcProjectList(cmcProject).size());
-            sourceArray.add(sourceObject);
-            jsonObject.put("source", sourceArray);
-            //输入年份各类型项目数量
+            //各类型项目数量
             cmcProject.setProjectSource(null);
             Map<Object, List<CmcProject>> typeGroup = cmcProjectService.selectCmcProjectList(cmcProject).stream().collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getProjectType())));
             Set<Map.Entry<Object, List<CmcProject>>> typeEntries = typeGroup.entrySet();
-            JSONArray typeArray = new JSONArray();
-            JSONObject typeObject = new JSONObject();
             typeEntries.forEach(item -> {
                 if (item.getKey() != Optional.empty()) {
                     String str = item.getKey().toString();
                     typeObject.put(str.substring(str.indexOf("[") + 1, str.indexOf("]")), item.getValue().size());
                 }
             });
-            typeArray.add(typeObject);
-            jsonObject.put("type", typeArray);
-            //输入年份各承担部门项目数量
-            JSONArray deptArray = new JSONArray();
-            JSONObject deptObject = new JSONObject();
+            //各承担部门项目数量
             for (int i = 107; i <= 115; i++) {
                 cmcProject.setUndertakingDept(String.valueOf(i));
                 List<CmcProject> deptList = new ArrayList<>();
@@ -178,25 +173,18 @@ public class CmcProjectController extends BaseController
                     deptList = cmcProjectService.selectCmcInvestProjectList(cmcProject);
                 deptObject.put(deptService.selectDeptById((long)i).getDeptName(), deptList.size());
             }
-            deptArray.add(deptObject);
-            jsonObject.put("dept", deptArray);
         }
-        else {
+        //年度
+        else if (cmcProject.getProjectNumber() != null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
             //输入年份项目数量
             yearObject.put(cmcProject.getProjectNumber(), cmcProjectService.selectCmcProjectList(cmcProject).size());
             //输入年份院内外项目数量
-            JSONArray sourceArray = new JSONArray();
-            JSONObject sourceObject = new JSONObject();
-            CmcProject project = new CmcProject();
-            project.setProjectNumber(cmcProject.getProjectNumber() + "W");
-            sourceObject.put("市场", cmcProjectService.selectCmcProjectList(project).size());
-            project.setProjectNumber(cmcProject.getProjectNumber() + "C");
-            sourceObject.put("院内", cmcProjectService.selectCmcProjectList(project).size());
-            sourceArray.add(sourceObject);
-            jsonObject.put("source", sourceArray);
+            cmcProject.setProjectSource("1");
+            sourceObject.put("市场", cmcProjectService.selectCmcProjectList(cmcProject).size());
+            cmcProject.setProjectSource("0");
+            sourceObject.put("院内", cmcProjectService.selectCmcProjectList(cmcProject).size());
             //输入年份各类型项目数量
-            JSONArray typeArray = new JSONArray();
-            JSONObject typeObject = new JSONObject();
+            cmcProject.setProjectSource(null);
             Map<Object, List<CmcProject>> typeGroup = cmcProjectService.selectCmcProjectList(cmcProject).stream().collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getProjectType())));
             Set<Map.Entry<Object, List<CmcProject>>> typeEntries = typeGroup.entrySet();
             typeEntries.forEach(item -> {
@@ -205,26 +193,25 @@ public class CmcProjectController extends BaseController
                     typeObject.put(str.substring(str.indexOf("[") + 1, str.indexOf("]")), item.getValue().size());
                 }
             });
-            typeArray.add(typeObject);
-            jsonObject.put("type", typeArray);
             //输入年份各承担部门项目数量
-            JSONArray deptArray = new JSONArray();
-            JSONObject deptObject = new JSONObject();
-            project.setProjectNumber(cmcProject.getProjectNumber());
             for (int i = 107; i <= 115; i++) {
-                project.setUndertakingDept(String.valueOf(i));
+                cmcProject.setUndertakingDept(String.valueOf(i));
                 List<CmcProject> deptList = new ArrayList<>();
                 if (i != 113)
-                    deptList = cmcProjectService.selectCmcProjectList(project);
+                    deptList = cmcProjectService.selectCmcProjectList(cmcProject);
                 else
-                    deptList = cmcProjectService.selectCmcInvestProjectList(project);
+                    deptList = cmcProjectService.selectCmcInvestProjectList(cmcProject);
                 deptObject.put(deptService.selectDeptById((long)i).getDeptName(), deptList.size());
             }
-            deptArray.add(deptObject);
-            jsonObject.put("dept", deptArray);
         }
         yearArray.add(yearObject);
+        sourceArray.add(sourceObject);
+        deptArray.add(deptObject);
+        typeArray.add(typeObject);
         jsonObject.put("year", yearArray);
+        jsonObject.put("source", sourceArray);
+        jsonObject.put("dept", deptArray);
+        jsonObject.put("type", typeArray);
         return success(jsonObject);
     }
 

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

@@ -91,7 +91,7 @@
             <if test="contractDocument != null  and contractDocument != ''"> and c.contract_document = #{contractDocument}</if>
             <if test="drafter != null "> and c.drafter = #{drafter}</if>
             <if test="draftTime != null "> and c.draft_time = #{draftTime}</if>
-            <if test="signDate != null "> and c.sign_date = #{signDate}</if>
+            <if test="signDate != null "> and YEAR(c.sign_date) = YEAR(#{signDate})</if>
             <if test="signRemark != null  and signRemark != ''"> and c.sign_remark = #{signRemark}</if>
             <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>