Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024-09-02 MES-点检报表-根据上位机进行调整-班组改为班次

Browse Source
master
A0010407 10 months ago
parent 2cbd5582cc
commit 7b77694ec1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

28
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesInspectionReportServiceImpl.java
Unescape Escape View File

@ -255,7 +255,7 @@ public class MesInspectionReportServiceImpl implements IMesInspectionReportServi
}else{
for(String team : teamArray){
List<MesInspectionReport> 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 +"", "班次:");
}
}
}

Write Preview
Loading…
Cancel
Save