Browse Source

fix:删除多余代码

feature/tsjb-1.0
parent
commit
2950af746c
  1. 8
      src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java
  2. 7
      src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java
  3. 78
      src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java

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

@ -85,14 +85,6 @@ public class ComplaintCollectionController {
}
@Deprecated
@Operation(description = "查看详情")
@PostMapping("/watchDetail")
public Result<ComplaintCollectionWatchDetailVO> watchDetail(@RequestBody ComplaintCollectionWatchDetailRequest request){
return complaintCollectionService.watchDetail(request);
}
@Operation(description = "是否重复件")
@PostMapping("/maileRepeatt")
public Result<ComplaintCollectionMailRepeattVo> maileRepeatt(@RequestBody ComplaintCollectionMailRepeattRequest request){

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

@ -57,13 +57,6 @@ public interface ComplaintCollectionService {
Result<Boolean> updateComplaintCollection(ComplaintCollectionUpdateRequest request);
/**
* 查看详情
* @param request
* @return
*/
Result<ComplaintCollectionWatchDetailVO> watchDetail(ComplaintCollectionWatchDetailRequest request);
/**
* 是否重复件
* @param request

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

@ -343,84 +343,6 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
@Override
public Result<ComplaintCollectionWatchDetailVO> watchDetail(ComplaintCollectionWatchDetailRequest request) {
// 基本信息+核查情况
ComplaintCollectionQueryParam queryParam = new ComplaintCollectionQueryParam();
queryParam.setId(request.getId());
List<ComplaintCollection> query = complaintCollectionResourceService.query(queryParam);
if (CollectionUtil.isEmpty(query)) {
throw new RuntimeException("未找到详情");
}
ComplaintCollection complaintCollection = query.get(0);
ComplaintCollectionWatchDetailVO vo = ComplaintCollectionTransfer.INSTANCE.entityToWatchDetailVO(complaintCollection);
Map<String, String> dictLabelMap = buildDictLabelMap(SupDictEnum.SUSPECT_PROBLEM.getCode());
Map<String, String> sfssDictLabelMap = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode());
vo.setInvolveProblemStr(CodeTranslateUtil.translateCodesToLabels(vo.getInvolveProblem(), dictLabelMap));
String sourceTable = CodeTranslateUtil.translateCodesToLabels(vo.getSourceTable(), sfssDictLabelMap);
String sourceTableSubOne = CodeTranslateUtil.translateCodesToLabels(vo.getSourceTableSubOne(), sfssDictLabelMap);
vo.setSourceTablePath(sourceTable + "/" + sourceTableSubOne);
String involveDepartName = Opt.ofNullable(complaintCollection.getSecondDepartName()).orElse("") + "/" + Opt.ofNullable(complaintCollection.getThirdDepartName()).orElse("");
vo.setInvolveDepartName(involveDepartName);
// 涉及信息
String checkStatus = complaintCollection.getCheckStatus();
boolean itTure = InspectCaseEnum.isItTure(checkStatus);
if (itTure) {
// 从negative_blame中读
List<Blame> personalBlames = negativeBlameService.list(request.getId());
List<VerifyData.BlameLeader> blameLeaders = personalBlames.stream().map(Blame::getLeadIdCode).filter(StrUtil::isNotBlank).collect(Collectors.toSet())
.stream().map(leaderIdCode -> {
VerifyData.BlameLeader blameLeader = new VerifyData.BlameLeader();
List<Blame> blames = personalBlames.stream().filter(blameObj -> leaderIdCode.equals(blameObj.getLeadIdCode())).toList();
// 取第一个
Blame blame = blames.get(0);
BeanUtil.copyProperties(blame, blameLeader);
blameLeader.setBlameIdCodes(blames.stream().map(Blame::getBlameIdCode).toList());
return blameLeader;
}).toList();
vo.setPersonalBlames(personalBlames);
vo.setBlameLeaders(blameLeaders);
} else {
// 从自己表里读
ComplaintCollectionBlameQueryParam complaintCollectionBlameQueryParam = new ComplaintCollectionBlameQueryParam();
complaintCollectionBlameQueryParam.setComplaintId(request.getId());
List<ComplaintCollectionBlame> complaintCollectionBlames = complaintCollectionBlameResourceService.query(complaintCollectionBlameQueryParam);
List<VerifyData.BlameLeader> blameLeaders = complaintCollectionBlames.stream().map(ComplaintCollectionBlame::getLeadIdCode).filter(StrUtil::isNotBlank).collect(Collectors.toSet())
.stream().map(leaderIdCode -> {
VerifyData.BlameLeader blameLeader = new VerifyData.BlameLeader();
List<ComplaintCollectionBlame> complaintCollectionBlameList = complaintCollectionBlames.stream().filter(blameObj -> leaderIdCode.equals(blameObj.getLeadIdCode())).toList();
// 取第一个
ComplaintCollectionBlame complaintCollectionBlame = complaintCollectionBlameList.get(0);
BeanUtil.copyProperties(complaintCollectionBlame, blameLeader);
blameLeader.setBlameIdCodes(complaintCollectionBlameList.stream().map(ComplaintCollectionBlame::getBlameIdCode).toList());
return blameLeader;
}).toList();
List<Blame> personalBlames = new ArrayList<>();
for (ComplaintCollectionBlame complaintCollectionBlame : complaintCollectionBlames) {
Blame blame = new Blame();
BeanUtil.copyProperties(complaintCollectionBlame, blame, CopyOptions.create().setIgnoreError(true));
blame.setIvPersonType(complaintCollectionBlame.getIvPersonTypeName());
blame.setIvPersonTypeCode(complaintCollectionBlame.getIvPersonTypeCode());
personalBlames.add(blame);
}
vo.setPersonalBlames(personalBlames);
vo.setBlameLeaders(blameLeaders);
}
// 附件
ComplaintCollectionFileQueryParam complaintCollectionFileQueryParam = new ComplaintCollectionFileQueryParam();
complaintCollectionFileQueryParam.setComplaintId(request.getId());
List<ComplaintCollectionFile> complaintCollectionFiles = complaintCollectionFileResourceService.query(complaintCollectionFileQueryParam);
List<FileVo> thingFiles = ComplaintCollectionTransfer.INSTANCE.complaintCollectionFileToFileVo(complaintCollectionFiles);
// 佐证附件
ComplaintCollectionCheckFileQueryParam complaintCollectionCheckFileQueryParam = new ComplaintCollectionCheckFileQueryParam();
complaintCollectionCheckFileQueryParam.setComplaintId(request.getId());
List<ComplaintCollectionCheckFile> complaintCollectionCheckFiles = complaintCollectionCheckFileResourceService.query(complaintCollectionCheckFileQueryParam);
List<FileVo> files = ComplaintCollectionTransfer.INSTANCE.complaintCollectionCheckFileToFileVo(complaintCollectionCheckFiles);
vo.setFiles(files);
vo.setThingFiles(thingFiles);
return Result.success(vo);
}
@Override
public Result<ComplaintCollectionMailRepeattVo> maileRepeatt(ComplaintCollectionMailRepeattRequest request) {
List<ComplaintCollectionRepeatDTO> sfssList = buildSfss(request);

Loading…
Cancel
Save