已完成项目统计

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

@@ -155,6 +155,8 @@ public class CmcProjectController extends BaseController
         JSONObject typeObject = new JSONObject();
         JSONArray deptArray = new JSONArray();
         JSONObject deptObject = new JSONObject();
+        JSONArray completeArray = new JSONArray();
+        JSONObject completeObject = new JSONObject();
         //整体
         if (cmcProject.getProjectNumber() == null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
             //每年项目数量
@@ -167,7 +169,7 @@ public class CmcProjectController extends BaseController
             getProjectSourceStatistic(cmcProject, sourceObject);
             getProjectTypeStatistic(cmcProject, typeObject);
             getProjectDeptStatistic(cmcProject, deptObject);
-
+            getProjectCompleteStatistic(cmcProject, completeObject);
 
         }
         //年度
@@ -177,15 +179,18 @@ public class CmcProjectController extends BaseController
             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);
         jsonObject.put("year", yearArray);
         jsonObject.put("source", sourceArray);
         jsonObject.put("dept", deptArray);
         jsonObject.put("type", typeArray);
+        jsonObject.put("complete", completeArray);
         return success(jsonObject);
     }
 
@@ -331,8 +336,10 @@ public class CmcProjectController extends BaseController
     }
 
     //项目完成数量
-    public void getProjectCompleteStatistic(CmcProject cmcProject, JSONObject deptObject) {
-        List<CmcProject> deptList = cmcProjectService.selectCmcProjectList(cmcProject);
+    public void getProjectCompleteStatistic(CmcProject cmcProject, JSONObject completeObject) {
+        cmcProject.setIsComplete("1");
+        List<CmcProject> completeList = cmcProjectService.selectCmcAllProjectList(cmcProject);
+        completeObject.put("已完成",completeList.size());
     }
 
 }

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

@@ -4,6 +4,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +37,9 @@ public class CmcProjectProgressController extends BaseController
     @Autowired
     private ICmcProjectProgressService cmcProjectProgressService;
 
+    @Autowired
+    private ICmcProjectService cmcProjectService;
+
     /**
      * 查询cmc项目进度列表
      */
@@ -74,6 +79,13 @@ public class CmcProjectProgressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
     {
+        //如100%进度，则表示已完成；当项目流转流程结束，项目状态才结束
+        //忽略从100调整到100以下，已完成状态未及时变为未完成的情况；如果考虑此情况，将导致每次执行都会产生修改项目表操作记录，意义不大，且占数据库资源
+        if (cmcProjectProgress.getPercentage().equals("100")) {
+            CmcProject cmcProject = new CmcProject();
+            cmcProject.setIsComplete("1");
+            cmcProjectService.updateCmcProject(cmcProject);
+        }
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
     }
 

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

@@ -50,6 +50,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "项目状态", readConverterExp = "0=进行中,1=已结束")
     private String isFinished;
 
+    /** 完成情况（0进行中、1已完成） */
+    @Excel(name = "完成情况", readConverterExp = "0=进行中,1=已完成")
+    private String isComplete;
+
     /** 项目来源（0院内、1院外） */
     @Excel(name = "项目来源", readConverterExp = "0=院内,1=院外")
     private String projectSource;
@@ -249,6 +253,15 @@ public class CmcProject extends BaseEntity
     {
         return isFinished;
     }
+    public void setIsComplete(String isComplete)
+    {
+        this.isComplete = isComplete;
+    }
+
+    public String getIsComplete()
+    {
+        return isComplete;
+    }
     public void setProjectSource(String projectSource)
     {
         this.projectSource = projectSource;

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

@@ -10,6 +10,7 @@
         <result property="projectName"    column="project_name"    />
         <result property="projectLeader"    column="project_leader"    />
         <result property="isFinished"    column="is_finished"    />
+        <result property="isComplete"    column="is_complete"    />
         <result property="projectSource"    column="project_source"    />
         <result property="partyAId"    column="party_a_id"    />
         <result property="contactPerson"    column="contact_person"    />
@@ -96,7 +97,7 @@
 
     <sql id="selectCmcProjectVo">
         select distinct(p.project_id), p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
-               p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
+               p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time, p.is_complete,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
                p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as designer_nick_name, u4.nick_name as planner_nick_name,
                u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept, pc.contract_id, c.contract_number, c.contract_code, c.contract_name from cmc_project as p
@@ -125,6 +126,7 @@
             <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>
@@ -154,6 +156,7 @@
             <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>
@@ -182,6 +185,7 @@
             <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>
@@ -221,6 +225,7 @@
             <if test="projectName != null">project_name,</if>
             <if test="projectLeader != null">project_leader,</if>
             <if test="isFinished != null">is_finished,</if>
+            <if test="isComplete != null">is_complete,</if>
             <if test="projectSource != null">project_source,</if>
             <if test="partyAId != null">party_a_id,</if>
             <if test="contactPerson != null">contact_person,</if>
@@ -259,6 +264,7 @@
             <if test="projectName != null">#{projectName},</if>
             <if test="projectLeader != null">#{projectLeader},</if>
             <if test="isFinished != null">#{isFinished},</if>
+            <if test="isComplete != null">#{isComplete},</if>
             <if test="projectSource != null">#{projectSource},</if>
             <if test="partyAId != null">#{partyAId},</if>
             <if test="contactPerson != null">#{contactPerson},</if>
@@ -300,6 +306,7 @@
             <if test="projectName != null">project_name = #{projectName},</if>
             <if test="projectLeader != null">project_leader = #{projectLeader},</if>
             <if test="isFinished != null">is_finished = #{isFinished},</if>
+            <if test="isComplete != null">is_complete = #{isComplete},</if>
             <if test="projectSource != null">project_source = #{projectSource},</if>
             <if test="partyAId != null">party_a_id = #{partyAId},</if>
             <if test="contactPerson != null">contact_person = #{contactPerson},</if>