Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -237,7 +237,7 @@ public class BizReturnReceiptController extends BaseController
         List<BizOutsourcedOrderDetailProcess> bizOutsourcedOrderDetailProcess = bizOutsourcedOrderDetailProcessService.query().in("detail_id", outsourceDetailId).list();
         List<BizDayworkItem> dayworkItem = bizDayworkItemService.getListByDayworkIdsForOutsourced(dayworkListIds);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date date2 = simpleDateFormat.parse(simpleDateFormat.format(new Date()));
+        Date date = simpleDateFormat.parse(simpleDateFormat.format(new Date()));
         //向收回单明细表存
         for(BizReturnReceiptDetail bizReturnReceiptDetail : bizReturnReceipt.getDetailInfo()) {
             bizReturnReceiptDetail.setMasterId(bizReturnReceipt.getId());
@@ -250,10 +250,10 @@ public class BizReturnReceiptController extends BaseController
                 for(BizOutsourcedOrderDetailProcess info: bizOutsourcedOrderDetailProcess) {
                     if (item.getDayworkId().equals(info.getDayworkId())&&item.getProcessStepNumber().equals(info.getProcessStepNumber())&& item.getLotId().equals(bizReturnReceiptDetail.getLotId())) {
                         item.setStatus("3");
-                        item.setEndTime(date2);
+                        item.setEndTime(date);
                         item.setNickName("外协");
                         item.setQualifiedNum(bizReturnReceiptDetail.getAuditNum());
-                        long timeDifference = date2.getTime() - item.getStartTime().getTime();
+                        long timeDifference = date.getTime() - item.getStartTime().getTime();
                         item.setWorkingHours(timeDifference);
                     }
                 }
@@ -276,13 +276,13 @@ public class BizReturnReceiptController extends BaseController
         bizReturnReceipt.setIsSubmit(1);
         bizReturnReceiptService.updateById(bizReturnReceipt);
         //将dayworkItem外协报工状态改成3,添加工时,审核数量设置成合格数
-        List<Long> dayworkListIds = bizReturnReceipt.getDetails().stream().map(BizReturnReceiptDetail::getDayworkId).collect(Collectors.toList());
+        List<Long> dayworkListIds = bizReturnReceipt.getDetailInfo().stream().map(BizReturnReceiptDetail::getDayworkId).collect(Collectors.toList());
         //找到要修改的报工记录
-        List<Long> outsourceDetailId = bizReturnReceipt.getDetails().stream().map(BizReturnReceiptDetail::getOutsourceDetailId).collect(Collectors.toList());
+        List<Long> outsourceDetailId = bizReturnReceipt.getDetailInfo().stream().map(BizReturnReceiptDetail::getOutsourceDetailId).collect(Collectors.toList());
         List<BizOutsourcedOrderDetailProcess> bizOutsourcedOrderDetailProcess = bizOutsourcedOrderDetailProcessService.query().in("detail_id", outsourceDetailId.isEmpty()? Collections.singletonList(0L) : bizReturnReceipt.getDetails().stream().map(BizReturnReceiptDetail::getOutsourceDetailId).collect(Collectors.toList())).list();
         List<BizDayworkItem> dayworkItem = bizDayworkItemService.getListByDayworkIdsForOutsourced(dayworkListIds.size()>0?dayworkListIds:Collections.singletonList(0L));
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date date2 = dateFormat.parse(dateFormat.format(new Date()));
+        Date date = dateFormat.parse(dateFormat.format(new Date()));
         //向收回单明细表存
         for(BizReturnReceiptDetail bizReturnReceiptDetail : bizReturnReceipt.getDetailInfo()) {
             bizReturnReceiptDetail.setMasterId(bizReturnReceipt.getId());
@@ -294,10 +294,10 @@ public class BizReturnReceiptController extends BaseController
             for(BizDayworkItem item: dayworkItem) {
                     if (item.getDayworkId().equals(bizReturnReceiptDetail.getDayworkId())&&item.getProcessStepNumber().equals(bizReturnReceiptDetail.getProcessStepNumber()) && item.getLotId().equals(bizReturnReceiptDetail.getLotId())) {
                         item.setStatus("3");
-                        item.setEndTime(date2);
+                        item.setEndTime(date);
                         item.setNickName("外协");
                         item.setQualifiedNum(bizReturnReceiptDetail.getAuditNum());
-                        long timeDifference = date2.getTime() - item.getStartTime().getTime();
+                        long timeDifference = date.getTime() - item.getStartTime().getTime();
                         item.setWorkingHours(timeDifference);
                     }
             }