buzhanyi 2 лет назад
Родитель
Сommit
e12482cf66

+ 1 - 1
purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -211,7 +211,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
 
     List<StatisticalChartsResVo> countProjectMajorByYear();
 
-    StatisticalChartsResVo countProjectMajorByQuarter(int i, int parseInt);
+    StatisticalChartsResVo countProjectMajorByQuarter(@Param("quarter") Integer quarter, @Param("year") Integer year);
 
     List<StatisticalChartsResVo> countProjectMajorByMonth();
 

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

@@ -270,11 +270,29 @@
 
     <select id="selectpurchaseProjectCompleteNumberMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select ifnull(sum(a.evaluation), 0) evaluation, date_format(plan_demand_sub_time,'%m') yy, ifnull(sum(b.contract_amount), 0) contractAmount from (
-            select evaluation, plan_demand_sub_time, demand_id from pm_demand where project_status = '17' and year(plan_demand_sub_time) = year(NOW())
-        ) a left join (
-            select contract_amount, demand_id from pm_contract_info
+        select ifnull(sum(a.evaluation), 0)            evaluation,
+               date_format(plan_demand_sub_time, '%m') yy,
+               ifnull(sum(b.contract_amount), 0)       contractAmount
+        from (
+                 select evaluation, plan_demand_sub_time, demand_id
+                 from pm_demand
+                 where project_status = '17'
+                   and year(plan_demand_sub_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.plan_demand_sub_time,'%y%m')
+        group by date_format(a.plan_demand_sub_time, '%y%m')
+    </select>
+
+    <select id="countProjectExceedAndMajor" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
+        SELECT COUNT(demand_id) num, SUM(evaluation) evaluationTotal
+        FROM `pm_demand`
+        WHERE (real_demand_commit_time > plan_demand_sub_time
+            or real_purchase_finish_time > plan_purchase_finish_time
+            or real_deliver_time > plan_deliver_time)
+          AND find_in_set('1', project_attr)
+          and DATE_FORMAT(create_time, '%Y') = YEAR(NOW())
     </select>
 </mapper>