11.20

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -310,8 +310,10 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
                 rejects.add(ll);
             });
         });
+        bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
+        bizDayworkAuxiliaryItemRejectService.saveOrUpdateBatch(bizDayworkAuxiliaryItem.getRejectList());
         Integer rejectNum = bizDayworkAuxiliaryItem.getRejectList().stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum();
-        int rejectTotalNum = 0 + rejectNum;
+        int rejectTotalNum = 0;
         int qualifiedNum = 0;
         int lastQualifiedNum = 0;
         // 修改报工表的合格数量
@@ -320,12 +322,8 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         //这道序总的废品数
         if(!bizDayworkAuxiliaryItem.getRejectList().isEmpty()) {
             Long dayworkItemId = bizDayworkAuxiliaryItem.getRejectList().stream().map(BizDayworkAuxiliaryItemReject::getDayworkItemId).distinct().findFirst().orElse(0L);
-            List<BizDayworkAuxiliaryItemReject> dayworkRejectList = bizDayworkAuxiliaryItemRejectService.query().eq("daywork_item_id", dayworkItemId).list();
-            if(bizDayworkAuxiliaryItem.getId() != null){
+            List<BizDayworkAuxiliaryItemReject> dayworkRejectList = bizDayworkAuxiliaryItemRejectService.query().eq("daywork_auxiliary_item_id", bizDayworkAuxiliaryItem.getId()).list();
                 rejectTotalNum = dayworkRejectList.stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum();
-            }else{
-                rejectTotalNum = dayworkRejectList.stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum() + rejectNum;
-            }
 
             //当前序工序编号
             String processStepNumber = bizDayworkItems.stream().filter(v->v.getId().equals(dayworkItemId)).findFirst().orElse(new BizDayworkItem()).getProcessStepNumber();
@@ -390,8 +388,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         if(!isFirst) {
             bizDayworkService.updateById(bizDaywork);
         }
-        bizDayworkAuxiliaryItemRejectService.saveOrUpdateBatch(bizDayworkAuxiliaryItem.getRejectList());
-        bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
+
         bizDayworkItemService.updateBatchById(bizDayworkItems);
         bizDayworkItemRejectService.saveOrUpdateBatch(rejects);
         return success();