change - 温度报表

aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java

@@ -137,16 +137,17 @@ public class BoxTemperatureHistoryServiceImpl implements IBoxTemperatureHistoryS
                 if (i==0){
                     long l = beginTime.getTime() + (j * 30 * 1000);
                     //获取后八位 不要年月
-                    strings[j] =  "\""+sdf.format(l).substring(sdf.format(l).length()-8,sdf.format(l).length())+"\"";
+//                    strings[j] =  "\""+sdf.format(l).substring(sdf.format(l).length()-8,sdf.format(l).length())+"\"";
+                    strings[j] = String.valueOf(j);
                 }else{
                     strings[j] = twoArray[j][i];
                 }
             }
             tempList.add(strings);
         }
-        for (int i=0;i< yaxis.length;i++){
+//        for (int i=0;i< yaxis.length;i++){
-            System.out.println(Arrays.toString(tempList.get(i)));
+//            System.out.println(Arrays.toString(tempList.get(i)));
-        }
+//        }
         return tempList;
     }
     //根据分号转为二维数组

aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml

@@ -37,7 +37,9 @@
         FROM record_switch_order rso
                  left join BASE_PRODUCTLINE pl ON rso.switch_station_code = pl.PRODUCT_LINE_CODE
                  left join C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = rso.MATERIAL_BARCODE
-                 left join C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE ps ON ps.MATERIAL_BARCODE = rso.MATERIAL_BARCODE
+                 left join (SELECT MATERIAL_BARCODE, MIN(IS_PRINT) IS_PRINT
+                            FROM C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE
+                            GROUP BY MATERIAL_BARCODE) ps ON ps.MATERIAL_BARCODE = rso.MATERIAL_BARCODE
     </sql>
 
     <select id="selectRecordSwitchOrderList" parameterType="RecordSwitchOrder" resultMap="RecordSwitchOrderResult">