Merge branch 'master' into prod

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

@@ -585,7 +585,7 @@
 
     <select id="selectPurchaseTaskFinishYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(de.num) countNum,
+        select de.num countNum,
         de.evaluationTotal evaluation,
         year(c.up_acceptance_time) yy,
         ifnull(sum(c.contract_amount), 0) contractAmount
@@ -595,56 +595,63 @@
         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
+        AND YEAR(d.up_acceptance_time) = YEAR(NOW())) 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 YEAR(up_acceptance_time) = YEAR(NOW())
-        group by year(up_acceptance_time)) de
+        project_status in (19,20,21) AND YEAR(up_acceptance_time) = YEAR(NOW())) de
         ON c.up_acceptance_time=de.up_acceptance_time
 
     </select>
 
     <select id="selectPurchaseTaskFinishQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select ifnull(sum(a.evaluation), 0) evaluation,
-        quarter(a.up_acceptance_time) yy,
-        ifnull(sum(b.contract_amount), 0) contractAmount
-        from (
-        select evaluation, up_acceptance_time, demand_id
-        from pm_demand
+        select de.num countNum,
+        de.evaluationTotal evaluation,
+        c.yy,
+        c.contractAmount
+        FROM (SELECT ifnull(sum(c.contract_amount), 0) contractAmount, quarter(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())
+        group by quarter(d.up_acceptance_time)) c
+        LEFT JOIN
+        (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal,quarter(up_acceptance_time)
+        yy FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status in (19,20,21)
-        and up_acceptance_time!=null
-        and year(up_acceptance_time) = year(NOW())
-        ) a
-        left join (
-        select contract_amount, demand_id
-        from pm_contract_info
-        ) b on a.demand_id = b.demand_id
-        group by concat(Year(a.up_acceptance_time), quarter(a.up_acceptance_time))
+        project_status in (19,20,21) AND YEAR(up_acceptance_time) = YEAR(NOW())
+        group by quarter(up_acceptance_time)) de
+        ON c.yy=de.yy
+
     </select>
 
     <select id="selectPurchaseTaskFinishMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select ifnull(sum(a.evaluation), 0) evaluation,
-        date_format(up_acceptance_time, '%m') yy,
-        ifnull(sum(b.contract_amount), 0) contractAmount
-        from (
-        select evaluation, up_acceptance_time, demand_id
-        from pm_demand
+        select de.num countNum,
+        de.evaluationTotal evaluation,
+        c.yy,
+        c.contractAmount
+        FROM (SELECT ifnull(sum(c.contract_amount), 0) contractAmount, date_format(d.up_acceptance_time, '%m') 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())
+        group by date_format(d.up_acceptance_time, '%y%m')) c
+        LEFT JOIN
+        (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0)
+        evaluationTotal,date_format(up_acceptance_time, '%m') yy FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status in (19,20,21)
-        and up_acceptance_time!=null
-        and year(up_acceptance_time) = year(NOW())
-        ) a
-        left join (
-        select contract_amount, demand_id
-        from pm_contract_info
-        ) b on a.demand_id = b.demand_id
-        group by date_format(a.up_acceptance_time, '%y%m')
+        project_status in (19,20,21) AND YEAR(up_acceptance_time) = YEAR(NOW())
+        group by date_format(up_acceptance_time, '%y%m')) de
+        ON c.yy=de.yy
+
+
     </select>
 
     <select id="countProjectExceedAndMajor" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"