|
@@ -194,9 +194,9 @@ public class WorkerController {
|
|
|
restInfo.setCreaterName(utf8Name);
|
|
restInfo.setCreaterName(utf8Name);
|
|
|
restInfo.setCreateDate(LocalDateTime.now());
|
|
restInfo.setCreateDate(LocalDateTime.now());
|
|
|
Boolean flag = restInfoService.save(restInfo);
|
|
Boolean flag = restInfoService.save(restInfo);
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, userId + "", userName,
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, userId + "", utf8Name,
|
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getEndTime()));
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getEndTime()));
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_END, null, userId + "", userName, workCycle.getId() + "",
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_END, null, userId + "", utf8Name, workCycle.getId() + "",
|
|
|
workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getEndTime()), DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
|
|
workCycle.getTruckId() + "", getLocalDateTimeStr(restInfo.getEndTime()), DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
|
|
|
return new Result<>(flag);
|
|
return new Result<>(flag);
|
|
|
}
|
|
}
|
|
@@ -226,9 +226,9 @@ public class WorkerController {
|
|
|
truckRepairInfo.setCreaterName(utf8Name);
|
|
truckRepairInfo.setCreaterName(utf8Name);
|
|
|
truckRepairInfo.setCreateDate(LocalDateTime.now());
|
|
truckRepairInfo.setCreateDate(LocalDateTime.now());
|
|
|
Boolean flag = truckRepairInfoService.save(truckRepairInfo);
|
|
Boolean flag = truckRepairInfoService.save(truckRepairInfo);
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, userId + "", userName,
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, userId + "", utf8Name,
|
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckRepairInfo.getStartTime()));
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckRepairInfo.getStartTime()));
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_END, null, userId + "", userName,
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_END, null, userId + "", utf8Name,
|
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckRepairInfo.getEndTime()),
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckRepairInfo.getEndTime()),
|
|
|
DateUtils.betweenTime(truckRepairInfo.getStartTime(), truckRepairInfo.getEndTime()));
|
|
DateUtils.betweenTime(truckRepairInfo.getStartTime(), truckRepairInfo.getEndTime()));
|
|
|
return new Result<>(flag);
|
|
return new Result<>(flag);
|
|
@@ -268,9 +268,9 @@ public class WorkerController {
|
|
|
truckCheckInfo.setCreateDate(LocalDateTime.now());
|
|
truckCheckInfo.setCreateDate(LocalDateTime.now());
|
|
|
Boolean flag = truckCheckInfoService.saveOrUpdate(truckCheckInfo);
|
|
Boolean flag = truckCheckInfoService.saveOrUpdate(truckCheckInfo);
|
|
|
if (Objects.equals(truckCheckInfo.getType(),3)) {
|
|
if (Objects.equals(truckCheckInfo.getType(),3)) {
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.CHECK_START, null, userId + "", userName,
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.CHECK_START, null, userId + "", utf8Name,
|
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getEndTime()));
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getEndTime()));
|
|
|
- workLogService.logWorkCycleInfo(WorkLogTypeEnum.CHECK_END, null, userId + "", userName,
|
|
|
|
|
|
|
+ workLogService.logWorkCycleInfo(WorkLogTypeEnum.CHECK_END, null, userId + "", utf8Name,
|
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getEndTime()),
|
|
workCycle.getId() + "", workCycle.getTruckId() + "", getLocalDateTimeStr(truckCheckInfo.getEndTime()),
|
|
|
DateUtils.betweenTime(truckCheckInfo.getStartTime(), truckCheckInfo.getEndTime()));
|
|
DateUtils.betweenTime(truckCheckInfo.getStartTime(), truckCheckInfo.getEndTime()));
|
|
|
}
|
|
}
|