admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2024-03-12 11:26:41 +08:00
parent 53b0c330b2
commit 55ee46b341
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/async/AsyncWorker.java
View File

@ -70,7 +70,12 @@ public class AsyncWorker {
List<WorkerInfo> 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");

8
src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
View File

@ -94,8 +94,14 @@ public class RtWorkTicketServiceImpl extends ServiceImpl<RtWorkTicketMapper, RtW
.or().isNull(endTime));
queryWrapper.and(qw -> 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;
}