项目类型列表

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

@@ -56,7 +56,7 @@ public class CmcContractController extends BaseController
     }
 
     /**
-     * 获取cmc合同统计信息
+     * 获取cmc承接合同统计信息
      */
     @GetMapping("/statistic")
     public AjaxResult getContractStatistic(CmcContract cmcContract) throws ParseException {
@@ -80,49 +80,20 @@ public class CmcContractController extends BaseController
                     amount = amount.add(contract.getAmount());
                 }
                 amountObject.put(String.valueOf(i), amount);
+
             }
             cmcContract.setSignDate(null);
-            cmcContract.setProjectSource("1");
-            List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
-            BigDecimal cAmount = new BigDecimal(0);
-            BigDecimal wAmount = new BigDecimal(0);
-            for (CmcContract contract : sourceList) {
-                wAmount = wAmount.add(contract.getAmount());
-            }
-            sourceObject.put("市场", sourceList.size());
-            cwAmountObject.put("市场", wAmount);
-            cmcContract.setProjectSource("0");
-            sourceList = cmcContractService.selectCmcContractList(cmcContract);
-            for (CmcContract contract : sourceList) {
-                cAmount = cAmount.add(contract.getAmount());
-            }
-            sourceObject.put("院内", sourceList.size());
-            cwAmountObject.put("院内", cAmount);
+            getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject);
         }
         else {
-            List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
-            yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), yearList.size());
+            //输入年份合同数量及金额
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), cmcContractService.selectCmcContractList(cmcContract).size());
             BigDecimal amount = new BigDecimal(0);
-            for (CmcContract contract : yearList) {
+            for (CmcContract contract : cmcContractService.selectCmcContractList(cmcContract)) {
                 amount = amount.add(contract.getAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), amount);
-            cmcContract.setProjectSource("1");
-            List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
-            BigDecimal cAmount = new BigDecimal(0);
-            BigDecimal wAmount = new BigDecimal(0);
-            for (CmcContract contract : sourceList) {
-                wAmount = wAmount.add(contract.getAmount());
-            }
-            sourceObject.put("市场", sourceList.size());
-            cwAmountObject.put("市场", wAmount);
-            cmcContract.setProjectSource("0");
-            sourceList = cmcContractService.selectCmcContractList(cmcContract);
-            for (CmcContract contract : sourceList) {
-                cAmount = cAmount.add(contract.getAmount());
-            }
-            sourceObject.put("院内", sourceList.size());
-            cwAmountObject.put("院内", cAmount);
+            getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject);
         }
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
@@ -191,4 +162,26 @@ public class CmcContractController extends BaseController
     {
         return success(cmcContractService.deleteCmcContractByContractIds(contractIds));
     }
+
+    //院内外项目数量及金额
+    public void getProjectSourceStatistic(CmcContract cmcContract, JSONObject sourceObject, JSONObject cwAmountObject) {
+        cmcContract.setProjectSource("1");
+        List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        BigDecimal cAmount = new BigDecimal(0);
+        BigDecimal wAmount = new BigDecimal(0);
+        for (CmcContract contract : sourceList) {
+            wAmount = wAmount.add(contract.getAmount());
+        }
+        sourceObject.put("院外", sourceList.size());
+        cwAmountObject.put("院外", wAmount);
+        cmcContract.setProjectSource("0");
+        sourceList = cmcContractService.selectCmcContractList(cmcContract);
+        for (CmcContract contract : sourceList) {
+            cAmount = cAmount.add(contract.getAmount());
+        }
+        sourceObject.put("院内", sourceList.size());
+        cwAmountObject.put("院内", cAmount);
+        cmcContract.setProjectSource(null);
+    }
+
 }

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

@@ -118,12 +118,28 @@ public class CmcProjectController extends BaseController
     @GetMapping("/projectNumber")
     public AjaxResult getProjectNumberByYear(CmcProject cmcProject)
     {
-        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(cmcProject);
         String number = list.get(0).getProjectNumber().substring(5);
         String projectNumber = cmcProject.getProjectNumber() + (Integer.parseInt(number) + 1);
         return success(projectNumber);
     }
 
+    /**
+     * 项目类型列表
+     */
+    @GetMapping("/projectType")
+    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())));
+        projectType.forEach((k, v) -> {
+            if (k != Optional.empty())
+                typeList.add(k.toString().substring(k.toString().indexOf("[") + 1, k.toString().indexOf("]")));
+        });
+        Collections.sort(typeList);
+        return success(typeList);
+    }
+
     /**
      * 获取cmc项目统计信息
      */
