aps-大屏

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -1163,7 +1163,6 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                     item.setId(SecurityUtil.getUUID());
                     item.setTenantid(key);
                     item.setTenantname(value);
-                    item.setYearmonth(DateUtil.format(item.getCreatedate(), "yyyyMM"));
                     item.setAvgplanproducevolume(avgApsReportThProcessPhoto.getAvgplanproducevolume());
                     item.setAvgactualproducevolume(avgApsReportThProcessPhoto.getAvgactualproducevolume());
                 });

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductionOrderDao.xml

@@ -695,7 +695,7 @@
         month_year
         )
         select
-            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
             IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划完成订单量
             IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已完成订单量
         from
@@ -703,7 +703,7 @@
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
                 LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
         ORDER BY
-            month_year
+            yearmonth
     </select>
     <select id="selectCastRollData" resultType="com.rongwei.bsentity.domain.ApsReportCastRollTable">
         with plan as (
@@ -876,7 +876,7 @@
                      month_year
              )
         select
-            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
             IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
             IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
         from
@@ -884,7 +884,7 @@
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
                 LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
         ORDER BY
-            month_year
+            yearmonth
     </select>
     <select id="selectProcessTable" resultType="com.rongwei.bsentity.domain.ApsReportJzProcessTable">
         with plan as (
@@ -1057,7 +1057,7 @@
                      month_year
              )
         select
-            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
             IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
             IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
         from
@@ -1065,7 +1065,7 @@
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
                 LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
         ORDER BY
-            month_year
+            yearmonth
     </select>
     <select id="selectZjProcessTable" resultType="com.rongwei.bsentity.domain.ApsReportZjProcessTable">
         with plan as (
@@ -1239,7 +1239,7 @@
                      month_year
              )
         select
-            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
             IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
             IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
         from
@@ -1247,7 +1247,7 @@
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
                 LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
         ORDER BY
-            month_year
+            yearmonth
     </select>
     <select id="selectThProcessTable" resultType="com.rongwei.bsentity.domain.ApsReportThProcessTable">
         with plan as (
@@ -1420,7 +1420,7 @@
                      month_year
              )
         select
-            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') month_year,
+            DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
             IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME, -- 计划加工量
             IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 实际已加工量
         from
@@ -1428,6 +1428,6 @@
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
                 LEFT JOIN actual ON actual.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
         ORDER BY
-            month_year
+            yearmonth
     </select>
 </mapper>