From 2950af746c359ee86d9cfd64a58b25f4fdd571a6 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Thu, 30 Apr 2026 11:14:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/ComplaintCollectionController.java | 8 -- .../ComplaintCollectionService.java | 7 -- .../ComplaintCollectionServiceImpl.java | 78 ------------------- 3 files changed, 93 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java index ee67d1a..4c22577 100644 --- a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java +++ b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java @@ -85,14 +85,6 @@ public class ComplaintCollectionController { } - @Deprecated - @Operation(description = "查看详情") - @PostMapping("/watchDetail") - public Result watchDetail(@RequestBody ComplaintCollectionWatchDetailRequest request){ - return complaintCollectionService.watchDetail(request); - } - - @Operation(description = "是否重复件") @PostMapping("/maileRepeatt") public Result maileRepeatt(@RequestBody ComplaintCollectionMailRepeattRequest request){ diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java index 8fb7df7..e826721 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java @@ -57,13 +57,6 @@ public interface ComplaintCollectionService { Result updateComplaintCollection(ComplaintCollectionUpdateRequest request); - /** - * 查看详情 - * @param request - * @return - */ - Result watchDetail(ComplaintCollectionWatchDetailRequest request); - /** * 是否重复件 * @param request diff --git a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java index a905609..59693a3 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -343,84 +343,6 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic - @Override - public Result watchDetail(ComplaintCollectionWatchDetailRequest request) { - // 基本信息+核查情况 - ComplaintCollectionQueryParam queryParam = new ComplaintCollectionQueryParam(); - queryParam.setId(request.getId()); - List query = complaintCollectionResourceService.query(queryParam); - if (CollectionUtil.isEmpty(query)) { - throw new RuntimeException("未找到详情"); - } - ComplaintCollection complaintCollection = query.get(0); - ComplaintCollectionWatchDetailVO vo = ComplaintCollectionTransfer.INSTANCE.entityToWatchDetailVO(complaintCollection); - Map dictLabelMap = buildDictLabelMap(SupDictEnum.SUSPECT_PROBLEM.getCode()); - Map 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 personalBlames = negativeBlameService.list(request.getId()); - List blameLeaders = personalBlames.stream().map(Blame::getLeadIdCode).filter(StrUtil::isNotBlank).collect(Collectors.toSet()) - .stream().map(leaderIdCode -> { - VerifyData.BlameLeader blameLeader = new VerifyData.BlameLeader(); - List 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 complaintCollectionBlames = complaintCollectionBlameResourceService.query(complaintCollectionBlameQueryParam); - List blameLeaders = complaintCollectionBlames.stream().map(ComplaintCollectionBlame::getLeadIdCode).filter(StrUtil::isNotBlank).collect(Collectors.toSet()) - .stream().map(leaderIdCode -> { - VerifyData.BlameLeader blameLeader = new VerifyData.BlameLeader(); - List 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 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 complaintCollectionFiles = complaintCollectionFileResourceService.query(complaintCollectionFileQueryParam); - List thingFiles = ComplaintCollectionTransfer.INSTANCE.complaintCollectionFileToFileVo(complaintCollectionFiles); - // 佐证附件 - ComplaintCollectionCheckFileQueryParam complaintCollectionCheckFileQueryParam = new ComplaintCollectionCheckFileQueryParam(); - complaintCollectionCheckFileQueryParam.setComplaintId(request.getId()); - List complaintCollectionCheckFiles = complaintCollectionCheckFileResourceService.query(complaintCollectionCheckFileQueryParam); - List files = ComplaintCollectionTransfer.INSTANCE.complaintCollectionCheckFileToFileVo(complaintCollectionCheckFiles); - vo.setFiles(files); - vo.setThingFiles(thingFiles); - return Result.success(vo); - } - @Override public Result maileRepeatt(ComplaintCollectionMailRepeattRequest request) { List sfssList = buildSfss(request);