25MW干熄焦

src/main/java/com/steerinfo/ems/emsprodplanyear/service/impl/EmsProdplanYearServiceImpl.java

@@ -138,6 +138,7 @@ public class EmsProdplanYearServiceImpl extends BaseServiceImpl<EmsProdplanYear,
             is = new FileInputStream(file);
         }
         List<List<String[]>> list = ExcelToolUtils.parseExcels(is, fileName, 0);
+        String year = fileName.substring(0,4);
         final Pattern pattern = Pattern.compile("[0-9]*");
         try {
             for (int i = 0; i < list.size(); i++) {
@@ -151,6 +152,7 @@ public class EmsProdplanYearServiceImpl extends BaseServiceImpl<EmsProdplanYear,
                  }
                     for(int k =1;k<arr1.length;k++) {
                         EmsProdplanYear spp = new EmsProdplanYear();
+                        calendar1.set(Calendar.YEAR, Integer.parseInt(year));
                         // 月份 丛0开始 所以减一
                         calendar1.set(Calendar.MONTH, Integer.parseInt(arr[0].trim()) - 1 );
                         //天数 1号
@@ -322,7 +324,7 @@ public class EmsProdplanYearServiceImpl extends BaseServiceImpl<EmsProdplanYear,
                             spp.setLine("AT4003");
                             spp.setUnit("Kwh");
                             spp.setWeight(new BigDecimal(arr[k].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
-                        } else if (arr1[k].trim().indexOf("25MW") != -1) {
+                        } else if (arr1[k].trim().indexOf("25MW煤气") != -1) {
                             spp.setParentid("FDC");
                             spp.setLine("AT4001");
                             spp.setUnit("Kwh");
@@ -332,6 +334,11 @@ public class EmsProdplanYearServiceImpl extends BaseServiceImpl<EmsProdplanYear,
                             spp.setLine("AT4004");
                             spp.setUnit("Kwh");
                             spp.setWeight(new BigDecimal(arr[k].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
+                        } else if (arr1[k].trim().indexOf("25MW干熄焦") != -1) {
+                            spp.setParentid("FDC");
+                            spp.setLine("AT4009");
+                            spp.setUnit("Kwh");
+                            spp.setWeight(new BigDecimal(arr[k].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
                         } else if (arr1[k].trim().indexOf("TRT") != -1) {
                             spp.setParentid("FDC");
                             spp.setLine("AT3022");

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.xml

@@ -809,7 +809,7 @@ FROM
     SELECT * FROM (SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL1 AS ACTUALVALUE,ZH_RCL1 AS APPORTVALUE,'AT3011CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND ZH_RCL1 IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL2 AS ACTUALVALUE,ZH_RCL2 AS APPORTVALUE,'AT3012CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND ZH_RCL2 IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,KZF_RCL AS ACTUALVALUE,KZF_RCL AS APPORTVALUE,'AT2014CP048R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND KZF_RCL IS NOT NULL UNION ALL
-    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-4)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-0)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JY_CL AS ACTUALVALUE,JY_CL AS APPORTVALUE,'AT2011CP032R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JY_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,CB_CL AS ACTUALVALUE,CB_CL AS APPORTVALUE,'AT2011CP026R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND CB_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR( DATES, 'yyyy-MM-dd' ) AS CLOCK,JMCL AS ACTUALVALUE,JMCL AS APPORTVALUE,'AT2012CP031R' AS ITEMID FROM EMS_SCQK_JJ WHERE