src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java

@@ -35,8 +35,7 @@ public enum ProblemSourcesEnum {
     JYDC("警意调查", "3"),
     CFJD("执法监督", "4"),
     JCKH("检查考核", "8"),
-    QT("其他", "9"),
+    QT("其他", "9");
-    STXF("省厅下发", "32");
 
     private String label;
 

src/main/java/com/biutag/supervision/constants/enums/RoleCodeEnum.java

@@ -10,11 +10,7 @@ public enum RoleCodeEnum {
     ADMIN("admin"),
     FIRST_ADMIN("admin_1"),
     SECOND_ADMIN("admin_1_1_1_2"),
-    THREE_ADMIN("admin_1_1_1_3"),
+    THREE_ADMIN("admin_1_1_1_3");
-    ADMIN_1_12337("admin_1_12337"),
-    ADMIN_1_2("admin_1_2"),
-    ADMIN_1_3("admin_1_3"),
-    ADMIN_2("admin_2");
 
     private String code;
 

src/main/java/com/biutag/supervision/job/Job.java

@@ -13,7 +13,6 @@ import com.biutag.supervision.pojo.dto.mail.MailAttachmentDTO;
 import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.entity.mailbox.Mail;
 import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionHandleMethodEnum;
-import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionPublicApprovalEnum;
 import com.biutag.supervision.pojo.param.ComplaintCollection.ComplaintCollectionQueryParam;
 import com.biutag.supervision.pojo.param.SupDepartQueryParam;
 import com.biutag.supervision.pojo.param.SupExternalDepartQueryParam;
@@ -540,19 +539,9 @@ public class Job {
                 cc.setCheckStatusName("属实");
             } else if ("基本属实".equals(mail.getVerifyIsTrue())) {
                 cc.setCheckStatus("2");
-                cc.setCheckStatusName("部分属实");
+                cc.setCheckStatusName("基本属实");
-            } else if ("不属实".equals(mail.getVerifyIsTrue())) {
-                cc.setCheckStatus("5");
-                cc.setCheckStatusName("不属实");
             }
-            List<String> strList = List.of("非常满意", "基本满意");
+            cc.setCheckStatusDesc(mail.getVerifyDetails());
-            if (strList.contains(mail.getSatisfactionStatus())){
-                cc.setPublicRecognition(ComplaintCollectionPublicApprovalEnum.APPROVED.getCode());
-            }
-            if ("不满意".equals(mail.getSatisfactionStatus())){
-                cc.setPublicRecognition(ComplaintCollectionPublicApprovalEnum.NOT_APPROVED.getCode());
-            }
-            cc.setCheckStatusDesc(mail.getCompletionComment());
             cc.setProcessingStatus(mail.getMailState());
             toUpdate.add(cc);
             // 附件

src/main/java/com/biutag/supervision/pojo/param/negativeBlame/NegativeBlameConfinementQueryParam.java

@@ -1,25 +0,0 @@
-package com.biutag.supervision.pojo.param.negativeBlame;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Set;
-
-/**
- * @ClassName NegativeBlameConfinementQueryParam
- * @Description 涉及人查询，查找采取禁闭措施的数据
- * @Author shihao
- * @Date 2026/1/23 11:06
- */
-@Setter
-@Getter
-@Schema(description = "涉及人查询，查找采取禁闭措施的数据")
-public class NegativeBlameConfinementQueryParam {
-
-    @Schema(description = "涉及人员禁闭处罚ids")
-    private Set<String> confinementIds;
-
-    @Schema(description = "领导禁闭处罚ids")
-    private Set<String> leadConfinementIds;
-}

src/main/java/com/biutag/supervision/pojo/param/negativeBlame/NegativeBlameQueryParam.java

@@ -1,33 +0,0 @@
-package com.biutag.supervision.pojo.param.negativeBlame;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Set;
-
-/**
- * @ClassName NegativeBlameQueryParam
- * @Description 问题涉及人查询参数
- * @Author shihao
- * @Date 2026/1/23 10:03
- */
-@Getter
-@Setter
-public class NegativeBlameQueryParam {
-
-
-    @Schema(description = "涉及人员禁闭处罚id")
-    private String confinementId;
-
-    @Schema(description = "涉及人员禁闭处罚ids")
-    private Set<String> confinementIds;
-
-    @Schema(description = "领导禁闭处罚id")
-    private String leadConfinementId;
-
-
-    @Schema(description = "领导禁闭处罚ids")
-    private Set<String> leadConfinementIds;
-
-}

src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java

@@ -1,7 +1,6 @@
 package com.biutag.supervision.pojo.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
@@ -92,7 +91,4 @@ public class ConfinementVo {
     private String roleId;
 
     private String userId;
-
-    @Schema(description = "问题ID")
-    private String negativeId;
 }

src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java

@@ -81,9 +81,6 @@ public class ExportNegativeBlameVo {
     @ExcelProperty({"人员属性"})
     private String ivPersonType;
 
-    @ExcelProperty({"责任追责"})
-    private String handleResultName;
-
     // 责任领导
     @ExcelProperty({"责任领导姓名"})
     private String leadName;
@@ -96,10 +93,9 @@ public class ExportNegativeBlameVo {
     @ExcelProperty({"责任领导身份证"})
     private String leadIdCode;
 
-    // 领导处理结果
-    @ExcelProperty("责任领导责任追责")
-    private String leadHandleResultName;
 
+    @ExcelProperty({"责任追责"})
+    private String handleResultName;
 
     // 问题类型
     @ExcelProperty({"问题类型"})

src/main/java/com/biutag/supervision/repository/base/BaseDAO.java

@@ -31,7 +31,7 @@ public abstract class BaseDAO {
      * @param <T>
      * @param <E>
      */
-    protected <T, E> void setBatchQuery(T single, Collection<T> batch, LambdaQueryWrapper<E> wrapper, SFunction<E, T> function) {
+    protected <T, E> void setBatchQuery(T single, Set<T> batch, LambdaQueryWrapper<E> wrapper, SFunction<E, T> function) {
         if (CollectionUtils.isEmpty(batch)) {
             if (isEmpty(single)) {
                 return;

src/main/java/com/biutag/supervision/repository/negativeBlame/NegativeBlameResourceService.java

@@ -1,66 +0,0 @@
-package com.biutag.supervision.repository.negativeBlame;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.biutag.supervision.mapper.NegativeBlameMapper;
-import com.biutag.supervision.pojo.entity.NegativeBlame;
-import com.biutag.supervision.pojo.param.negativeBlame.NegativeBlameConfinementQueryParam;
-import com.biutag.supervision.pojo.param.negativeBlame.NegativeBlameQueryParam;
-import com.biutag.supervision.repository.base.BaseDAO;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @ClassName NegativeBlameResourceService
- * @Description NegativeBlameResourceService
- */
-@Service
-public class NegativeBlameResourceService extends BaseDAO {
-
-    @Resource
-    private NegativeBlameMapper negativeBlameMapper;
-
-
-    public List<NegativeBlame> query(NegativeBlameQueryParam param) {
-        LambdaQueryWrapper<NegativeBlame> queryWrapper = new LambdaQueryWrapper<>();
-        setBatchQuery(param.getConfinementId(), param.getConfinementIds(), queryWrapper, NegativeBlame::getConfinementId);
-        setBatchQuery(param.getLeadConfinementId(), param.getLeadConfinementIds(), queryWrapper, NegativeBlame::getLeadConfinementId);
-
-        // 防御
-        if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) {
-            return Collections.emptyList();
-        }
-        return negativeBlameMapper.selectList(queryWrapper);
-    }
-
-
-    /**
-     * 查询被关禁闭的人
-     * @param param
-     * @return
-     */
-    public List<NegativeBlame> queryConfinement(NegativeBlameConfinementQueryParam param) {
-        boolean hasLead = CollectionUtil.isNotEmpty(param.getLeadConfinementIds());
-        boolean hasConf = CollectionUtil.isNotEmpty(param.getConfinementIds());
-
-        if (!hasLead && !hasConf) {
-            return Collections.emptyList();
-        }
-
-        LambdaQueryWrapper<NegativeBlame> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.and(w -> w
-                .in(hasLead, NegativeBlame::getLeadConfinementId, param.getLeadConfinementIds())
-                .or(hasLead && hasConf)
-                .in(hasConf, NegativeBlame::getConfinementId, param.getConfinementIds())
-        );
-        // 防御
-        if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) {
-            return Collections.emptyList();
-        }
-        return negativeBlameMapper.selectList(queryWrapper);
-    }
-
-}

src/main/java/com/biutag/supervision/service/ConfinementService.java

@@ -10,25 +10,21 @@ import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.constants.enums.RoleCodeEnum;
 import com.biutag.supervision.mapper.ConfinementMapper;
 import com.biutag.supervision.pojo.entity.Confinement;
-import com.biutag.supervision.pojo.entity.NegativeBlame;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.ConfinementQueryParam;
-import com.biutag.supervision.pojo.param.negativeBlame.NegativeBlameConfinementQueryParam;
 import com.biutag.supervision.pojo.vo.ConfinementExcelVo;
 import com.biutag.supervision.pojo.vo.ConfinementVo;
-import com.biutag.supervision.repository.negativeBlame.NegativeBlameResourceService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
-import java.util.stream.Collectors;
+import java.util.List;
 
 @RequiredArgsConstructor
 @Service
 public class ConfinementService extends ServiceImpl<ConfinementMapper, Confinement> {
 
     private final SupDepartService departService;
-    private final NegativeBlameResourceService negativeBlameResourceService;
 
     public Page<ConfinementVo> page(ConfinementQueryParam param) {
         QueryWrapper<Confinement> queryWrapper = new QueryWrapper<>();
@@ -61,31 +57,8 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme
             }
         }
         //todo 排序
-        Page<ConfinementVo> confinementVoPage = baseMapper.queryPage(Page.of(param.getCurrent(), param.getSize()), queryWrapper);
+
-        List<ConfinementVo> records = confinementVoPage.getRecords();
+        return baseMapper.queryPage(Page.of(param.getCurrent(), param.getSize()), queryWrapper);
-        if (CollectionUtils.isNotEmpty(records)){
-            // 所有的禁闭ID
-            Set<String> confinementIdList = records.stream().map(ConfinementVo::getId).collect(Collectors.toSet());
-            // 去negativeBlame中找negativeId
-            NegativeBlameConfinementQueryParam negativeBlameQueryParam = new NegativeBlameConfinementQueryParam();
-            negativeBlameQueryParam.setConfinementIds(confinementIdList);
-            negativeBlameQueryParam.setLeadConfinementIds(confinementIdList);
-            List<NegativeBlame> negativeBlames = negativeBlameResourceService.queryConfinement(negativeBlameQueryParam);
-            //  confinementId --- negativeId
-            Map<String, String> negativeIdMap = new HashMap<>();
-            for (NegativeBlame nb : negativeBlames) {
-                if (StrUtil.isNotBlank(nb.getNegativeId())) {
-                    if (StrUtil.isNotBlank(nb.getConfinementId())) {
-                        negativeIdMap.putIfAbsent(nb.getConfinementId(), nb.getNegativeId());
-                    }
-                    if (StrUtil.isNotBlank(nb.getLeadConfinementId())) {
-                        negativeIdMap.putIfAbsent(nb.getLeadConfinementId(), nb.getNegativeId());
-                    }
-                }
-            }
-            records.forEach(one -> one.setNegativeId(negativeIdMap.get(one.getId())));
-        }
-        return confinementVoPage;
     }
 
 

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

@@ -131,19 +131,16 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Result<Boolean> delComplaintCollection(ComplaintCollectionDelRequest request) {
         ComplaintCollectionQueryParam param = new ComplaintCollectionQueryParam();
         param.setId(request.getId());
         List<ComplaintCollection> query = complaintCollectionResourceService.query(param);
         if (CollectionUtil.isEmpty(query)) {
-            throw new IllegalStateException("未找到可删除信息" + request.getId());
+            throw new RuntimeException("未找到可删除信息");
         }
         if (!"0".equals(query.get(0).getStatus())) {
-            throw new IllegalStateException("目标信息状态不可删除" + request.getId());
+            throw new RuntimeException("目标信息状态不可删除");
         }
-        // 鉴权
-        checkDeletePermission(query.get(0));
         boolean deleted = complaintCollectionResourceService.deleteById(request.getId());
         if (!deleted) {
             throw new RuntimeException("删除失败");
@@ -912,37 +909,4 @@ public class ComplaintCollectionServiceImpl implements ComplaintCollectionServic
 
     }
 
-
-    /**
-     * 删除鉴权
-     * 1、本人可删除
-     * 2、市局管理员可删除
-     * 3、超级管理员可删除
-     *
-     * @param complaintCollection
-     */
-    private void checkDeletePermission(ComplaintCollection complaintCollection) {
-        UserAuth currentUser = UserContextHolder.getCurrentUser();
-        List<String> authDepartIds = currentUser.getAuthDepartIds();
-        // 本人可删
-        if (currentUser.getUserName().equals(complaintCollection.getCreateBy())) {
-            return;
-        }
-        // 超级管理员可删
-        if (AppConstants.USER_TYPE_SUPER.equals(currentUser.getUserType())) {
-            return;
-        }
-        // 市局管理员可删除
-        if (currentUser.getRoleCodes() != null && currentUser.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
-            return;
-        }
-        // 信访市局管理员可删除
-        if (currentUser.getRoleCodes() != null && currentUser.getRoleCodes().contains(RoleCodeEnum.ADMIN_1_12337.getCode())) {
-            return;
-        }
-        // 后续二级机构专班可以删除三级机构的
-        // 否则直接异常
-        throw new IllegalStateException("当前账号无权限操作该数据。请使用市局管理员账号登录，或确认该数据是否为本人录入。");
-    }
-
 }