Merge branch 'master' into log

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

@@ -56,7 +56,7 @@
         select count(demand_id) countQNWC, ifnull(sum(evaluation), 0) evaluationQNWC
         from pm_demand
         where purchase_dept_id = #{purchaseDeptId}
-          AND project_status != '17'
+          AND project_status = '17'
           and year(plan_demand_sub_time) = year(NOW()) - 1
     </select>