|
|
|
@ -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; |
|
|
|
|