累计完成采购--年

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

@@ -594,14 +594,14 @@
         left join pm_contract_info c
         on d.demand_id = c.demand_id
         <include refid="dDeptListOrDemandIdAll"/>
-        d.project_status in (19,20,21)
+        d.project_status in (19,20,21) and d.up_acceptance_time is not null
         group by YEAR(d.up_acceptance_time)) c
         LEFT JOIN
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal,YEAR(up_acceptance_time) yy
         FROM
         pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status in (19,20,21)
+        project_status in (19,20,21) and up_acceptance_time is not null
         group by YEAR(up_acceptance_time)) de
         ON c.yy=de.yy