|
|
@@ -2374,50 +2374,50 @@ public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInsp
|
|
|
|
|
|
|
|
|
//保存咨询信息
|
|
|
-
|
|
|
- List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults().stream().filter(item -> item.getId() == null).collect(Collectors.toList());
|
|
|
- List<BizDayworkItemConsult> needAdd = new ArrayList<>();
|
|
|
- if (consults != null && consults.size() > 0) {
|
|
|
- for (BizDayworkItemConsult consult : consults) {
|
|
|
- BizDayworkItemConsult consultInfo = new BizDayworkItemConsult();
|
|
|
- consultInfo.setPictures(consult.getPictures());
|
|
|
- consultInfo.setUserId(SecurityUtils.getLoginUser().getUserId());
|
|
|
- consultInfo.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
|
|
|
- consultInfo.setDayworkId(daywork.getId());
|
|
|
- consultInfo.setContent(consult.getContent());
|
|
|
- consultInfo.setConsultDepartment(consult.getConsultDepartment());
|
|
|
- consultInfo.setProcessInspectionId(processInspecion.getId());
|
|
|
- consultInfo.setProductionPlanId(daywork.getProductionPlanId());
|
|
|
- consultInfo.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
|
|
|
- consultInfo.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
|
|
|
- consultInfo.setLotId(processInspecion.getLot().getId());
|
|
|
- consultInfo.setLotCode(processInspecion.getLot().getLotCode());
|
|
|
- consultInfo.setDayworkId(daywork.getId());
|
|
|
- consultInfo.setDayworkItemId(dayworkItem.getId());
|
|
|
- consultInfo.setProductId(processInspecion.getLot().getProductId());
|
|
|
- consultInfo.setProductDescription(processInspecion.getLot().getProductDescription());
|
|
|
- consultInfo.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
|
|
|
- consultInfo.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
|
|
|
- consultInfo.setProcessId(dayworkItem.getProcessId());
|
|
|
- consultInfo.setIsProcessInspection(1);
|
|
|
- consultInfo.setProcessAlias(processInspecion.getLot().getProcessAlias());
|
|
|
- consultInfo.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
|
|
|
- needAdd.add(consultInfo);
|
|
|
- }
|
|
|
- bizDayworkItemConsultService.saveBatch(needAdd);
|
|
|
- List<BizDayworkItemConsultPicture> pictures = new ArrayList<>();
|
|
|
- needAdd.forEach(ne -> {
|
|
|
- ne.getPictures().forEach(info -> {
|
|
|
- BizDayworkItemConsultPicture consultPicture = new BizDayworkItemConsultPicture();
|
|
|
- consultPicture.setDayworkItemConsultId(ne.getId());
|
|
|
- consultPicture.setPictureName(info.getPictureName());
|
|
|
- consultPicture.setUrl(info.getUrl());
|
|
|
- pictures.add(consultPicture);
|
|
|
+ if(processInspecion.getDayworkItemConsults()!=null) {
|
|
|
+ List<BizDayworkItemConsult> consults = processInspecion.getDayworkItemConsults().stream().filter(item -> item.getId() == null).collect(Collectors.toList());
|
|
|
+ List<BizDayworkItemConsult> needAdd = new ArrayList<>();
|
|
|
+ if (consults != null && consults.size() > 0) {
|
|
|
+ for (BizDayworkItemConsult consult : consults) {
|
|
|
+ BizDayworkItemConsult consultInfo = new BizDayworkItemConsult();
|
|
|
+ consultInfo.setPictures(consult.getPictures());
|
|
|
+ consultInfo.setUserId(SecurityUtils.getLoginUser().getUserId());
|
|
|
+ consultInfo.setNickName(SecurityUtils.getLoginUser().getUser().getNickName());
|
|
|
+ consultInfo.setDayworkId(daywork.getId());
|
|
|
+ consultInfo.setContent(consult.getContent());
|
|
|
+ consultInfo.setConsultDepartment(consult.getConsultDepartment());
|
|
|
+ consultInfo.setProcessInspectionId(processInspecion.getId());
|
|
|
+ consultInfo.setProductionPlanId(daywork.getProductionPlanId());
|
|
|
+ consultInfo.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
|
|
|
+ consultInfo.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
|
|
|
+ consultInfo.setLotId(processInspecion.getLot().getId());
|
|
|
+ consultInfo.setLotCode(processInspecion.getLot().getLotCode());
|
|
|
+ consultInfo.setDayworkId(daywork.getId());
|
|
|
+ consultInfo.setDayworkItemId(dayworkItem.getId());
|
|
|
+ consultInfo.setProductId(processInspecion.getLot().getProductId());
|
|
|
+ consultInfo.setProductDescription(processInspecion.getLot().getProductDescription());
|
|
|
+ consultInfo.setTechnologicalProcessId(processInspecion.getLot().getTechnologicalProcessId());
|
|
|
+ consultInfo.setTechnologicalProcessDetailId(dayworkItem.getTechnologicalProcessDetailId());
|
|
|
+ consultInfo.setProcessId(dayworkItem.getProcessId());
|
|
|
+ consultInfo.setIsProcessInspection(1);
|
|
|
+ consultInfo.setProcessAlias(processInspecion.getLot().getProcessAlias());
|
|
|
+ consultInfo.setTechnicianId(technicianUser == null ? 0L : technicianUser.getUserId());
|
|
|
+ needAdd.add(consultInfo);
|
|
|
+ }
|
|
|
+ bizDayworkItemConsultService.saveBatch(needAdd);
|
|
|
+ List<BizDayworkItemConsultPicture> pictures = new ArrayList<>();
|
|
|
+ needAdd.forEach(ne -> {
|
|
|
+ ne.getPictures().forEach(info -> {
|
|
|
+ BizDayworkItemConsultPicture consultPicture = new BizDayworkItemConsultPicture();
|
|
|
+ consultPicture.setDayworkItemConsultId(ne.getId());
|
|
|
+ consultPicture.setPictureName(info.getPictureName());
|
|
|
+ consultPicture.setUrl(info.getUrl());
|
|
|
+ pictures.add(consultPicture);
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- bizDayworkItemConsultPictureService.saveBatch(pictures);
|
|
|
+ bizDayworkItemConsultPictureService.saveBatch(pictures);
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
//修改daywaork信息
|
|
|
dayworkItem.setIsProcessInspection(1);
|
|
|
return success(bizDayworkItemService.saveOrUpdate(dayworkItem));
|
