|
|
|
@ -159,21 +159,22 @@ public class InspectionTaskController extends BladeController { |
|
|
|
.eq(RemindMsg::getRemindMsgType, 1L) |
|
|
|
.eq(RemindMsg::getRemindMsgType, 1L) |
|
|
|
.orderByDesc(RemindMsg::getId); |
|
|
|
.orderByDesc(RemindMsg::getId); |
|
|
|
msgplateList = remindMsgService.list(qw); |
|
|
|
msgplateList = remindMsgService.list(qw); |
|
|
|
int count = 0; |
|
|
|
msgplateAllList = msgplateList; |
|
|
|
if(null != msgplateList && msgplateList.size() > 0){ |
|
|
|
// int count = 0;
|
|
|
|
for(RemindMsg msg : msgplateList){ |
|
|
|
// if(null != msgplateList && msgplateList.size() > 0){
|
|
|
|
if(null != msg.getQualityLevel() |
|
|
|
// for(RemindMsg msg : msgplateList){
|
|
|
|
&& !"".equals(msg.getQualityLevel())){ |
|
|
|
// if(null != msg.getQualityLevel()
|
|
|
|
if(msg.getQualityLevel().equals(prodIdent)){ |
|
|
|
// && !"".equals(msg.getQualityLevel())){
|
|
|
|
++count; |
|
|
|
// if(msg.getQualityLevel().equals(prodIdent)){
|
|
|
|
msgplateAllList.add(msg); |
|
|
|
// ++count;
|
|
|
|
} |
|
|
|
// msgplateAllList.add(msg);
|
|
|
|
} |
|
|
|
// }
|
|
|
|
} |
|
|
|
// }
|
|
|
|
if(count == 0){ |
|
|
|
// }
|
|
|
|
msgplateAllList = msgplateList; |
|
|
|
// if(count == 0){
|
|
|
|
} |
|
|
|
// msgplateAllList = msgplateList;
|
|
|
|
} |
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
}else{//如果零件里镀种代号为空
|
|
|
|
}else{//如果零件里镀种代号为空
|
|
|
|
LambdaQueryWrapper<Plating> qw = Wrappers.lambdaQuery(Plating.class) |
|
|
|
LambdaQueryWrapper<Plating> qw = Wrappers.lambdaQuery(Plating.class) |
|
|
|
.eq(Plating::getPlating, detailDetail.getPlatingInfo()) |
|
|
|
.eq(Plating::getPlating, detailDetail.getPlatingInfo()) |
|
|
|
|