系统统计

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2024,7 +2024,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             for (int i = minYear; i <= year; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    if (i == Integer.valueOf(map.get("yy"))) {
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
                     }
                 }
@@ -2045,7 +2045,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             for (int i = 1; i <= 4; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    if (i == map.get("yy")) {
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
                     }
                 }
@@ -2105,7 +2105,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             for (int i = minYear; i <= year; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    if (i == Integer.valueOf(map.get("yy"))) {
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
                     }
                 }
@@ -2126,7 +2126,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             for (int i = 1; i <= 4; i++) {
                 boolean isYear = false;
                 for (Map<String, Integer> map : listMap) {
-                    if (i == map.get("yy")) {
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
                     }
                 }
@@ -2250,7 +2250,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             for (int i = minYear; i <= year; i++) {
                 boolean isYear = false;
                 for (Map<String, String> map : listMap) {
-                    if (i == Integer.valueOf(map.get("yy"))) {
+                    if (i == Integer.parseInt(String.valueOf(map.get("yy")))) {
                         isYear = true;
                     }
                 }

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

@@ -205,10 +205,12 @@
     </select>
 
     <select id="countMajorProjectLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
-        SELECT YEAR(NOW()) - 1 columnName, COUNT(demand_id) num, SUM(evaluation) evaluationTotal
+        SELECT YEAR (NOW()) - 1 columnName, COUNT (demand_id) num, SUM (evaluation) evaluationTotal
         FROM `pm_demand`
-        WHERE find_in_set('1', project_attr)
-          and DATE_FORMAT(create_time, '%Y') = YEAR(NOW()) - 1
+        WHERE find_in_set('1'
+            , project_attr)
+          and DATE_FORMAT(create_time
+            , '%Y') = YEAR (NOW()) - 1
     </select>
 
     <select id="countProjectMajorByYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
@@ -259,105 +261,72 @@
 
     <select id="selectpurchaseProjectCompleteNumberYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(demand_id)             countNum,
-               ifnull(sum(a.evaluation), 0) evaluation, year (a.plan_demand_sub_time) yy, ifnull(sum (b.contract_amount), 0) contractAmount
+        select count(a.demand_id) countNum, ifnull(sum(a.evaluation), 0) evaluation,
+            year(a.plan_demand_sub_time) yy, ifnull(sum(b.contract_amount), 0) contractAmount
         from (
             select evaluation, plan_demand_sub_time, demand_id from pm_demand where project_status = '17'
-            ) a left join (
+        ) a left join (
             select contract_amount, demand_id from pm_contract_info
-            ) b
-        on a.demand_id = b.demand_id
-        group by year (a.plan_demand_sub_time)
+        ) b on a.demand_id = b.demand_id
+        group by year(plan_demand_sub_time)
     </select>
 
     <select id="selectpurchaseProjectCompleteNumberQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select ifnull(sum(a.evaluation), 0)      evaluation,
-               quarter(a.plan_demand_sub_time)   yy,
-               ifnull(sum(b.contract_amount), 0) contractAmount
+        select ifnull(sum(a.evaluation), 0) evaluation, quarter(a.plan_demand_sub_time) 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())
+            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 concat(Year (a.plan_demand_sub_time), quarter(a.plan_demand_sub_time))
+            select contract_amount, demand_id from pm_contract_info
+        ) b on a.demand_id = b.demand_id
+        group by concat(Year(a.plan_demand_sub_time), quarter(a.plan_demand_sub_time))
     </select>
 
     <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
+        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
+            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')
     </select>
 
     <select id="selectPurchaseTaskFinishYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(demand_id)             countNum,