@@ -144,65 +160,23 @@ public class CmcProjectController extends BaseController
             //每年项目数量
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 cmcProject.setProjectNumber(String.valueOf(i));
-                List<CmcProject> yearList = cmcProjectService.selectCmcProjectList(cmcProject);
+                List<CmcProject> yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
                 yearObject.put(String.valueOf(i), yearList.size());
             }
-            //院内外项目数量
             cmcProject.setProjectNumber(null);
-            cmcProject.setProjectSource("1");
-            sourceObject.put("市场", cmcProjectService.selectCmcProjectList(cmcProject).size());
-            cmcProject.setProjectSource("0");
-            sourceObject.put("院内", cmcProjectService.selectCmcProjectList(cmcProject).size());
-            //各类型项目数量
-            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 -> {
-                if (item.getKey() != Optional.empty()) {
-                    String str = item.getKey().toString();
-                    typeObject.put(str.substring(str.indexOf("[") + 1, str.indexOf("]")), item.getValue().size());
-                }
-            });
-            //各承担部门项目数量
-            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());
-            }
+            getProjectSourceStatistic(cmcProject, sourceObject);
+            getProjectTypeStatistic(cmcProject, typeObject);
+            getProjectDeptStatistic(cmcProject, deptObject);
+
+
         }
         //年度
         else if (cmcProject.getProjectNumber() != null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
             //输入年份项目数量
-            yearObject.put(cmcProject.getProjectNumber(), cmcProjectService.selectCmcProjectList(cmcProject).size());
-            //输入年份院内外项目数量
-            cmcProject.setProjectSource("1");
-            sourceObject.put("市场", cmcProjectService.selectCmcProjectList(cmcProject).size());
-            cmcProject.setProjectSource("0");
-            sourceObject.put("院内", cmcProjectService.selectCmcProjectList(cmcProject).size());
-            //输入年份各类型项目数量
-            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 -> {
-                if (item.getKey() != Optional.empty()) {
-                    String str = item.getKey().toString();
-                    typeObject.put(str.substring(str.indexOf("[") + 1, str.indexOf("]")), item.getValue().size());
-                }
-            });
-            //输入年份各承担部门项目数量
-            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());
-            }
+            yearObject.put(cmcProject.getProjectNumber(),  cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+            getProjectSourceStatistic(cmcProject, sourceObject);
+            getProjectTypeStatistic(cmcProject, typeObject);
+            getProjectDeptStatistic(cmcProject, deptObject);
         }
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
@@ -310,7 +284,7 @@ public class CmcProjectController extends BaseController
         return cmcProject.getQualityInspectorName();
     }
 
-    public  List<SysUser> getManageId(String deptId, String partyAId) {
+    public List<SysUser> getManageId(String deptId, String partyAId) {
         List<SysUser> userList = new ArrayList<>();
         CmcManageDept cmcManageDept = new CmcManageDept();
         cmcManageDept.setDeptId(deptId);
@@ -321,5 +295,44 @@ public class CmcProjectController extends BaseController
         return userList;
     }
 
+    //院内外项目数量
+    public void getProjectSourceStatistic(CmcProject cmcProject, JSONObject sourceObject) {
+        cmcProject.setProjectSource("1");
+        sourceObject.put("院外", cmcProjectService.selectCmcAllProjectList(cmcProject).size());
+        cmcProject.setProjectSource("0");
+        sourceObject.put("院内", cmcProjectService.selectCmcAllProjectList(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()));
+        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());
+        });
+    }
+
+    //各部门承担项目数量
+    public void getProjectDeptStatistic(CmcProject cmcProject, JSONObject deptObject) {
+        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());
+        }
+        cmcProject.setUndertakingDept(null);
+    }
+
+    //项目完成数量
+    public void getProjectCompleteStatistic(CmcProject cmcProject, JSONObject deptObject) {
+        List<CmcProject> deptList = cmcProjectService.selectCmcProjectList(cmcProject);
+    }
 
 }

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

@@ -1,10 +1,17 @@
 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
+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.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcSubContract;
 import com.ruoyi.oa.domain.CmcPartner;
 import com.ruoyi.oa.service.ICmcPartnerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +45,6 @@ public class CmcSubContractController extends BaseController
     @Autowired
     private ICmcSubContractService cmcSubContractService;
 
-    @Autowired
-    private ICmcPartnerService cmcPartnerService;
-
     /**
      * 查询cmc分包合同评审列表
      */
