|
@@ -495,11 +495,21 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
|
|
|
jobNodeItemWrapper.eq("job_id", enforceJob.getId());
|
|
|
jobNodeItemWrapper.eq("correct_type", "DEADLINE");
|
|
|
Long itemCount = enforceJobNodeItemService.count(jobNodeItemWrapper);
|
|
|
+ List<String> timeList = new ArrayList<>();
|
|
|
+
|
|
|
if (CollectionUtils.isNotEmpty(items)) {
|
|
|
- items.stream().forEach(e -> {
|
|
|
- EnforceJob reviewJob = new EnforceJob();
|
|
|
- JSONObject item = (JSONObject) e;
|
|
|
+ items.stream().forEach(eee -> {
|
|
|
+ JSONObject item = (JSONObject) eee;
|
|
|
String time = item.getString("time");
|
|
|
+ if (!timeList.contains(time)) {
|
|
|
+ timeList.add(time);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ if (CollectionUtils.isNotEmpty(timeList)) {
|
|
|
+ timeList.stream().forEach(time -> {
|
|
|
+ EnforceJob reviewJob = new EnforceJob();
|
|
|
Date date = null;
|
|
|
try {
|
|
|
date = format2.parse(time);
|
|
@@ -513,7 +523,7 @@ public class EnforceJobServiceImpl extends ServiceImpl<EnforceJobMapper, Enforce
|
|
|
String workDays = DateUtils.getWorkDays(date, 3, holidayCacheService);
|
|
|
date = format.parse(workDays);
|
|
|
} catch (Exception exception) {
|
|
|
- log.error("获取3个工作日后的日期失败", e);
|
|
|
+ log.error("获取3个工作日后的日期失败", time);
|
|
|
throw new ServiceException("获取3个工作日后的日期失败");
|
|
|
}
|
|
|
reviewJob.setLastEnforceDate(date);
|