Browse Source

fix--删除投诉举报不必要的代码

feature/tsjb-1.0
buaixuexideshitongxue 4 weeks ago
parent
commit
b2882ca308
  1. 14
      src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java
  2. 16
      src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java
  3. 60
      src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java

14
src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java

@ -6,7 +6,6 @@ import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO;
import com.biutag.supervision.pojo.request.complaintCollection.*;
import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionDetailVo;
import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionHandlerDataVo;
import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionMailRepeattVo;
import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO;
import com.biutag.supervision.service.complaintCollection.ComplaintCollectionService;
@ -77,12 +76,6 @@ public class ComplaintCollectionController {
return complaintCollectionService.maileRepeatt(request);
}
@Deprecated
@Operation(description = "办理页面初始化数据回显")
@PostMapping("/handlerData")
public Result<ComplaintCollectionHandlerDataVo> handlerData(@RequestBody ComplaintCollectionHandlerDataRequest request){
return complaintCollectionService.handlerData(request);
}
@Operation(description = "导出数据")
@PostMapping("/exportData")
@ -91,13 +84,6 @@ public class ComplaintCollectionController {
}
@Deprecated
@Operation(description = "强制终结")
@PostMapping("/forceTermination")
public Result<Boolean> forceTermination(@RequestBody ComplaintCollectionForceTerminationRequest request){
return complaintCollectionService.forceTermination(request);
}
@Operation(description = "办理页面保存:保存涉及人员/领导等JSON")
@PostMapping("/saveInvolveJson")
public Result<Boolean> saveInvolveJson(@RequestBody ComplaintCollectionSaveInvolveJsonRequest request){

16
src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java

@ -72,14 +72,6 @@ public interface ComplaintCollectionService {
*/
Result<ComplaintCollectionMailRepeattVo> maileRepeatt(ComplaintCollectionMailRepeattRequest request);
/**
* 办理详情
* @param request
* @return
*/
@Deprecated
Result<ComplaintCollectionHandlerDataVo> handlerData(ComplaintCollectionHandlerDataRequest request);
/**
* 数据导出
* @param request
@ -87,14 +79,6 @@ public interface ComplaintCollectionService {
* @return
*/
void exportData(ComplaintCollectionPageRequest request, HttpServletResponse response);
/**
* 强制终结
* @param request
* @return
*/
Result<Boolean> forceTermination(ComplaintCollectionForceTerminationRequest request);
/**
* 办理页面保存保存临时办理信息
* @param request

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

@ -428,37 +428,6 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
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
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) {
List<ComplaintCollectionPersonExcelDTO> res = new ArrayList<>();
Map<String, List<ComplaintCollectionBlame>> complaintCollectionBlameMap = blameList.stream()

Loading…
Cancel
Save