From caf54923fb2f8956c97b6a65528a19b336f94214 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Mon, 5 Jan 2026 12:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E8=AE=BF=E6=B6=89=E8=AF=89--=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplaintCollectionCheckFileMapper.java | 19 ++++++ .../entity/ComplaintCollectionCheckFile.java | 59 +++++++++++++++++++ ...ComplaintCollectionAndBlameAddRequest.java | 9 +++ ...intCollectionCheckFileResourceService.java | 30 ++++++++++ .../ComplaintCollectionServiceImpl.java | 29 ++++++--- .../ComplaintCollectionCheckFileMapper.xml | 33 +++++++++++ 6 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/mapper/ComplaintCollectionCheckFileMapper.java create mode 100644 src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollectionCheckFile.java create mode 100644 src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java create mode 100644 src/main/resources/mapper/ComplaintCollectionCheckFileMapper.xml diff --git a/src/main/java/com/biutag/supervision/mapper/ComplaintCollectionCheckFileMapper.java b/src/main/java/com/biutag/supervision/mapper/ComplaintCollectionCheckFileMapper.java new file mode 100644 index 0000000..c57ad03 --- /dev/null +++ b/src/main/java/com/biutag/supervision/mapper/ComplaintCollectionCheckFileMapper.java @@ -0,0 +1,19 @@ +package com.biutag.supervision.mapper; + +import com.biutag.supervision.pojo.entity.ComplaintCollectionCheckFile; +import com.biutag.supervision.repository.base.HBaseMapper; + +import java.util.List; + +/** + * @ClassName ComplaintCollectionCheckFileMapper + * @Description ComplaintCollectionCheckFileMapper + * @Author shihao + * @Date 2026/1/5 11:33 + */ +public interface ComplaintCollectionCheckFileMapper extends HBaseMapper { + + + int insertBatch(List list); + +} diff --git a/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollectionCheckFile.java b/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollectionCheckFile.java new file mode 100644 index 0000000..79090e5 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/entity/ComplaintCollectionCheckFile.java @@ -0,0 +1,59 @@ +package com.biutag.supervision.pojo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +/** + * @ClassName ComplaintCollectionFile + * @Description 涉访涉诉附件表 + * @Author shihao + * @Date 2025/12/31 15:09 + */ +@Getter +@Setter +@Schema(description = "涉访涉诉核查附件表") +@TableName("complaint_collection_check_file") +public class ComplaintCollectionCheckFile { + + @Schema(description = "附件ID") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "关联 complaint_collection 主键ID") + @TableField("complaint_id") + private String complaintId; + + @Schema(description = "文件路径") + @TableField("file_path") + private String filePath; + + @Schema(description = "文件名称") + @TableField("file_name") + private String fileName; + + + @Schema(description = "'核查情况'") + @TableField("check_status") + private String checkStatus; + + + @Schema(description = "'核查情况名字'") + @TableField("check_status_name") + private String checkStatusName; + + @Schema(description = "创建人") + @TableField("create_by") + private String createBy; + + @Schema(description = "创建时间") + @TableField("create_time") + private LocalDateTime createTime; +} + diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java index 3b6393e..77b9a7e 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionAndBlameAddRequest.java @@ -3,6 +3,7 @@ package com.biutag.supervision.pojo.request.complaintCollection; import com.biutag.supervision.aop.ParamChecked; import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionHandleMethodEnum; import com.biutag.supervision.pojo.enums.complaintCollection.YesOrNoEnum; +import com.biutag.supervision.pojo.vo.FileVo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Getter; @@ -31,6 +32,14 @@ public class ComplaintCollectionAndBlameAddRequest implements ParamChecked { // } } + @Schema(description = "核查办理附件列表") + private List files = new ArrayList<>(); + + + @Schema(description = "信件附件") + private List thingFiles = new ArrayList<>(); + + @Schema(description = "涉访涉诉表ID") private String complaintId; diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java new file mode 100644 index 0000000..1512955 --- /dev/null +++ b/src/main/java/com/biutag/supervision/repository/complaintCollectionCheckFile/ComplaintCollectionCheckFileResourceService.java @@ -0,0 +1,30 @@ +package com.biutag.supervision.repository.complaintCollectionCheckFile; + +import com.biutag.supervision.mapper.ComplaintCollectionCheckFileMapper; +import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.entity.ComplaintCollectionCheckFile; +import com.biutag.supervision.repository.base.BaseDAO; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName ComplaintCollectionCheckFileResourceService + * @Description ComplaintCollectionCheckFileResourceService + * @Author shihao + * @Date 2026/1/5 11:32 + */ +@Service +public class ComplaintCollectionCheckFileResourceService extends BaseDAO { + + + @Resource + private ComplaintCollectionCheckFileMapper complaintCollectionCheckFileMapper; + + public Result createComplaintCollectionCheckFile(List complaintCollectionFiles) { + innerBatchInsert(complaintCollectionCheckFileMapper, complaintCollectionFiles, "添加失败！"); + return Result.success(Boolean.TRUE); + } + +} 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 575434f..7094c97 100644 --- a/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/complaintCollection/ComplaintCollectionServiceImpl.java @@ -7,11 +7,9 @@ import cn.hutool.core.lang.Opt; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.enums.*; -import com.biutag.supervision.flow.FlowService; import com.biutag.supervision.flow.action.ApplyCompletionAction; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.domain.Blame; @@ -35,6 +33,7 @@ import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionPag import com.biutag.supervision.pojo.vo.complaintCollection.ComplaintCollectionWatchDetailVO; import com.biutag.supervision.repository.complaintCollection.ComplaintCollectionResourceService; import com.biutag.supervision.repository.complaintCollectionBlame.ComplaintCollectionBlameResourceService; +import com.biutag.supervision.repository.complaintCollectionCheckFile.ComplaintCollectionCheckFileResourceService; import com.biutag.supervision.repository.complaintCollectionFile.ComplaintCollectionFileResourceService; import com.biutag.supervision.repository.supPolice.SupPoliceResourceService; import com.biutag.supervision.repository.supdepart.SupDepartResourceService; @@ -68,20 +67,15 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic private final ComplaintCollectionBlameResourceService complaintCollectionBlameResourceService; private final SupDictDataService dictDataService; private final NegativeService negativeService; - private final FlowService flowService; private final NegativeThingFileService thingFileService; - private final NegativeQueryService negativeQueryService; - private final NegativeTaskService negativeTaskService; - private final DepartNegativeRateService departNegativeRateService; - private final NegativeWorkService negativeWorkService; - private final NegativeScoreService negativeScoreService; private final SupDepartService departService; - private final DataCaseVerifService dataCaseVerifService; private final SupDepartResourceService supDepartResourceService; private final ApplyCompletionAction applyCompletionAction; private final NegativeBlameService negativeBlameService; private final SupPoliceResourceService supPoliceResourceService; private final ComplaintCollectionFileResourceService complaintCollectionFileResourceService; + private final ComplaintCollectionCheckFileResourceService complaintCollectionCheckFileResourceService; + private final NegativeFileService negativeFileService; @Override @Transactional(rollbackFor = Exception.class) @@ -329,6 +323,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic result.add(blameEntity); } } + // 涉及人 complaintCollectionBlameResourceService.createComplaintCollectionBlame(result); } else { // 生成问题 @@ -342,6 +337,21 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic VerifyData verifyData = buildVerifyData(request); applyCompletionAction.updateNegative(negative, verifyData); } + // 涉访涉诉核查办理附件 + List files = request.getFiles(); + List complaintCollectionFiles = new ArrayList<>(); + for (FileVo file : files) { + ComplaintCollectionCheckFile complaintCollectionCheckFile = new ComplaintCollectionCheckFile(); + complaintCollectionCheckFile.setComplaintId(request.getComplaintId()); + complaintCollectionCheckFile.setFileName(file.getFileName()); + complaintCollectionCheckFile.setFilePath(file.getFilePath()); + complaintCollectionCheckFile.setCheckStatus(checkStatus); + complaintCollectionCheckFile.setCheckStatusName(request.getCheckStatusName()); + complaintCollectionCheckFile.setCreateBy(UserContextHolder.getCurrentUser().getUserName()); + complaintCollectionCheckFile.setCreateTime(LocalDateTime.now()); + complaintCollectionFiles.add(complaintCollectionCheckFile); + } + complaintCollectionCheckFileResourceService.createComplaintCollectionCheckFile(complaintCollectionFiles); return Result.success(true); } @@ -476,6 +486,7 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic dto.setThingDesc(request.getThingDesc()); dto.setInvolveDepartName(request.getInvolveDepartName()); dto.setInvolveDepartId(request.getInvolveDepartId()); + dto.setThingFiles(request.getThingFiles()); return dto; } diff --git a/src/main/resources/mapper/ComplaintCollectionCheckFileMapper.xml b/src/main/resources/mapper/ComplaintCollectionCheckFileMapper.xml new file mode 100644 index 0000000..aed929f --- /dev/null +++ b/src/main/resources/mapper/ComplaintCollectionCheckFileMapper.xml @@ -0,0 +1,33 @@ + + + + + + INSERT INTO complaint_collection_check_file ( + id, + complaint_id, + file_path, + file_name, + check_status, + check_status_name, + create_by, + create_time + ) + VALUES + + ( + #{item.id}, + #{item.complaintId}, + #{item.filePath}, + #{item.fileName}, + #{item.checkStatus}, + #{item.checkStatusName}, + #{item.createBy}, + #{item.createTime} + ) + + + +