|
|
|
@ -428,37 +428,6 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
return Result.success(complaintCollectionMailRepeattVo); |
|
|
|
return Result.success(complaintCollectionMailRepeattVo); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Deprecated |
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public Result<ComplaintCollectionHandlerDataVo> handlerData(ComplaintCollectionHandlerDataRequest request) { |
|
|
|
|
|
|
|
ComplaintCollectionHandlerDataVo complaintCollectionHandlerDataVo = new ComplaintCollectionHandlerDataVo(); |
|
|
|
|
|
|
|
ComplaintCollectionQueryParam complaintCollectionQueryParam = new ComplaintCollectionQueryParam(); |
|
|
|
|
|
|
|
complaintCollectionQueryParam.setId(request.getId()); |
|
|
|
|
|
|
|
ComplaintCollection complaintCollection = complaintCollectionResourceService.query(complaintCollectionQueryParam).get(0); |
|
|
|
|
|
|
|
ComplaintCollectionCheckFileQueryParam complaintCollectionCheckFileQueryParam = new ComplaintCollectionCheckFileQueryParam(); |
|
|
|
|
|
|
|
complaintCollectionCheckFileQueryParam.setComplaintId(request.getId()); |
|
|
|
|
|
|
|
List<ComplaintCollectionCheckFile> complaintCollectionCheckFiles = complaintCollectionCheckFileResourceService.query(complaintCollectionCheckFileQueryParam); |
|
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(complaintCollectionCheckFiles)) { |
|
|
|
|
|
|
|
List<ComplaintCollectionHandlerDataVo.FileVo> files = complaintCollectionCheckFiles.stream().map(item -> { |
|
|
|
|
|
|
|
ComplaintCollectionHandlerDataVo.FileVo fileVo = new ComplaintCollectionHandlerDataVo.FileVo(); |
|
|
|
|
|
|
|
fileVo.setFileName(item.getFileName()); |
|
|
|
|
|
|
|
fileVo.setFilePath(item.getFilePath()); |
|
|
|
|
|
|
|
return fileVo; |
|
|
|
|
|
|
|
}).toList(); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setFiles(files); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setInvolveJson(complaintCollection.getGwf1()); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setCheckStatusCode(complaintCollection.getCheckStatus()); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setCheckStatusName(complaintCollection.getCheckStatusName()); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setCheckStatusDesc(complaintCollection.getCheckStatusDesc()); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setAccountabilityTarget(complaintCollection.getAccountabilityTarget()); |
|
|
|
|
|
|
|
String involveDepartId = complaintCollection.getThirdDepartId() == null ? complaintCollection.getSecondDepartId() : complaintCollection.getThirdDepartId(); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setInvolveDepartId(involveDepartId); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setCompletionStatus(complaintCollection.getCompletionStatus()); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setPublicRecognition(complaintCollection.getPublicRecognition()); |
|
|
|
|
|
|
|
complaintCollectionHandlerDataVo.setCaseNumber(complaintCollection.getCaseNumber()); |
|
|
|
|
|
|
|
return Result.success(complaintCollectionHandlerDataVo); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void exportData(ComplaintCollectionPageRequest request, HttpServletResponse response) { |
|
|
|
public void exportData(ComplaintCollectionPageRequest request, HttpServletResponse response) { |
|
|
|
@ -512,35 +481,6 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public Result<Boolean> forceTermination(ComplaintCollectionForceTerminationRequest request) { |
|
|
|
|
|
|
|
// 只有市局管理员可以修改
|
|
|
|
|
|
|
|
Set<String> allowUpdateRoles = Set.of(RoleCodeEnum.FIRST_ADMIN.getCode(), RoleCodeEnum.ADMIN_1_12337.getCode()); |
|
|
|
|
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
|
|
|
|
List<String> roleCodes = user.getRoleCodes(); |
|
|
|
|
|
|
|
if (CollectionUtil.isEmpty(roleCodes) || roleCodes.stream().noneMatch(allowUpdateRoles::contains)) { |
|
|
|
|
|
|
|
throw new IllegalStateException("只有[市局管理员、信访投诉-市局管理员]可以强制终结!"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
ComplaintCollectionQueryParam complaintCollectionQueryParam = new ComplaintCollectionQueryParam(); |
|
|
|
|
|
|
|
complaintCollectionQueryParam.setId(request.getComplaintId()); |
|
|
|
|
|
|
|
List<ComplaintCollection> complaintCollectionList = complaintCollectionResourceService.query(complaintCollectionQueryParam); |
|
|
|
|
|
|
|
ComplaintCollection complaintCollection = complaintCollectionList.get(0); |
|
|
|
|
|
|
|
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) ? |
|
|
|
|
|
|
|
ComplaintCollectionInitialEnum.TIMEOUT_UPLOAD.getCode() : ComplaintCollectionInitialEnum.UPLOADED.getCode(); |
|
|
|
|
|
|
|
ComplaintCollectionUpdateParam complaintCollectionUpdateParam = new ComplaintCollectionUpdateParam(); |
|
|
|
|
|
|
|
complaintCollectionUpdateParam.setId(request.getComplaintId()); |
|
|
|
|
|
|
|
// 初核时间
|
|
|
|
|
|
|
|
complaintCollectionUpdateParam.setGwf2(LocalDateTime.now().format(INITIAL_REVIEW_FMT)); |
|
|
|
|
|
|
|
// 初核状态
|
|
|
|
|
|
|
|
complaintCollectionUpdateParam.setGwf3(initialReviewStatus); |
|
|
|
|
|
|
|
complaintCollectionUpdateParam.setStatus(ComplaintCollectionStatusEnum.FORCE_RESOLVED.getCode()); |
|
|
|
|
|
|
|
return Result.success(complaintCollectionResourceService.updateSelectiveById(complaintCollectionUpdateParam)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<ComplaintCollectionPersonExcelDTO> buildComplaintCollectionPersonExcelDTO(List<ComplaintCollectionBlame> blameList, List<NegativeBlame> negativeBlames, List<ComplaintCollectionPageDTO> dataList) { |
|
|
|
private List<ComplaintCollectionPersonExcelDTO> buildComplaintCollectionPersonExcelDTO(List<ComplaintCollectionBlame> blameList, List<NegativeBlame> negativeBlames, List<ComplaintCollectionPageDTO> dataList) { |
|
|
|
List<ComplaintCollectionPersonExcelDTO> res = new ArrayList<>(); |
|
|
|
List<ComplaintCollectionPersonExcelDTO> res = new ArrayList<>(); |
|
|
|
Map<String, List<ComplaintCollectionBlame>> complaintCollectionBlameMap = blameList.stream() |
|
|
|
Map<String, List<ComplaintCollectionBlame>> complaintCollectionBlameMap = blameList.stream() |
|
|
|
|