更改统计查询

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

@@ -142,7 +142,7 @@ public class StatisticalAnalysisController extends BaseController {
 
     @ApiOperation(value = "重大规划采购任务专项计划管理情况")
     @PostMapping("/countMajorProject")
-    @PreAuthorize("@ss.hasPermi('statistical:countMajorProject')")
+    //@PreAuthorize("@ss.hasPermi('statistical:countMajorProject')")
     @Log(title = ModularConstans.statisticalAnalysis, businessType = BusinessType.QUERY)
     public AjaxResult countMajorProject(@RequestBody PmDemandReqVo pmDemandReqVo) {
         if (StringUtils.isNull(pmDemandReqVo.getPurchaseDeptId())) {

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

@@ -278,7 +278,7 @@ public interface IPmDemandService extends IService<PmDemand> {
     AjaxResult exceedMarketAnalysis(PmDemandReqVo pmDemandReqVo);
 
     /**
-     * 今年已完成数量
+     * 重大规划采购任务专项计划管理情况
      *
      * @return
      */

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

@@ -205,12 +205,12 @@
     </select>
 
     <select id="countMajorProjectLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
-        SELECT YEAR (NOW()) - 1 columnName, COUNT (demand_id) num, SUM (evaluation) evaluationTotal
+        SELECT YEAR(NOW()) - 1 columnName, COUNT(demand_id) num, SUM(evaluation) evaluationTotal
         FROM `pm_demand`
         WHERE find_in_set('1'
             , project_attr)
           and DATE_FORMAT(create_time
-            , '%Y') = YEAR (NOW()) - 1
+                  , '%Y') = YEAR(NOW()) - 1
     </select>
 
     <select id="countProjectMajorByYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">