DeBugDeBugDeBug

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandReqVo.java

@@ -44,6 +44,12 @@ public class PmDemandReqVo extends PageVo {
     @ApiModelProperty("采购服务站")
     private String purchaseServices;
 
+    /**
+     * 采购服务站
+     */
+    @ApiModelProperty("采购方式")
+    private String purchaseMode;
+
 
     /**
      * 项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成)

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

@@ -81,7 +81,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
      *
      * @return
      */
-    List<StatisticalChartsResVo> countByPurchaseMode(@Param("vo") PmDemandReqVo pmDemandReqVo);
+    StatisticalChartsResVo countByPurchaseMode(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**
      * 按照概算金额统计所有的项目
@@ -289,7 +289,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
     /**
      * @return
      */
-    List<StatisticalChartsResVo> countEveryStatusNum(@Param("vo") PmDemandReqVo pmDemandReqVo);
+    StatisticalChartsResVo countEveryStatusNum(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**
      * 通过计划ID查询项目

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

@@ -1087,11 +1087,11 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 baseExpert.setUpdated(pmBaseExpertFillReqVo.getUpdateBy());
                 baseExpert.setUpdateTime(now);
             }
-            if(ObjectUtils.isEmpty(baseExpert.getId())){
+            if (ObjectUtils.isEmpty(baseExpert.getId())) {
                 LambdaQueryWrapper<BaseExpert> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper.eq(BaseExpert::getIdNumber,baseExpert.getIdNumber());
+                lambdaQueryWrapper.eq(BaseExpert::getIdNumber, baseExpert.getIdNumber());
                 BaseExpert baseExpert1 = baseExpertService.getOne(lambdaQueryWrapper);
-                if(!ObjectUtils.isEmpty(baseExpert1)){
+                if (!ObjectUtils.isEmpty(baseExpert1)) {
                     baseExpert.setId(baseExpert1.getId());
                 }
             }
@@ -2065,15 +2065,33 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         } else {
             pmDemandReqVo.setDemandIdAll(isQueryZD(pmDemandReqVo.getPurchaseDeptId()));
         }
-        List<StatisticalChartsResVo> resVos = pmDemandMapper.countByPurchaseMode(pmDemandReqVo);
-        for (StatisticalChartsResVo chartsResVo : resVos) {
-            for (ProcurementMethodSuggest value : ProcurementMethodSuggest.values()) {
-                if (value.getCode().equals(chartsResVo.getColumnName())) {
-                    chartsResVo.setColumnName(value.getInfo());
-                    break;
-                }
-            }
-        }
+        List<StatisticalChartsResVo> resVos = new ArrayList<>();
+        //公开招标
+        pmDemandReqVo.setPurchaseMode(ProcurementMethodSuggest.OPEN_BIDDING.getCode());
+        StatisticalChartsResVo chartsR = pmDemandMapper.countByPurchaseMode(pmDemandReqVo);
+        chartsR.setColumnName("公开招标");
+        resVos.add(chartsR);
+        //邀请招标
+        pmDemandReqVo.setPurchaseMode(ProcurementMethodSuggest.SELECTED_BIDDING.getCode());
+        StatisticalChartsResVo chartsR1 = pmDemandMapper.countByPurchaseMode(pmDemandReqVo);
+        chartsR1.setColumnName("邀请招标");
+        resVos.add(chartsR1);
+        //竞争性谈判
+        pmDemandReqVo.setPurchaseMode(ProcurementMethodSuggest.COMPETITIVE_NEGOTIATION.getCode());
+        StatisticalChartsResVo chartsR2 = pmDemandMapper.countByPurchaseMode(pmDemandReqVo);
+        chartsR2.setColumnName("竞争性谈判");
+        resVos.add(chartsR2);
+        //询价
+        pmDemandReqVo.setPurchaseMode(ProcurementMethodSuggest.ENQUIRY.getCode());
+        StatisticalChartsResVo chartsR3 = pmDemandMapper.countByPurchaseMode(pmDemandReqVo);
+        chartsR3.setColumnName("询价");
+        resVos.add(chartsR3);
+        //单一来源
+        pmDemandReqVo.setPurchaseMode(ProcurementMethodSuggest.SINGLE_SOURCE.getCode());
+        StatisticalChartsResVo chartsR4 = pmDemandMapper.countByPurchaseMode(pmDemandReqVo);
+        chartsR4.setColumnName("单一来源");
+        resVos.add(chartsR4);
+
         return resVos;
     }
 
@@ -2240,7 +2258,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Override
     public AjaxResult countEveryStatusNum(PmDemandReqVo pmDemandReqVo) {
-        //指项目进行到各个阶段的数量
         //阶段包括：采购需求对接,专家意见反馈,采购文件编制审核,采购公告发布,标前质疑投诉,待开标,评标结果公告,流废标处置,标后质疑
         //是-1就是查询自己及子孙级以下，否则只查询指定部门
         if (pmDemandReqVo.getPurchaseDeptId().equals(-1)) {
@@ -2248,42 +2265,54 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         } else {
             pmDemandReqVo.setDemandIdAll(isQueryZD(pmDemandReqVo.getPurchaseDeptId()));
         }
-        List<StatisticalChartsResVo> everyStatusNum = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
-        if (!ObjectUtils.isEmpty(everyStatusNum) && everyStatusNum.size() > 0) {
-            for (StatisticalChartsResVo vo : everyStatusNum) {
-                switch (vo.getColumnName()) {
-                    case "9":
-                        vo.setColumnName(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getInfo());
-                        break;
-                    case "10":
-                        vo.setColumnName(PmProjectStatus.EXPERT_FEEDBACK.getInfo());
-                        break;
-                    case "11":
-                        vo.setColumnName(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getInfo());
-                        break;
-                    case "12":
-                        vo.setColumnName(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getInfo());
-                        break;
-                    case "13":
-                        vo.setColumnName(PmProjectStatus.PRE_BID_QUERY.getInfo());
-                        break;
-                    case "14":
-                        vo.setColumnName(PmProjectStatus.WAIT_OPEN_BID.getInfo());
-                        break;
-                    case "15":
-                        vo.setColumnName(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getInfo());
-                        break;
-                    case "16":
-                        vo.setColumnName(PmProjectStatus.WASTE_BID_HANDLE.getInfo());
-                        break;
-                    case "17":
-                        vo.setColumnName(PmProjectStatus.POST_BID_QUERY.getInfo());
-                        break;
-                    default: {
-                    }
-                }
-            }
-        }
+        List<StatisticalChartsResVo> everyStatusNum = new ArrayList<>();
+
+        //项目进行到各个阶段的数量
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode()));
+        StatisticalChartsResVo everyStatusNum9 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum9.setColumnName(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getInfo());
+        everyStatusNum.add(everyStatusNum9);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.EXPERT_FEEDBACK.getCode()));
+        StatisticalChartsResVo everyStatusNum10 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum10.setColumnName(PmProjectStatus.EXPERT_FEEDBACK.getInfo());
+        everyStatusNum.add(everyStatusNum10);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode()));
+        StatisticalChartsResVo everyStatusNum11 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum11.setColumnName(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getInfo());
+        everyStatusNum.add(everyStatusNum11);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode()));
+        StatisticalChartsResVo everyStatusNum12 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum12.setColumnName(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getInfo());
+        everyStatusNum.add(everyStatusNum12);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.PRE_BID_QUERY.getCode()));
+        StatisticalChartsResVo everyStatusNum13 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum13.setColumnName(PmProjectStatus.PRE_BID_QUERY.getInfo());
+        everyStatusNum.add(everyStatusNum13);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WAIT_OPEN_BID.getCode()));
+        StatisticalChartsResVo everyStatusNum14 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum14.setColumnName(PmProjectStatus.WAIT_OPEN_BID.getInfo());
+        everyStatusNum.add(everyStatusNum14);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode()));
+        StatisticalChartsResVo everyStatusNum15 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum15.setColumnName(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getInfo());
+        everyStatusNum.add(everyStatusNum15);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_HANDLE.getCode()));
+        StatisticalChartsResVo everyStatusNum16 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum16.setColumnName(PmProjectStatus.WASTE_BID_HANDLE.getInfo());
+        everyStatusNum.add(everyStatusNum16);
+
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.POST_BID_QUERY.getCode()));
+        StatisticalChartsResVo everyStatusNum17 = pmDemandMapper.countEveryStatusNum(pmDemandReqVo);
+        everyStatusNum17.setColumnName(PmProjectStatus.POST_BID_QUERY.getInfo());
+        everyStatusNum.add(everyStatusNum17);
+
         return AjaxResult.success(everyStatusNum);
     }
 

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

@@ -102,9 +102,9 @@
         SELECT purchase_mode columnName, ifnull(COUNT(demand_id), 0) num, ifnull(sum(evaluation), 0) evaluationTotal
         FROM `pm_demand`
         <if test="(vo.deptList != null and vo.deptList.size != 0) or (vo.demandIdAll != null and vo.demandIdAll.size != 0)">
-            <include refid="deptListOrDemandIdAllNoAnd"/>
+            <include refid="deptListOrDemandIdAll"/>
         </if>
-        GROUP BY purchase_mode
+        AND purchase_mode=#{purchaseMode}
     </select>
 
     <select id="countByEvaluationLt" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
@@ -377,9 +377,8 @@
         SELECT project_status columnName, ifnull(COUNT(demand_id), 0) num, ifnull(sum(evaluation), 0) evaluationTotal
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
-        `project_status` IN (9, 10, 11, 12, 13, 14,15,16,17)
-        and YEAR(create_time) = YEAR(NOW())
-        GROUP BY project_status
+        YEAR(create_time) = YEAR(NOW())
+        and `project_status`=#{projectStatus}
     </select>