|
|
@ -1387,16 +1387,26 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims |
|
|
|
} |
|
|
|
} |
|
|
|
ImsDutyRecEntity dutyRec = BeanUtil.copy(recDTO, ImsDutyRecEntity.class); |
|
|
|
ImsDutyRecEntity dutyRec = BeanUtil.copy(recDTO, ImsDutyRecEntity.class); |
|
|
|
// 更新交班值班
|
|
|
|
// 更新交班值班
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(headDutyMain)&&ObjectUtil.isNotEmpty(headDutyMain.getId())) { |
|
|
|
Assert.isTrue(imsDutyMainService.updateById(headDutyMain), () -> { |
|
|
|
Assert.isTrue(imsDutyMainService.updateById(headDutyMain), () -> { |
|
|
|
throw new RuntimeException("更新交班状态失败,交班执行对象为:" + JSON.toJSONString(recDTO.getHeadDutyMainVo())); |
|
|
|
throw new RuntimeException("更新交班状态失败,交班执行对象为:" + JSON.toJSONString(recDTO.getHeadDutyMainVo())); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
log.info("更新交班状态:"+carryDutyMain); |
|
|
|
|
|
|
|
} |
|
|
|
// 更新接班值班
|
|
|
|
// 更新接班值班
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(carryDutyMain)&&ObjectUtil.isNotEmpty(carryDutyMain.getId())) { |
|
|
|
Assert.isTrue(imsDutyMainService.updateById(carryDutyMain), () -> { |
|
|
|
Assert.isTrue(imsDutyMainService.updateById(carryDutyMain), () -> { |
|
|
|
throw new RuntimeException("更新接班状态失败,交班执行对象为:" + JSON.toJSONString(recDTO.getHeadDutyMainVo())); |
|
|
|
throw new RuntimeException("更新接班状态失败,交班执行对象为:" + JSON.toJSONString(recDTO.getHeadDutyMainVo())); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
log.info("更新接班状态:"+carryDutyMain); |
|
|
|
|
|
|
|
} |
|
|
|
// 更新交接班
|
|
|
|
// 更新交接班
|
|
|
|
this.updateById(dutyRec); |
|
|
|
if (ObjectUtil.isNotEmpty(dutyRec)&&ObjectUtil.isNotEmpty(dutyRec.getId())) { |
|
|
|
return true; |
|
|
|
return this.updateById(dutyRec); |
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
|
|
log.error("更新交接班记录失败"+dutyRec.toString()); |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|