-               ifnull(sum(a.evaluation), 0) evaluation,
-            year (a.plan_demand_sub_time) yy,
-            ifnull(sum (b.contract_amount), 0) contractAmount
+        select count(demand_id) countNum, ifnull(sum(a.evaluation), 0) evaluation, year(a.plan_demand_sub_time) yy, ifnull(sum(b.contract_amount), 0) contractAmount
         from (
             select evaluation, plan_demand_sub_time, demand_id from pm_demand where project_status in (15, 16, 17)
-            ) a
-            left join (
-            select contract_amount, demand_id
-            from pm_contract_info
-            ) b
-        on a.demand_id = b.demand_id
+        ) a left join (
+            select contract_amount, demand_id from pm_contract_info
+        ) b on a.demand_id = b.demand_id
         group by year (a.plan_demand_sub_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.plan_demand_sub_time)   yy,
-               ifnull(sum(b.contract_amount), 0) contractAmount
+        select ifnull(sum(a.evaluation), 0) evaluation, quarter(a.plan_demand_sub_time) yy, ifnull(sum(b.contract_amount), 0) contractAmount
         from (
-                 select evaluation, plan_demand_sub_time, demand_id
-                 from pm_demand
-                 where project_status in (15, 16, 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
+            select evaluation, plan_demand_sub_time, demand_id from pm_demand
+            where project_status in (15, 16, 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 concat(Year (a.plan_demand_sub_time), quarter(a.plan_demand_sub_time))
     </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(plan_demand_sub_time, '%m') yy,
-               ifnull(sum(b.contract_amount), 0)       contractAmount
+        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 in (15, 16, 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
+            select evaluation, plan_demand_sub_time, demand_id from pm_demand
+            where project_status in (15, 16, 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')
     </select>
 
@@ -381,7 +350,7 @@
 
     <select id="purchaseProjectNumberAnalysisYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(demand_id) countNum, ifnull(sum(evaluation), 0) evaluationSum, year (plan_demand_sub_time) yy
+        select count(demand_id) countNum, ifnull(sum(evaluation), 0) evaluationSum, year(plan_demand_sub_time) yy
         from pm_demand
         group by year (plan_demand_sub_time)
     </select>
@@ -391,30 +360,34 @@
         select count(demand_id) countNum, ifnull(sum(evaluation), 0) evaluationSum, quarter(plan_demand_sub_time) yy
         from pm_demand
         where year (plan_demand_sub_time) = year (NOW())
-        group by concat(Year (plan_demand_sub_time), quarter(plan_demand_sub_time))
+        group by concat(Year(plan_demand_sub_time), quarter(plan_demand_sub_time))
     </select>
 
     <select id="purchaseProjectNumberAnalysisOldYearQuarter" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
         select count(demand_id) countNum, ifnull(sum(evaluation), 0) evaluationSum, quarter(plan_demand_sub_time) yy
         from pm_demand
-        where year (plan_demand_sub_time) = year (NOW() - 1)
-        group by concat(Year (plan_demand_sub_time), quarter(plan_demand_sub_time))
+        where year(plan_demand_sub_time) = year(NOW() - 1)
+        group by concat(Year(plan_demand_sub_time), quarter(plan_demand_sub_time))
     </select>
 
     <select id="purchaseProjectNumberAnalysisMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(demand_id) countNum, ifnull(sum(evaluation), 0) evaluationSum, date_format(plan_demand_sub_time, '%m') yy
+        select count(demand_id) countNum,
+               ifnull(sum(evaluation), 0) evaluationSum,
+               date_format(plan_demand_sub_time, '%m') yy
         from pm_demand
-        where year (plan_demand_sub_time) = year (NOW())
+        where year (plan_demand_sub_time) = year(NOW())
         group by date_format(plan_demand_sub_time, '%y%m')
     </select>
 
     <select id="purchaseProjectNumberAnalysisOldYearMonth" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="java.util.Map">
-        select count(demand_id) countNum, ifnull(sum(evaluation), 0) evaluationSum, date_format(plan_demand_sub_time, '%m') yy
+        select count(demand_id) countNum,
+               ifnull(sum(evaluation), 0) evaluationSum,
+               date_format(plan_demand_sub_time, '%m') yy
         from pm_demand
-        where year (plan_demand_sub_time) = year (NOW() - 1)
+        where year(plan_demand_sub_time) = year(NOW() - 1)
         group by date_format(plan_demand_sub_time, '%y%m')
     </select>
 </mapper>