diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java b/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java index 71e3de097..53265e13a 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java @@ -70,7 +70,12 @@ public class AsyncWorker { List list = workerInfoMapper.selectProjectWorkerInfoList(map); if (list.size() > 0) { for (WorkerInfo info : list) { - projectUfaceConfigService.sendBatchWorkerInfo(info, projectUfaceConfig, devList); + try { + projectUfaceConfigService.sendBatchWorkerInfo(info, projectUfaceConfig, devList); + } catch (Exception e) { + log.error("下发人员异常:人员名称:{}", info.getWorkerName()); + e.printStackTrace(); + } } } Long userId = MapUtils.getLong(map, "userId"); diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java index 8889b37a8..181b61b1a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java @@ -94,8 +94,14 @@ public class RtWorkTicketServiceImpl extends ServiceImpl qw.isNotNull(startTime) .or().isNotNull(endTime)); + } else if (Objects.equals(type, 2)) { + String startTime = alias + RefUtil.fieldNameUlc(RtWorkTicket::getStartTime); + String endTime = alias + RefUtil.fieldNameUlc(RtWorkTicket::getEndTime); + queryWrapper.not(qw -> qw.and(qw1 -> qw1.le(startTime, DateUtil.now()) + .or().isNull(startTime)).and(qw2 -> qw2.ge(endTime, DateUtil.now()) + .or().isNull(endTime)).and(qw3 -> qw3.isNotNull(startTime) + .or().isNotNull(endTime))); } - queryWrapper.le(Objects.equals(type, 2), RefUtil.fieldNameUlc(RtWorkTicket::getCreateTime), DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(DateUtil.date(), -1)))); return queryWrapper; }