From fcaf2318374f64a569525a37b062c69dbec796ba Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Tue, 10 Feb 2026 12:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E7=BB=88=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/ComplaintCollectionController.java | 6 +++ .../ComplaintCollectionStatusEnum.java | 49 +++++++++++++++++++ .../ComplaintCollectionUpdateParam.java | 5 +- ...aintCollectionForceTerminationRequest.java | 29 +++++++++++ .../transfer/ComplaintCollectionTransfer.java | 8 +++ .../ComplaintCollectionService.java | 7 +++ 6 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionStatusEnum.java create mode 100644 src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionForceTerminationRequest.java 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 d7d2ebf..cb308d2 100644 --- a/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java +++ b/src/main/java/com/biutag/supervision/controller/data/ComplaintCollectionController.java @@ -107,4 +107,10 @@ public class ComplaintCollectionController { return complaintCollectionService.saveInvolveJson(request); } + @Operation(description = "强制终结") + @PostMapping("/forceTermination") + public Result forceTermination(@RequestBody ComplaintCollectionForceTerminationRequest request){ + return complaintCollectionService.forceTermination(request); + } + } diff --git a/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionStatusEnum.java b/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionStatusEnum.java new file mode 100644 index 0000000..1404a5a --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionStatusEnum.java @@ -0,0 +1,49 @@ +package com.biutag.supervision.pojo.enums.complaintCollection; + +import com.biutag.supervision.constants.enums.CodeEnum; +import lombok.Getter; + +/** + * @ClassName ComplaintCollectionStatusEnum + * @Description TODO + * @Author shihao + * @Date 2026/2/10 12:00 + */ +public enum ComplaintCollectionStatusEnum implements CodeEnum { + + + PROCEDURE_COMPLETED("0", "未办理"), + REASONABLE_DEMAND_RESOLVED("1", "已办结"), + FORCE_RESOLVED("2", "强制办结"); + + + private final String code; + private final String desc; + + ComplaintCollectionStatusEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + @Override + public String getCode() { + return code; + } + + @Override + public String getDesc() { + return desc; + } + + public static String getDescByCode(String code) { + if (code == null) { + return null; + } + for (ComplaintCollectionStatusEnum e : values()) { + if (e.code.equals(code)) { + return e.desc; + } + } + return null; + } +} diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java index eecfbba..2e5837f 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionUpdateParam.java @@ -111,7 +111,10 @@ public class ComplaintCollectionUpdateParam { @Schema(description = "是否整改") private String isRectifyCode; - @Schema(description = "状态，显示用，暂无实际意义 0为初始值") + /** + * @see com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionStatusEnum + */ + @Schema(description = "状态") private String status; @Schema(description = "涉及对象") diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionForceTerminationRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionForceTerminationRequest.java new file mode 100644 index 0000000..14aae63 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionForceTerminationRequest.java @@ -0,0 +1,29 @@ +package com.biutag.supervision.pojo.request.complaintCollection; + +import cn.hutool.core.util.StrUtil; +import com.biutag.supervision.aop.ParamChecked; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +/** + * @ClassName ComplaintCollectionForceTerminationRequest + * @Description 涉访涉诉强制终结请求 + * @Author shihao + * @Date 2026/2/10 11:46 + */ +@Setter +@Getter +@Schema(description = "涉访涉诉强制终结请求") +public class ComplaintCollectionForceTerminationRequest implements ParamChecked { + + @Schema(description = "涉访涉诉编号id") + private String complaintId; + @Override + public void check() { + if (StrUtil.isBlank(complaintId)) { + throw new IllegalArgumentException("涉访涉诉id不能为空"); + } + + } +} diff --git a/src/main/java/com/biutag/supervision/pojo/transfer/ComplaintCollectionTransfer.java b/src/main/java/com/biutag/supervision/pojo/transfer/ComplaintCollectionTransfer.java index 5d8d66e..dd1c288 100644 --- a/src/main/java/com/biutag/supervision/pojo/transfer/ComplaintCollectionTransfer.java +++ b/src/main/java/com/biutag/supervision/pojo/transfer/ComplaintCollectionTransfer.java @@ -5,12 +5,15 @@ import com.biutag.supervision.pojo.domain.Blame; import com.biutag.supervision.pojo.dto.complaintCollection.ComplaintCollectionPageDTO; import com.biutag.supervision.pojo.entity.ComplaintCollection; import com.biutag.supervision.pojo.entity.ComplaintCollectionBlame; +import com.biutag.supervision.pojo.entity.ComplaintCollectionCheckFile; +import com.biutag.supervision.pojo.entity.ComplaintCollectionFile; import com.biutag.supervision.pojo.param.ComplaintCollection.ComplaintCollectionQueryParam; import com.biutag.supervision.pojo.param.ComplaintCollection.ComplaintCollectionUpdateParam; import com.biutag.supervision.pojo.request.complaintCollection.ComplaintCollectionAddRequest; import com.biutag.supervision.pojo.request.complaintCollection.ComplaintCollectionPageRequest; import com.biutag.supervision.pojo.request.complaintCollection.ComplaintCollectionSaveInvolveJsonRequest; import com.biutag.supervision.pojo.request.complaintCollection.ComplaintCollectionUpdateRequest; +import com.biutag.supervision.pojo.vo.FileVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionPageVo; import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO; import org.mapstruct.Mapper; @@ -56,4 +59,9 @@ public interface ComplaintCollectionTransfer { List blameToBlameInfoVO(List pseronalList); ComplaintCollectionUpdateParam JsonRequestToUpdateParam(ComplaintCollectionSaveInvolveJsonRequest request); + + List complaintCollectionFileToFileVo(List complaintCollectionFiles); + + List complaintCollectionCheckFileToFileVo(List complaintCollectionCheckFiles); + } 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 e705be6..f91718e 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionService.java @@ -89,4 +89,11 @@ public interface ComplaintCollectionService { * @return */ Result saveInvolveJson(ComplaintCollectionSaveInvolveJsonRequest request); + + /** + * 强制终结 + * @param request + * @return + */ + Result forceTermination(ComplaintCollectionForceTerminationRequest request); }