suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产质量检验任务修改

Browse Source
liweidong
pangyang 2 weeks ago
parent 945246ead3
commit 7f5c2cffe9
1 changed files with 23 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java

36
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
Unescape View File

@ -108,21 +108,31 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
vo.setStandard(standardVO); vo.setStandard(standardVO);
} }
} }
if (vo.getItem() != null && vo.getItem().getSpecialType() != null) {
if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(vo.getItem().getSpecialType()) || if(vo.getItem() != null){
InspectionItemConst.SPECIAL_TYPE_HARD.equals(vo.getItem().getSpecialType()) || List<WorkPlanItemDetailVO> list = wpItemDetailService.listVOByWorkPlanItemId(vo.getId());
InspectionItemConst.SPECIAL_TYPE_SIZE.equals(vo.getItem().getSpecialType()) if(null == list || list.size() == 0){
) { vo.setWpItemDetailList(new ArrayList<>());
List<WorkPlanItemDetailVO> list = wpItemDetailService.listVOByWorkPlanItemId(vo.getId()); }else{
if(null == list || list.size() == 0){ vo.setWpItemDetailList(list);
vo.setWpItemDetailList(new ArrayList<>());
}else{
vo.setWpItemDetailList(list);
}
// vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId()));
vo.setThicknessList(wpItemThicknessService.listThicknessByWorkPlanItemId(vo.getId()));
} }
} }
// if (vo.getItem() != null && vo.getItem().getSpecialType() != null) {
// if (InspectionItemConst.SPECIAL_TYPE_THICK.equals(vo.getItem().getSpecialType()) ||
// InspectionItemConst.SPECIAL_TYPE_HARD.equals(vo.getItem().getSpecialType()) ||
// InspectionItemConst.SPECIAL_TYPE_SIZE.equals(vo.getItem().getSpecialType())
// ) {
// List<WorkPlanItemDetailVO> list = wpItemDetailService.listVOByWorkPlanItemId(vo.getId());
// if(null == list || list.size() == 0){
// vo.setWpItemDetailList(new ArrayList<>());
// }else{
// vo.setWpItemDetailList(list);
// }
//// vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId()));
// vo.setThicknessList(wpItemThicknessService.listThicknessByWorkPlanItemId(vo.getId()));
// }
// }
} }
@Resource @Resource

Write Preview
Loading…
Cancel
Save