From 1dccff13fa4ede78ce50c1c87eef3ec6fe6d7cd6 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 18 Jun 2024 17:00:17 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B8=A9=E5=BA=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BoxTemperatureHistoryServiceImpl.java | 9 +++++---- .../resources/mapper/report/RecordSwitchOrderMapper.xml | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java index d1ecfe5..7ca411a 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/BoxTemperatureHistoryServiceImpl.java +++ b/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++){ - System.out.println(Arrays.toString(tempList.get(i))); - } +// for (int i=0;i< yaxis.length;i++){ +// System.out.println(Arrays.toString(tempList.get(i))); +// } return tempList; } //根据分号转为二维数组 diff --git a/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml b/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml index ba2439e..3ce7236 100644 --- a/aucma-report/src/main/resources/mapper/report/RecordSwitchOrderMapper.xml +++ b/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