From 4072773d7013f34a0697f9716d380c253300f7e5 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Tue, 7 Apr 2026 17:59:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=8A=95=E8=AF=89?= =?UTF-8?q?=E4=B8=BE=E6=8A=A5=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplaintCollectionUpdateRequest.java | 7 ++++++ .../ComplaintCollectionServiceImpl.java | 23 +++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java index ec66fac..db658fd 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionUpdateRequest.java @@ -74,11 +74,18 @@ public class ComplaintCollectionUpdateRequest implements ParamChecked { @Schema(description = "附件列表") private List thingFiles = new ArrayList<>(); + + @Schema(description = "问题id") + private String negativeId; + @Override public void check() { if (StrUtil.isBlank(id)) { throw new IllegalArgumentException("id不能为空"); } + if (StrUtil.isBlank(negativeId)) { + throw new IllegalArgumentException("问题id不能为空"); + } boolean nothingToUpdate = discoveryTime == null && StrUtil.isBlank(responderName) 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 d6779bc..bcffb92 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -174,6 +174,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic @Override @Transactional(rollbackFor = Exception.class) public Result updateComplaintCollection(ComplaintCollectionUpdateRequest request) { + Map sourceDict = buildDictLabelMap(SupDictEnum.SFSS_SOURCE_TABLE.getCode()); // 只有市局管理员可以修改 Set allowUpdateRoles = Set.of(RoleCodeEnum.FIRST_ADMIN.getCode(), RoleCodeEnum.ADMIN_1_12337.getCode()); UserAuth user = UserContextHolder.getCurrentUser(); @@ -213,8 +214,26 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic if (!ok) { throw new RuntimeException("修改失败"); } - complaintCollectionFileResourceService.delByComplaintCollectionId(id); - saveThingFilesOrThrow(id, request.getThingFiles()); +// complaintCollectionFileResourceService.delByComplaintCollectionId(id); +// saveThingFilesOrThrow(id, request.getThingFiles()); + NegativeDto negativeDto = new NegativeDto(); + negativeDto.setId(request.getNegativeId()); + negativeDto.setBusinessTypeCode(request.getBusinessTypeCode()); + negativeDto.setBusinessTypeName(request.getBusinessTypeName()); + negativeDto.setDiscoveryTime(request.getDiscoveryTime()); + negativeDto.setInvolveProblem(request.getInvolveProblemIdList()); + negativeDto.setThingDesc(request.getThingDesc()); + negativeDto.setInvolveDepartId(request.getSecondDepartId()); + // 问题来源 + if (ComplaintCollectionSourceTableEnum.LEADER_ASSIGN.getCode().equals(request.getSourceTable())) { + negativeDto.setProblemSourcesCode(request.getSourceTableSubOne()); + negativeDto.setProblemSources(sourceDict.get(request.getSourceTableSubOne())); + }else { + negativeDto.setProblemSourcesCode(request.getSourceTable()); + negativeDto.setProblemSources(sourceDict.get(request.getSourceTable())); + } + + negativeService.updateNegative(negativeDto); return Result.success(true); }