归档、结算统计

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

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.oa;
 
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
@@ -9,10 +11,10 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.oa.domain.CmcArchive;
 import com.ruoyi.oa.domain.CmcManageDept;
-import com.ruoyi.oa.service.ICmcManageDeptService;
-import com.ruoyi.oa.service.ICmcPartyAService;
-import com.ruoyi.oa.service.ICmcProjectWorkService;
+import com.ruoyi.oa.domain.CmcSettle;
+import com.ruoyi.oa.service.*;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.controller.qyweixin.MessageController;
@@ -23,7 +25,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.oa.domain.CmcProject;
-import com.ruoyi.oa.service.ICmcProjectService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -55,6 +56,12 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcManageDeptService cmcManageDeptService;
 
+    @Autowired
+    private ICmcArchiveService cmcArchiveService;
+
+    @Autowired
+    private ICmcSettleService cmcSettleService;
+
     /**
      * 查询cmc项目列表
      */
@@ -144,8 +151,7 @@ public class CmcProjectController extends BaseController
      * 获取cmc项目统计信息
      */
     @GetMapping("/statistic")
-    public AjaxResult getProjectStatistic(CmcProject cmcProject)
-    {
+    public AjaxResult getProjectStatistic(CmcProject cmcProject) throws ParseException {
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
@@ -157,40 +163,84 @@ public class CmcProjectController extends BaseController
         JSONObject deptObject = new JSONObject();
         JSONArray completeArray = new JSONArray();
         JSONObject completeObject = new JSONObject();
+        JSONArray archiveArray = new JSONArray();
+        JSONObject archiveObject = new JSONObject();
+        JSONArray settleArray = new JSONArray();
+        JSONObject settleObject = 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.selectCmcAllProjectList(cmcProject);
                 yearObject.put(String.valueOf(i), yearList.size());
+                //已完成
+                cmcProject.setIsComplete("1");
+                yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+                completeObject.put(String.valueOf(i), yearList.size());
+                //已归档
+                CmcArchive cmcArchive = new CmcArchive();
+                cmcArchive.setProjectNumber(String.valueOf(i));
+                cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
+                archiveObject.put(String.valueOf(i), archiveList.size());
+                //已结算
+                CmcSettle cmcSettle = new CmcSettle();
+                cmcSettle.setProjectNumber(String.valueOf(i));
+                cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
+                settleObject.put(String.valueOf(i), settleList.size());
             }
             cmcProject.setProjectNumber(null);
+            cmcProject.setIsComplete(null);
             getProjectSourceStatistic(cmcProject, sourceObject);
             getProjectTypeStatistic(cmcProject, typeObject);
             getProjectDeptStatistic(cmcProject, deptObject);
-            getProjectCompleteStatistic(cmcProject, completeObject);
 
         }
         //年度
         else if (cmcProject.getProjectNumber() != null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
             //输入年份项目数量
-            yearObject.put(cmcProject.getProjectNumber(),  cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+            List<CmcProject> yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+            //总数
+            yearObject.put(cmcProject.getProjectNumber(),  yearList.size());
+            //已完成
+            cmcProject.setIsComplete("1");
+            yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+            completeObject.put(cmcProject.getProjectNumber(), yearList.size());
+            cmcProject.setIsComplete(null);
+            //已归档
+            CmcArchive cmcArchive = new CmcArchive();
+            cmcArchive.setProjectNumber(cmcProject.getProjectNumber());
+            cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse(cmcProject.getProjectNumber() + "-01-01"));
+            List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
+            archiveObject.put(cmcProject.getProjectNumber(), archiveList.size());
+            //已结算
+            CmcSettle cmcSettle = new CmcSettle();
+            cmcSettle.setProjectNumber(cmcProject.getProjectNumber());
+            cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse(cmcProject.getProjectNumber() + "-01-01"));
+            List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
+            settleObject.put(cmcProject.getProjectNumber(), settleList.size());
+            
             getProjectSourceStatistic(cmcProject, sourceObject);
             getProjectTypeStatistic(cmcProject, typeObject);
             getProjectDeptStatistic(cmcProject, deptObject);
-            getProjectCompleteStatistic(cmcProject, completeObject);
         }
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
         deptArray.add(deptObject);
         typeArray.add(typeObject);
         completeArray.add(completeObject);
+        archiveArray.add(archiveObject);
+        settleArray.add(settleObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("source", sourceArray);
         jsonObject.put("dept", deptArray);
         jsonObject.put("type", typeArray);
         jsonObject.put("complete", completeArray);
+        jsonObject.put("archive", archiveArray);
+        jsonObject.put("settle", settleArray);
         return success(jsonObject);
     }
 
@@ -335,11 +385,4 @@ public class CmcProjectController extends BaseController
         cmcProject.setUndertakingDept(null);
     }
 
-    //项目完成数量
-    public void getProjectCompleteStatistic(CmcProject cmcProject, JSONObject completeObject) {
-        cmcProject.setIsComplete("1");
-        List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
-        completeObject.put("已完成",completeList.size());
-    }
-
 }

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

@@ -133,6 +133,15 @@ public class CmcArchive extends BaseEntity
     {
         return projectId;
     }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
     public void setProject(CmcProject project)
     {
         this.project = project;

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

@@ -199,6 +199,15 @@ public class CmcSettle extends BaseEntity
     {
         return projectId;
     }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
     public void setProject(CmcProject project)
     {
         this.project = project;

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcArchive" id="CmcArchiveResult">
         <result property="archiveId"    column="archive_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
         <result property="projectLeader"    column="project_leader"    />
         <result property="submitTime"    column="submit_time"    />
         <result property="submitSituation"    column="submit_situation"    />
@@ -79,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcArchiveVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectLeader != null  and projectLeader != ''"> and a.project_leader = #{projectLeader}</if>
             <if test="submitTime != null "> and a.submit_time = #{submitTime}</if>
             <if test="submitSituation != null  and submitSituation != ''"> and a.submit_situation = #{submitSituation}</if>
@@ -90,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityTime != null "> and a.quality_time = #{qualityTime}</if>
             <if test="produceTime != null "> and a.produce_time = #{produceTime}</if>
             <if test="deptTime != null "> and a.dept_time = #{deptTime}</if>
-            <if test="archiveTime != null "> and a.archive_time = #{archiveTime}</if>
+            <if test="archiveTime != null "> and YEAR(a.archive_time) = YEAR(#{archiveTime})</if>
             <if test="produceComment != null  and produceComment != ''"> and a.produce_comment = #{produceComment}</if>
             <if test="qualityComment != null  and qualityComment != ''"> and a.quality_comment = #{qualityComment}</if>
             <if test="deptComment != null  and deptComment != ''"> and a.dept_comment = #{deptComment}</if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcSettle" id="CmcSettleResult">
         <result property="settleId"    column="settle_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
         <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="reportDept"    column="report_dept"    />
         <result property="xmName"    column="xm_name"    />
@@ -114,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
             <if test="reportDept != null  and reportDept != ''"> and s.report_dept = #{reportDept}</if>
             <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
@@ -134,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null "> and s.manager_time = #{managerTime}</if>
             <if test="managerComment != null  and managerComment != ''"> and s.manager_comment = #{managerComment}</if>
             <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
-            <if test="gmTime != null "> and s.gm_time = #{gmTime}</if>
+            <if test="gmTime != null "> and YEAR(s.gm_time) = YEAR(#{gmTime})</if>
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
         order by s.report_time desc