Merge branch 'master' into prod

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

@@ -587,21 +587,23 @@
             resultType="java.util.Map">
         select 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
+        c.yy,
+        c.contract_amount contractAmount
+        FROM (SELECT ifnull(sum(c.contract_amount), 0) contract_amount,YEAR(d.up_acceptance_time) yy
         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())) c
+        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,up_acceptance_time FROM
+        (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) AND YEAR(up_acceptance_time) = YEAR(NOW())) de
-        ON c.up_acceptance_time=de.up_acceptance_time
+        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
 
     </select>