生产处置单内部审批提交

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

@@ -318,28 +318,44 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     @Override
     public R fill(ReviewSheetDetailVO vo) {
         log.info("ReviewSheetDetailVO vo = {}", vo.toString());
-        // 关联rsId
+
-        for (ReviewFaultVO voF : vo.getFaultList()) {
-            voF.setReviewSheetId(vo.getId());
-        }
         // 删除
         if (StringUtils.isNotBlank(vo.getFaultDeleteIds())) {
             faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds()));
         }
-        List<ReviewFault> listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
+
-        // 保存 或 更新
+        List<ReviewFault> listF = null;
-        faultService.saveOrUpdateBatch(listF);
+
-        // 关联rsId
+        if(null != vo.getFaultList() && vo.getFaultList().size() > 0){
-        for (ReviewDutyVO voD : vo.getDutyList()) {
+            // 关联rsId
-            voD.setReviewSheetId(vo.getId());
+            for (ReviewFaultVO voF : vo.getFaultList()) {
+                voF.setReviewSheetId(vo.getId());
+            }
+            listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
+            // 保存 或 更新
+            faultService.saveOrUpdateBatch(listF);
         }
+
+
+
         // 删除
         if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) {
             dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds()));
         }
-        List<ReviewDuty> listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
+
-        // 保存 或 更新
+
-        dutyService.saveOrUpdateBatch(listD);
+        List<ReviewDuty> listD = null;
+        if(null != vo.getDutyList() && vo.getDutyList().size() > 0){
+            // 关联rsId
+            for (ReviewDutyVO voD : vo.getDutyList()) {
+                voD.setReviewSheetId(vo.getId());
+            }
+            listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
+            // 保存 或 更新
+            dutyService.saveOrUpdateBatch(listD);
+        }
+
+
         // 审理单
         ReviewSheet rs = getById(vo.getId()); // 从数据库中查到
         log.info("ReviewSheet rs = {}", rs);
@@ -403,29 +419,33 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
 
             List<ReviewDutyDTO> vods = new ArrayList<>();
 
-            for(ReviewDuty vod : listD){
+            if(null != listD && listD.size() > 0){
-                ReviewDutyDTO vodDTO = new ReviewDutyDTO();
+                for(ReviewDuty vod : listD){
-                vodDTO.setTrialId(vod.getReviewSheetId()+"");
+                    ReviewDutyDTO vodDTO = new ReviewDutyDTO();
-                vodDTO.setReqQty(vod.getQty());
+                    vodDTO.setTrialId(vod.getReviewSheetId()+"");
-                vodDTO.setUnit(vod.getUnit());
+                    vodDTO.setReqQty(vod.getQty());
-                vodDTO.setCorrBatchNo(vod.getRelevantBatch());
+                    vodDTO.setUnit(vod.getUnit());
-                vods.add(vodDTO);
+                    vodDTO.setCorrBatchNo(vod.getRelevantBatch());
+                    vods.add(vodDTO);
+                }
             }
 
-
             List<ReviewFaultDTO> vofs = new ArrayList<>();
-            for(ReviewFault vof : listF){
+            if(null != listF && listF.size() > 0){
-                ReviewFaultDTO vofDTO = new ReviewFaultDTO();
+                for(ReviewFault vof : listF){
-                vofDTO.setTrialId(vof.getReviewSheetId()+"");
+                    ReviewFaultDTO vofDTO = new ReviewFaultDTO();
-                vofDTO.setFaultType(vof.getNgType2Id()+"");
+                    vofDTO.setTrialId(vof.getReviewSheetId()+"");
-                vofDTO.setQuestClass(vof.getNgType3Id()+"");
+                    vofDTO.setFaultType(vof.getNgType2Id()+"");
-                vofDTO.setQuestSubclass(vof.getNgType4Id()+"");
+                    vofDTO.setQuestClass(vof.getNgType3Id()+"");
-                vofDTO.setProportion(vof.getScale());
+                    vofDTO.setQuestSubclass(vof.getNgType4Id()+"");
-                vofDTO.setFaultQty(vof.getQty());
+                    vofDTO.setProportion(vof.getScale());
-                vofDTO.setDescribe(vof.getMemo());
+                    vofDTO.setFaultQty(vof.getQty());
-                vofs.add(vofDTO);
+                    vofDTO.setDescribe(vof.getMemo());
+                    vofs.add(vofDTO);
+                }
             }
 
+
 //            JSONObject obj = new JSONObject();
 //            obj.put("qmsRepairApplyDTO", dto);
 //            obj.put("qmsRepairPartList", vods);