累计完成采购--年

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

@@ -585,22 +585,26 @@
 
     <select id="selectPurchaseTaskFinishYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(a.demand_id) countNum,
-        ifnull(sum(a.evaluation), 0) evaluation,
-        year(a.up_acceptance_time) yy,
-        ifnull(sum(b.contract_amount), 0) contractAmount
-        from (
-        select evaluation, up_acceptance_time, demand_id
-        from pm_demand
+        select count(de.num) countNum,
+        de.evaluationTotal evaluation,
+        year(c.up_acceptance_time) yy,
+        ifnull(sum(c.contract_amount), 0) contractAmount
+        FROM (SELECT ifnull(sum(c.contract_amount), 0) contract_amount,d.up_acceptance_time
+        FROM pm_demand d
+        left join pm_contract_info c
+        on d.demand_id = c.demand_id
+        <include refid="dDeptListOrDemandIdAll"/>
+        d.project_status in (19,20,21)
+        AND YEAR(d.up_acceptance_time) = YEAR(NOW())
+        group by year(d.up_acceptance_time)) c
+        LEFT JOIN
+        (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal,up_acceptance_time FROM
+        pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status in (19,20,21)
-        and up_acceptance_time!=null
-        ) a
-        left join (
-        select contract_amount, demand_id
-        from pm_contract_info
-        ) b on a.demand_id = b.demand_id
-        group by year(a.up_acceptance_time)
+        project_status in (19,20,21) AND YEAR(up_acceptance_time) = YEAR(NOW())
+        group by year(up_acceptance_time)) de
+        ON c.up_acceptance_time=de.up_acceptance_time
+
     </select>
 
     <select id="selectPurchaseTaskFinishQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"