统计分析

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -406,14 +406,6 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
      */
     Map<String, Object> purchaseProjectDistribution(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
-    /**
-     * 各阶段项目数量分布
-     *
-     * @param pmDemandReqVo
-     * @return
-     */
-    Map<String, String> purchaseProjectDistributionTo(@Param("vo") PmDemandReqVo pmDemandReqVo);
-
     /**
      * 项目数量分析--年
      *

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandService.java

@@ -308,14 +308,6 @@ public interface IPmDemandService extends IService<PmDemand> {
      */
     List<Map<String, Integer>> purchaseTaskFinish(PmDemandReqVo pmDemandReqVo);
 
-    /**
-     * 各阶段项目数量分布
-     *
-     * @param pmDemandReqVo
-     * @return
-     */
-    List<Map<String, String>> purchaseProjectDistribution(PmDemandReqVo pmDemandReqVo);
-
     /**
      * 项目数量分析
      *

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2629,75 +2629,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         return mapReturn;
     }
 
-    /**
-     * 各阶段项目数量分布
-     *
-     * @param pmDemandReqVo
-     * @return
-     */
-    @Override
-    public List<Map<String, String>> purchaseProjectDistribution(PmDemandReqVo pmDemandReqVo) {
-        //是-1就是查询自己及子孙级以下，否则只查询指定部门
-        pmDemandReqVo.setDeptList(isQueryAll(pmDemandReqVo.getPurchaseDeptId()));
-        // 项目计划 4之前（包括4）
-        List<String> xmjh = new ArrayList<>();
-        xmjh.add("4");
-        pmDemandReqVo.setProjectStatusList(xmjh);
-        Map<String, String> returnMapxmjh = pmDemandMapper.purchaseProjectDistributionTo(pmDemandReqVo);
-        returnMapxmjh.put("name", "计划管理");
-        // 需求建党 4之后（不包括4）
-        List<String> xqjd = new ArrayList<>();
-        xqjd.add("5");
-        xqjd.add("6");
-        xqjd.add("7");
-        xqjd.add("8");
-        xqjd.add("18");
-        pmDemandReqVo.setProjectStatusList(xqjd);
-        Map<String, String> returnMapxqjd = pmDemandMapper.purchaseProjectDistributionTo(pmDemandReqVo);
-        returnMapxqjd.put("name", "需求管理");
-        // 任务下达 8之后（不包括8）
-        List<String> rwxd = new ArrayList<>();
-        rwxd.add("9");
-        pmDemandReqVo.setProjectStatusList(rwxd);
-        Map<String, String> returnMaprwxd = pmDemandMapper.purchaseProjectDistributionTo(pmDemandReqVo);
-        returnMaprwxd.put("name", "任务下达");
-        // 采购执行 9之后（不包括9）
-        List<String> cgzx = new ArrayList<>();
-        cgzx.add("10");
-        cgzx.add("11");
-        cgzx.add("12");
-        cgzx.add("13");
-        cgzx.add("14");
-        cgzx.add("15");
-        cgzx.add("16");
-        cgzx.add("17");
-        cgzx.add("19");
-        pmDemandReqVo.setProjectStatusList(cgzx);
-        Map<String, String> returnMapcgzx = pmDemandMapper.purchaseProjectDistributionTo(pmDemandReqVo);
-        returnMapcgzx.put("name", "采购执行");
-        // 合同管理 19之后（不包括19）
-        List<String> htxx = new ArrayList<>();
-        htxx.add("20");
-        pmDemandReqVo.setProjectStatusList(htxx);
-        Map<String, String> returnMaphtxx = pmDemandMapper.purchaseProjectDistributionTo(pmDemandReqVo);
-        returnMaphtxx.put("name", "合同管理");
-        // 项目建设 21
-        List<String> xmjs = new ArrayList<>();
-        xmjs.add("21");
-        pmDemandReqVo.setProjectStatusList(xmjs);
-        Map<String, String> returnMapxmjs = pmDemandMapper.purchaseProjectDistributionTo(pmDemandReqVo);
-        returnMapxmjs.put("name", "项目建设");
-
-        List<Map<String, String>> returnMap = new ArrayList<>();
-        returnMap.add(returnMapxmjh);
-        returnMap.add(returnMapxqjd);
-        returnMap.add(returnMaprwxd);
-        returnMap.add(returnMapcgzx);
-        returnMap.add(returnMaphtxx);
-        returnMap.add(returnMapxmjs);
-        return returnMap;
-    }
-
     /**
      * 项目数量分析---------年度的同比和环比不展示-----------
      *

purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -634,20 +634,6 @@
         </if>
     </select>
 
-    <select id="purchaseProjectDistributionTo" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
-            resultType="java.util.Map">
-        select ifnull(count(demand_id), 0) countNumber,ifnull(sum(evaluation), 0) evaluationTotal
-        from pm_demand
-        <include refid="deptListOrDemandIdAllNoAnd"/>
-        <if test="vo.projectStatusList!=null and vo.projectStatusList.size != 0">
-            AND project_status in
-            <foreach collection="vo.projectStatusList" item="item" index="index"
-                     separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-    </select>
-
     <select id="purchaseProjectNumberAnalysisYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
         select ifnull(COUNT(demand_id), 0) countNum, ifnull(sum(evaluation), 0) evaluationSum, year(create_time) yy