|
|
|
@ -245,7 +245,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
|
|
|
|
|
} |
|
|
|
|
ImsDutyLogEntity imsDutyLogEntity = recDTO.getImsDutyLogEntity(); |
|
|
|
|
imsDutyLogEntity.setHandTime(DateUtil.format(new Date(),PATTERN_DATETIME)); |
|
|
|
|
imsDutyLogService.save(imsDutyLogEntity); |
|
|
|
|
imsDutyLogService.saveOrUpdate(imsDutyLogEntity); |
|
|
|
|
// 开启值班交接班流程
|
|
|
|
|
recEntity.setQrCodeContent(System.currentTimeMillis() + ""); |
|
|
|
|
BladeFlow bladeFlow = this.startDutyRecProcess(recEntity, managerId); |
|
|
|
@ -319,6 +319,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
|
|
|
|
|
variable |
|
|
|
|
); |
|
|
|
|
Assert.isTrue(flowResult.isSuccess(),() -> { |
|
|
|
|
log.error("交接班请求报错"+flowResult.getMsg()); |
|
|
|
|
throw new ServiceException(flowResult.getMsg()); |
|
|
|
|
}); |
|
|
|
|
return flowResult.getData(); |
|
|
|
@ -487,6 +488,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
|
|
|
|
|
Long dutyId = imsDutyRecVO.getDutyId(); |
|
|
|
|
ImsDutyLogEntity dutyLogEntity = imsDutyLogService.getOne(new LambdaQueryWrapper<ImsDutyLogEntity>() {{ |
|
|
|
|
eq(ImsDutyLogEntity::getDutyId, dutyId); |
|
|
|
|
last(" limit 1;"); |
|
|
|
|
}}); |
|
|
|
|
imsDutyRecVO.setImsDutyLogEntity(dutyLogEntity); |
|
|
|
|
} |
|
|
|
@ -1606,10 +1608,6 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
|
|
|
|
|
Integer doingNum = operateTicketInfoData.size() - finishSize - invalidSize; |
|
|
|
|
dutyLogEntity.setOperationUnFinish(doingNum.toString()); |
|
|
|
|
} |
|
|
|
|
TicketStatisticDTO ticketStatisticDTO=new TicketStatisticDTO(); |
|
|
|
|
ticketStatisticDTO.setStartDate(DateUtil.format(classEntity.getStartTime(),"yyyy-MM-dd HH:mm:ss")); |
|
|
|
|
ticketStatisticDTO.setEndDate(DateUtil.format(classEntity.getEndTime(),"yyyy-MM-dd HH:mm:ss")); |
|
|
|
|
ticketStatisticDTO.setDeptIds(deptId); |
|
|
|
|
return R.data(dutyLogEntity); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|