From 7b77694ec16a51907963c882a768e0333e42c115 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 2 Sep 2024 09:45:24 +0800 Subject: [PATCH] =?UTF-8?q?2024-09-02=20MES-=E7=82=B9=E6=A3=80=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-=E6=A0=B9=E6=8D=AE=E4=B8=8A=E4=BD=8D=E6=9C=BA?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4-=E7=8F=AD=E7=BB=84?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=8F=AD=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MesInspectionReportServiceImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java index cbd995940..e72c0ee92 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java @@ -255,7 +255,7 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi }else{ for(String team : teamArray){ List result = list.stream() - .filter(MesInspectionReport -> MesInspectionReport.getRemark().equals(team)) // 条件1：符合班组 + .filter(MesInspectionReport -> MesInspectionReport.getRemark().equals(team)) // 条件1：符合班次 .filter(MesInspectionReport-> MesInspectionReport.getInfoName().equals(project.getInfoName())) // 条件2：符合当前项目内容 .collect(Collectors.toList()); // 收集结果 if(!CollectionUtils.isEmpty(result)){ @@ -323,7 +323,7 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi dynamicRow1.put(str + i + "",dynamicRow10); } - dynamicRow2.put(str + i + "","班组:" + list.getRemark()); + dynamicRow2.put(str + i + "","班次:" + list.getRemark()); i++; } if(lists == null){ @@ -337,12 +337,12 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi dynamicRow1.put(str + 4 + "", dynamicRow10); dynamicRow1.put(str + 5 + "", dynamicRow10); - dynamicRow2.put(str + 0 + "", "班组:"); - dynamicRow2.put(str + 1 + "", "班组:"); - dynamicRow2.put(str + 2 + "", "班组:"); - dynamicRow2.put(str + 3 + "", "班组:"); - dynamicRow2.put(str + 4 + "", "班组:"); - dynamicRow2.put(str + 5 + "", "班组:"); + dynamicRow2.put(str + 0 + "", "班次:"); + dynamicRow2.put(str + 1 + "", "班次:"); + dynamicRow2.put(str + 2 + "", "班次:"); + dynamicRow2.put(str + 3 + "", "班次:"); + dynamicRow2.put(str + 4 + "", "班次:"); + dynamicRow2.put(str + 5 + "", "班次:"); } if(dynamicRow1.size() < 6){ @@ -369,17 +369,17 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi if(dynamicRow2.size() < 6){ for(int j = 0 ; j < 6-(lists.size()) ; j++){ if(j == 0){ - dynamicRow2.put(str + 5 +"", "班组:"); + dynamicRow2.put(str + 5 +"", "班次:"); }else if(j == 1){ - dynamicRow2.put(str + 4 +"", "班组:"); + dynamicRow2.put(str + 4 +"", "班次:"); }else if(j == 2){ - dynamicRow2.put(str + 3 +"", "班组:"); + dynamicRow2.put(str + 3 +"", "班次:"); }else if(j == 3){ - dynamicRow2.put(str + 2 +"", "班组:"); + dynamicRow2.put(str + 2 +"", "班次:"); }else if(j == 4){ - dynamicRow2.put(str + 1 +"", "班组:"); + dynamicRow2.put(str + 1 +"", "班次:"); }else if(j == 5){ - dynamicRow2.put(str + 0 +"", "班组:"); + dynamicRow2.put(str + 0 +"", "班次:"); } } }