@@ -73,6 +77,46 @@ public class CmcSubContractController extends BaseController
         return success(cmcSubContractService.selectCmcSubContractBySubContractId(subContractId));
     }
 
+    /**
+     * 获取cmc分包合同统计信息
+     */
+    @GetMapping("/statistic")
+    public AjaxResult getSubContractStatistic(CmcSubContract cmcSubContract) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
+        JSONArray amountArray = new JSONArray();
+        JSONObject amountObject = new JSONObject();
+        //每年合同数量及金额
+        if (cmcSubContract.getSignDate() == null) {
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                cmcSubContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                List<CmcSubContract> yearList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+                yearObject.put(String.valueOf(i), yearList.size());
+                BigDecimal amount = new BigDecimal(0);
+                for (CmcSubContract subContract : yearList) {
+                    amount = amount.add(subContract.getSubAmount());
+                }
+                amountObject.put(String.valueOf(i), amount);
+            }
+        }
+        else {
+            //输入年份合同数量及金额
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), cmcSubContractService.selectCmcSubContractList(cmcSubContract).size());
+            BigDecimal amount = new BigDecimal(0);
+            for (CmcSubContract subContract : cmcSubContractService.selectCmcSubContractList(cmcSubContract)) {
+                amount = amount.add(subContract.getSubAmount());
+            }
+            amountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), amount);
+
+        }
+        yearArray.add(yearObject);
+        amountArray.add(amountObject);
+        jsonObject.put("year", yearArray);
+        jsonObject.put("amount", amountArray);
+        return success(jsonObject);
+    }
+
     /**
      * 新增cmc分包合同评审
      */

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

@@ -28,7 +28,7 @@ public interface CmcProjectMapper
     public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject);
 
     /**
-     * 查询cmc项目列表
+     * 查询cmc测绘项目列表
      * 
      * @param cmcProject cmc项目
      * @return cmc项目集合
@@ -43,6 +43,14 @@ public interface CmcProjectMapper
      */
     public List<CmcProject> selectCmcInvestProjectList(CmcProject cmcProject);
 
+    /**
+     * 查询cmc所有项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcAllProjectList(CmcProject cmcProject);
+
     /**
      * 新增cmc项目
      * 

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

@@ -29,7 +29,7 @@ public interface ICmcProjectService
     public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject);
 
     /**
-     * 查询cmc项目列表
+     * 查询cmc测绘项目列表
      * 
      * @param cmcProject cmc项目
      * @return cmc项目集合
@@ -44,6 +44,14 @@ public interface ICmcProjectService
      */
     public List<CmcProject> selectCmcInvestProjectList(CmcProject cmcProject);
 
+    /**
+     * 查询cmc所有项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目集合
+     */
+    public List<CmcProject> selectCmcAllProjectList(CmcProject cmcProject);
+
     /**
      * 新增cmc项目
      * 

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

@@ -47,7 +47,7 @@ public class CmcProjectServiceImpl implements ICmcProjectService
     }
 
     /**
-     * 查询cmc项目列表
+     * 查询cmc测绘项目列表
      * 
      * @param cmcProject cmc项目
      * @return cmc项目
@@ -70,6 +70,18 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcInvestProjectList(cmcProject);
     }
 
+    /**
+     * 查询cmc所有项目列表
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目
+     */
+    @Override
+    public List<CmcProject> selectCmcAllProjectList(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.selectCmcAllProjectList(cmcProject);
+    }
+
     /**
      * 新增cmc项目
      * 

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

@@ -173,6 +173,34 @@
         order by p.register_time desc, p.project_number desc
     </select>
 
+    <select id="selectCmcAllProjectList" 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="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>
+        </where>
+        group by p.project_id
+        order by p.register_time desc, p.project_number desc
+    </select>
+
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where p.project_id = #{projectId}

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

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contractDocument != null  and contractDocument != ''"> and sc.contract_document = #{contractDocument}</if>
             <if test="drafter != null "> and sc.drafter = #{drafter}</if>
             <if test="draftTime != null "> and sc.draft_time = #{draftTime}</if>
-            <if test="signDate != null "> and sc.sign_date = #{signDate}</if>
+            <if test="signDate != null "> and YEAR(sc.sign_date) = YEAR(#{signDate})</if>
             <if test="signRemark != null  and signRemark != ''"> and sc.sign_remark = #{signRemark}</if>
             <if test="signScan != null  and signScan != ''"> and sc.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and sc.comment_type = #{commentType}</if>