Browse Source

feat:用录入时间计算初核状态

master
buaixuexideshitongxue 4 weeks ago
parent
commit
9947ddb625
  1. 5
      src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java
  2. 8
      src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java

5
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") @Schema(description = "涉嫌问题List")
private List<String> involveProblemIdList = new ArrayList<>(); private List<String> involveProblemIdList = new ArrayList<>();
@Schema(description = "录入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<LocalDateTime> crtTime = new ArrayList<>();
@Override @Override
public void check() { public void check() {
if (CollectionUtil.isNotEmpty(discoveryTimeList)){ if (CollectionUtil.isNotEmpty(discoveryTimeList)){

8
src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java

@ -351,7 +351,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
collectionUpdateParam.setStatus("1"); collectionUpdateParam.setStatus("1");
// 更新初核 // 更新初核
if (complaint.getGwf2() == null ) { if (complaint.getGwf2() == null ) {
LocalDateTime discoveryTime = complaint.getDiscoveryTime(); LocalDateTime discoveryTime = complaint.getCreateTime();
long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY; long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY;
long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds); long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds);
String initialReviewStatus = (remainingAtInitial < 0) ? String initialReviewStatus = (remainingAtInitial < 0) ?
@ -716,7 +716,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
ComplaintCollection complaintCollection = complaintCollectionList.get(0); ComplaintCollection complaintCollection = complaintCollectionList.get(0);
// 有附件 + 有核查情况 = 初核 // 有附件 + 有核查情况 = 初核
if (StrUtil.isBlank(complaintCollection.getGwf2()) && request.getCheckStatusCode() != null && CollectionUtil.isNotEmpty(request.getFiles())) { 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 maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY;
long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds); long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds);
String initialReviewStatus = (remainingAtInitial < 0) ? String initialReviewStatus = (remainingAtInitial < 0) ?
@ -760,7 +760,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
complaintCollectionQueryParam.setId(request.getComplaintId()); complaintCollectionQueryParam.setId(request.getComplaintId());
List<ComplaintCollection> complaintCollectionList = complaintCollectionResourceService.query(complaintCollectionQueryParam); List<ComplaintCollection> complaintCollectionList = complaintCollectionResourceService.query(complaintCollectionQueryParam);
ComplaintCollection complaintCollection = complaintCollectionList.get(0); ComplaintCollection complaintCollection = complaintCollectionList.get(0);
LocalDateTime discoveryTime = complaintCollection.getDiscoveryTime(); LocalDateTime discoveryTime = complaintCollection.getCrtTime();
long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY; long maxSeconds = CHECK_LIMIT_DAYS * TimeUtil.SECONDS_OF_A_DAY;
long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds); long remainingAtInitial = TimeUtil.getRemainingDuration(discoveryTime, LocalDateTime.now(), maxSeconds);
String initialReviewStatus = (remainingAtInitial < 0) ? String initialReviewStatus = (remainingAtInitial < 0) ?
@ -1158,7 +1158,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
if (dto == null || StrUtil.isBlank(dto.getId())) { if (dto == null || StrUtil.isBlank(dto.getId())) {
return; return;
} }
LocalDateTime discoveryTime = dto.getDiscoveryTime(); LocalDateTime discoveryTime = dto.getCreateTime();
if (discoveryTime == null) { if (discoveryTime == null) {
dto.setRemainingDuration(null); dto.setRemainingDuration(null);
return; return;

Loading…
Cancel
Save