diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java index 2a8229c..1cdb700 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java @@ -82,6 +82,11 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "涉嫌问题List") private List involveProblemIdList = new ArrayList<>(); + @Schema(description = "录入时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List crtTime = new ArrayList<>(); + + @Override public void check() { if (CollectionUtil.isNotEmpty(discoveryTimeList)){ diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java index 751fdde..f98e612 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -351,7 +351,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic collectionUpdateParam.setStatus("1"); // 更新初核 if (complaint.getGwf2() == null ) { - LocalDateTime discoveryTime = complaint.getDiscoveryTime(); + LocalDateTime discoveryTime = complaint.getCreateTime(); long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY; long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds); String initialReviewStatus = (remainingAtInitial < 0) ? @@ -716,7 +716,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic ComplaintCollection complaintCollection = complaintCollectionList.get(0); // 有附件 + 有核查情况 = 初核 if (StrUtil.isBlank(complaintCollection.getGwf2()) && request.getCheckStatusCode() != null && CollectionUtil.isNotEmpty(request.getFiles())) { - LocalDateTime discoveryTime = complaintCollection.getDiscoveryTime(); + LocalDateTime discoveryTime = complaintCollection.getCreateTime(); long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY; long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds); String initialReviewStatus = (remainingAtInitial < 0) ? @@ -760,7 +760,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic complaintCollectionQueryParam.setId(request.getComplaintId()); List complaintCollectionList = complaintCollectionResourceService.query(complaintCollectionQueryParam); ComplaintCollection complaintCollection = complaintCollectionList.get(0); - LocalDateTime discoveryTime = complaintCollection.getDiscoveryTime(); + LocalDateTime discoveryTime = complaintCollection.getCrtTime(); long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY; long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds); String initialReviewStatus = (remainingAtInitial < 0) ? @@ -1158,7 +1158,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic if (dto == null || StrUtil.isBlank(dto.getId())) { return; } - LocalDateTime discoveryTime = dto.getDiscoveryTime(); + LocalDateTime discoveryTime = dto.getCreateTime(); if (discoveryTime == null) { dto.setRemainingDuration(null); return;