项目完成、归档、结算情况统计

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

@@ -177,23 +177,23 @@ public class CmcProjectController extends BaseController
                 yearObject.put(String.valueOf(i), yearList.size());
                 //已完成
                 cmcProject.setIsComplete("1");
-                yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
-                completeObject.put(String.valueOf(i), yearList.size());
+                List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+                completeObject.put(cmcProject.getProjectNumber(), completeList.size());
+                cmcProject.setIsComplete(null);
                 //已归档
                 CmcArchive cmcArchive = new CmcArchive();
                 cmcArchive.setProjectNumber(String.valueOf(i));
-                cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
                 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)));
+                cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
                 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);
@@ -207,22 +207,22 @@ public class CmcProjectController extends BaseController
             yearObject.put(cmcProject.getProjectNumber(),  yearList.size());
             //已完成
             cmcProject.setIsComplete("1");
-            yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
-            completeObject.put(cmcProject.getProjectNumber(), yearList.size());
+            List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+            completeObject.put(cmcProject.getProjectNumber(), completeList.size());
             cmcProject.setIsComplete(null);
             //已归档
             CmcArchive cmcArchive = new CmcArchive();
             cmcArchive.setProjectNumber(cmcProject.getProjectNumber());
-            cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse(cmcProject.getProjectNumber() + "-01-01"));
+            cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-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"));
+            cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
             List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
             settleObject.put(cmcProject.getProjectNumber(), settleList.size());
-            
+
             getProjectSourceStatistic(cmcProject, sourceObject);
             getProjectTypeStatistic(cmcProject, typeObject);
             getProjectDeptStatistic(cmcProject, deptObject);

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

@@ -78,7 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcArchiveList" parameterType="CmcArchive" resultMap="CmcArchiveResult">
         <include refid="selectCmcArchiveVo"/>
-        <where>  
+        <where>
+            (case YEAR(#{archiveTime}) when 2000 then a.archive_time is not null
+            end)
             <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>
@@ -92,7 +94,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 YEAR(a.archive_time) = YEAR(#{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

@@ -113,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         <where>
+            (case YEAR(#{gmTime}) when 2000 then s.gm_time is not null
+            end)
             <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>
@@ -136,7 +138,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 YEAR(s.gm_time) = YEAR(#{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