Prechádzať zdrojové kódy

完善送样卡修改同步统计时的判空

lingpeng.li 5 dní pred
rodič
commit
05671e91cd

+ 7 - 12
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/sampleCardDeliveryRecord/controller/SampleCardDeliveryRecordController.java

@@ -255,28 +255,23 @@ public class SampleCardDeliveryRecordController extends JeecgController<SampleCa
     public Result<String> edit(@RequestBody SampleCardDeliveryRecord sampleCardDeliveryRecord) {
         sampleCardDeliveryRecordService.updateById(sampleCardDeliveryRecord);
 
-        // 构建当天起止时间
-        Date createDate = sampleCardDeliveryRecord.getCreateTime();
-        Date startOfDay = DateUtils.truncate(createDate, Calendar.DAY_OF_MONTH); // 当天00:00:00
-        Date endOfDay = DateUtils.addMilliseconds(DateUtils.ceiling(createDate, Calendar.DAY_OF_MONTH), -1); // 当天23:59:59.999
 
         // 根据ccmNo、shift、shiftGroup查询最新的交班记录
         LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, sampleCardDeliveryRecord.getCcmNo())
                 .eq(BilletHotsendChangeShift::getShift, sampleCardDeliveryRecord.getShift())
                 .eq(BilletHotsendChangeShift::getShiftGroup, sampleCardDeliveryRecord.getShiftGroup())
-                .ge(BilletHotsendChangeShift::getCreateTime, startOfDay)
-                .le(BilletHotsendChangeShift::getCreateTime, endOfDay)
                 .orderByDesc(BilletHotsendChangeShift::getCreateTime)
                 .last("limit 1");
         BilletHotsendChangeShift changeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
 
-
-        // 延迟统计(修改 SampleCardDeliveryRecord 后)
-        billetOriginalProductRecordService.delayAndInitStatistics(
-                changeShift.getCcmNo(),
-                changeShift.getId()
-        );
+        if(oConvertUtils.isNotEmpty(changeShift)) {
+            // 延迟统计(修改 SampleCardDeliveryRecord 后)
+            billetOriginalProductRecordService.delayAndInitStatistics(
+                    changeShift.getCcmNo(),
+                    changeShift.getId()
+            );
+        }
         return Result.OK("编辑成功!");
     }