瀏覽代碼

后台代码处理

oyq28 1 月之前
父節點
當前提交
134bf94216

+ 3 - 2
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/classSchedule/ScheduleUserDateController.java

@@ -170,8 +170,9 @@ public class ScheduleUserDateController extends SuperController<ScheduleUserDate
             if(!scheduleUserDateUpdateDTO.isOnWork()){
                 String orderWorkStatistics = mesNoticeService.orderWorkStatistics(mesNotice.getId().toString());
                 mesNotice.setOrderInfo(orderWorkStatistics);
-                MesNoticeLog mesNoticeLog = mesNoticeLogService.getOne(new LbqWrapper<MesNoticeLog>().eq(MesNoticeLog::getStatus,"4").eq(MesNoticeLog::getNoticeId, mesNotice.getId()).orderByDesc(MesNoticeLog::getCreateTime).last("limit 1"));
-                mesNotice.setWorkReport(mesNoticeLog!=null? String.format( "%.1f", Double.parseDouble(orderWorkStatistics) - Double.parseDouble(mesNoticeLog.getOrderInfo())) : orderWorkStatistics);
+                MesNoticeLog historyLog = mesNoticeLogService.getOne(new LbqWrapper<MesNoticeLog>().eq(MesNoticeLog::getStatus,"4").eq(MesNoticeLog::getNoticeId, mesNotice.getId()).orderByDesc(MesNoticeLog::getCreateTime).last("limit 1"));
+                mesNotice.setWorkReport(historyLog!=null? String.format( "%.1f", Double.parseDouble(orderWorkStatistics) - Double.parseDouble(historyLog.getOrderInfo())) : orderWorkStatistics);
+
             }
             mesNoticeService.updateAllById(mesNotice);
             //同步更新日志