|
@@ -170,8 +170,9 @@ public class ScheduleUserDateController extends SuperController<ScheduleUserDate
|
|
if(!scheduleUserDateUpdateDTO.isOnWork()){
|
|
if(!scheduleUserDateUpdateDTO.isOnWork()){
|
|
String orderWorkStatistics = mesNoticeService.orderWorkStatistics(mesNotice.getId().toString());
|
|
String orderWorkStatistics = mesNoticeService.orderWorkStatistics(mesNotice.getId().toString());
|
|
mesNotice.setOrderInfo(orderWorkStatistics);
|
|
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);
|
|
mesNoticeService.updateAllById(mesNotice);
|
|
//同步更新日志
|
|
//同步更新日志
|