buzhanyi 2 jaren geleden
bovenliggende
commit
2aca995d8e

+ 2 - 2
purchase-admin/src/main/java/com/ozs/web/controller/statisticalAnalysis/StatisticalAnalysisController.java

@@ -212,8 +212,8 @@ public class StatisticalAnalysisController extends BaseController {
         if (StringUtils.isNull(pmDemandReqVo.getPurchaseDeptId())) {
             return error("登录账号的单位 不能为空!");
         }
-        Map<String, Integer> map = pmDemandService.purchaseProjectExecute(pmDemandReqVo);
-        return success(map);
+        List<StatisticalChartsResVo> resVos = pmDemandService.purchaseProjectExecute(pmDemandReqVo);
+        return success(resVos);
     }
 
     @ApiOperation(value = "已完成项目数量统计")

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

@@ -2373,7 +2373,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         StatisticalChartsResVo mapIncomplete = pmDemandMapper.purchaseProjectExecuteIncomplete(pmDemandReqVo);
         mapIncomplete.setColumnName("未完成采购任务");
         resVos.add(mapIncomplete);
-
         return resVos;
     }
 
@@ -3539,7 +3538,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Override
     public AjaxResult countMajorProjectNumCGB(PmDemandReqVo pmDemandReqVo) {
-        //新增执行滞后采购任务数量分析 所有的超过计划完成采购时间的数据w
+        //新增执行滞后采购任务数量分析 所有的超过计划完成采购时间的数据
 
         return null;
     }