fix: 12337信访台账导出

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

@@ -17,4 +17,5 @@ public enum TaskTypeEnum {
 
     // 问题随拍
     problem_shooting;
+
 }

src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java

@@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.constants.enums.*;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.flow.VerifyData;
-import com.biutag.supervision.pojo.entity.Negative;
+import com.biutag.supervision.pojo.entity.*;
-import com.biutag.supervision.pojo.entity.NegativeBlame;
-import com.biutag.supervision.pojo.entity.NegativeFile;
-import com.biutag.supervision.pojo.entity.NegativeProblemRelation;
 import com.biutag.supervision.pojo.param.NegativeQueryParam;
 import com.biutag.supervision.pojo.vo.*;
 import com.biutag.supervision.service.*;
@@ -33,6 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -58,6 +56,8 @@ public class NegativeBookController {
 
     private final DataPetition12337Service dataPetition12337Service;
 
+    private final SupDictHandleResultMapingService dictHandleResultMapingService;
+
     // 黄赌警情
     @GetMapping("hdjq")
     public Result<Page<NegativeHdjq>> page(NegativeQueryParam param) {
@@ -257,11 +257,30 @@ public class NegativeBookController {
             item.setVerifiedIsover(overProcessings.contains(item.getProcessingStatus()) ? "核查完结" : null);
             // 是否处分处理
             List<NegativeBlame> blames = negativeBlames.stream().filter(blame -> blame.getNegativeId().equals(item.getId())).toList();
+            List<String> internalIds = new ArrayList<>();
+            blames.stream().filter(blame -> StrUtil.isNotBlank(blame.getHandleResultCode())).forEach(blame -> {
+                internalIds.addAll(Arrays.stream(blame.getHandleResultCode().split(",")).toList());
+            });
+            if (!internalIds.isEmpty()) {
+                List<SupDictHandleResultMaping> handleResultMapings = dictHandleResultMapingService.listByInternalId(internalIds);
+                // 处理结论形态（获取第一个）
+                item.setProcessResType(handleResultMapings.stream().findFirst().map(SupDictHandleResultMaping::getExternalType).orElse(null));
+                // 处理结论结果
+                item.setProcessResDes(handleResultMapings.stream().map(SupDictHandleResultMaping::getExternalName).collect(Collectors.joining("、")));
+            }
             if (InspectCaseEnum.isItTure(item.getCheckStatus()) && blames.stream().anyMatch(blame -> !blame.getHandleResultName().contains("不予追责"))) {
                 item.setIsPunish("是");
-                item.setProcessResType("第一种形态");
+            } else {
-                // 处理结论结果
+                item.setIsPunish("否");
-                item.setProcessResDes(blames.stream().map(NegativeBlame::getHandleResultName).collect(Collectors.joining("、")));
+            }
+            item.setPunishDes(item.getCheckStatusDesc());
+            // 被核查人是否属于领导班子成员
+            if (StrUtil.isNotBlank(item.getAccountabilityTarget())) {
+                if (AccountabilityTargetEnum.PERSONAL.getValue().equals(item.getAccountabilityTarget())) {
+                    item.setVerifiedIsleader("非领导班子成员");
+                } else {
+                    item.setVerifiedIsleader("领导班子成员");
+                }
             }
         });
         String headerValue = "attachment; filename=\"" + URLEncoder.encode("12337信访投诉数据台账.xlsx", "UTF-8") + "\"";

src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java

@@ -131,17 +131,22 @@ public class VideoInspectionController {
         negativeTask.setCrtUsername(user.getUserName());
         negativeTaskService.save(negativeTask);
         data.forEach(item -> {
+            // 问题涉及单位
+            SupDepart involveDepart;
             if (StrUtil.isBlank(item.getFsdwGajgjgdm())) {
-                throw new RuntimeException("发生单位编码为空");
+                if (StrUtil.isBlank(distributeData.getHandleDepartId())) {
+                    throw new RuntimeException("发生单位代码为空，且未选择指定办理单位");
                 }
+                involveDepart = departService.getById(distributeData.getHandleDepartId());
+            } else {
                 // 发生单位代码
                 SupExternalDepart externalDepart = externalDepartService.getOne(new LambdaUpdateWrapper<SupExternalDepart>().eq(SupExternalDepart::getExternalId, item.getFsdwGajgjgdm()).eq(SupExternalDepart::getSource,
                         "视频督察"));
                 if (externalDepart == null || StrUtil.isBlank(externalDepart.getInternalId())) {
                     throw new RuntimeException(String.format("%s-%s 未匹配单位映射，请联系管理员", item.getFsdwGajgmc(), item.getFsdwGajgjgdm()));
                 }
-            // 问题涉及单位
+                involveDepart = departService.getById(externalDepart.getInternalId());
-            SupDepart involveDepart = departService.getById(externalDepart.getInternalId());
+            }
             // 办理单位
             SupDepart handleDepart;
             if (StrUtil.isBlank(distributeData.getHandleDepartId())) {

src/main/java/com/biutag/supervision/controller/mobileSupervision/TestingAlcoholController.java

@@ -9,21 +9,24 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.constants.enums.TaskStatusEnum;
 import com.biutag.supervision.pojo.Result;
-import com.biutag.supervision.pojo.dto.*;
+import com.biutag.supervision.pojo.dto.TaskTestingAlcoholDto;
-import com.biutag.supervision.pojo.entity.SupDepart;
+import com.biutag.supervision.pojo.dto.TaskTestingAlcoholPeopleDto;
+import com.biutag.supervision.pojo.dto.TestingAlcoholFilter;
+import com.biutag.supervision.pojo.dto.TestingAlcoholPeopleImportDto;
 import com.biutag.supervision.pojo.entity.SupPolice;
-import com.biutag.supervision.pojo.entity.SupTask;
 import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople;
 import com.biutag.supervision.pojo.param.TaskTestingAlcoholPeopleQueryParam;
 import com.biutag.supervision.pojo.param.TaskTestingAlcoholQueryParam;
 import com.biutag.supervision.pojo.vo.TaskCountVo;
 import com.biutag.supervision.pojo.vo.TaskTestingAlcoholPeopleVo;
 import com.biutag.supervision.pojo.vo.TaskTestingAlcoholVo;
-import com.biutag.supervision.service.*;
+import com.biutag.supervision.service.SupDepartService;
+import com.biutag.supervision.service.SupPoliceService;
+import com.biutag.supervision.service.SupTaskTestingAlcoholPeopleService;
+import com.biutag.supervision.service.SupTaskTestingAlcoholService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/biutag/supervision/mapper/SupTaskMapper.java

@@ -13,11 +13,8 @@ import org.apache.ibatis.annotations.Param;
 public interface SupTaskMapper extends BaseMapper<SupTask> {
 
     Page<TaskVo> queryTask(@Param("page") Page<SupTask> page,
-                           @Param("ew1") QueryWrapper<SupTask> taskQueryWrapper,
-                           @Param("ew2") QueryWrapper<SupTask> nQueryWrapper,
                            @Param(Constants.WRAPPER) QueryWrapper<SupTask> queryWrapper);
 
-    TaskCountVo queryTaskCount(@Param("ew1") QueryWrapper<SupTask> taskQueryWrapper,
+    TaskCountVo queryTaskCount(@Param(Constants.WRAPPER) QueryWrapper<SupTask> queryWrapper);
-                               @Param("ew2") QueryWrapper<SupTask> nQueryWrapper);
 
 }

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

@@ -593,4 +593,8 @@ public class DataPetition12337ExportVo implements Serializable {
     @ExcelIgnore
     private String processingStatus;
 
+    // 追责对象
+    @ExcelIgnore
+    private String accountabilityTarget;
+
 }

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

@@ -8,7 +8,6 @@ import lombok.Setter;
  * @author wxc
  * @date 2025/4/12
  */
-@AllArgsConstructor
 @Setter
 @Getter
 public class TaskCountVo {
@@ -17,6 +16,14 @@ public class TaskCountVo {
 
     private Long doneCount;
 
+    private Long negativeTodoCount;
+
+
     public TaskCountVo() {
     }
+
+    public TaskCountVo(Long todoCount, Long doneCount) {
+        this.todoCount = todoCount;
+        this.doneCount = doneCount;
+    }
 }

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

@@ -53,14 +53,4 @@ public class TaskVo {
 
     private String type;
 
-    private String negativeId;
-
-    // 业务类型
-    private String businessTypeName;
-
-    // 涉嫌问题
-    private String involveProblem;
-
-    private String flowKey;
-
 }

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

@@ -15,4 +15,8 @@ public class SupDictHandleResultMapingService extends ServiceImpl<SupDictHandleR
         return list(new LambdaQueryWrapper<SupDictHandleResultMaping>().in(SupDictHandleResultMaping::getExternalName, externalNames));
     }
 
+    public List<SupDictHandleResultMaping> listByInternalId(List<String> internalIds) {
+        return list(new LambdaQueryWrapper<SupDictHandleResultMaping>().in(SupDictHandleResultMaping::getInternalId, internalIds));
+    }
+
 }

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

@@ -6,71 +6,55 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.common.UserContextHolder;
 import com.biutag.supervision.constants.enums.TaskTypeEnum;
+import com.biutag.supervision.constants.enums.WorkStatusEnum;
 import com.biutag.supervision.mapper.SupTaskMapper;
-import com.biutag.supervision.pojo.model.NegativeWorkModel;
-import com.biutag.supervision.pojo.vo.TaskCountVo;
-import com.biutag.supervision.pojo.vo.TaskVo;
 import com.biutag.supervision.pojo.entity.SupTask;
+import com.biutag.supervision.pojo.model.NegativeWorkModel;
 import com.biutag.supervision.pojo.model.UserAuth;
+import com.biutag.supervision.pojo.param.NegativeQueryParam;
 import com.biutag.supervision.pojo.param.TaskQueryParam;
+import com.biutag.supervision.pojo.vo.TaskCountVo;
+import com.biutag.supervision.pojo.vo.TaskVo;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+@RequiredArgsConstructor
-
 @Service
 public class SupTaskService extends ServiceImpl<SupTaskMapper, SupTask> {
 
+    private final NegativeWorkService negativeWorkService;
+
     public Page<TaskVo> pageTask(TaskQueryParam queryParam) {
         UserAuth user = UserContextHolder.getCurrentUser();
-        QueryWrapper<SupTask> taskQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>();
-        taskQueryWrapper
+        queryWrapper
-                // 设置参数别名
-                .setParamAlias("ew1")
                 .and(q -> {
                     q.eq("p.id_code", user.getUserName());
                     if (StrUtil.isNotBlank(user.getPosition())) {
                         q.or().eq("t.sup_depart_id", user.getDepartId()).eq("t.task_type", TaskTypeEnum.selfexamination.name());
                     }
                 });
-        QueryWrapper<SupTask> nQueryWrapper = new QueryWrapper<>();
-        nQueryWrapper.setParamAlias("ew2");
-        if (user.getRoleCodes().isEmpty() || user.getAuthDepartIds().isEmpty() || user.getAuthSources().isEmpty()) {
-            nQueryWrapper.apply("1 = 0");
-        } else {
-            nQueryWrapper.in("w.role_code", user.getRoleCodes())
-                    .in("w.depart_id", user.getAuthDepartIds())
-                    .in("w.problem_sources_code", user.getAuthSources());
-        }
-        QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("t.task_status", queryParam.getTaskStatus())
                 .like(StrUtil.isNotBlank(queryParam.getTaskName()), "t.task_name", queryParam.getTaskName())
                 .eq(StrUtil.isNotBlank(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType())
                 .orderByDesc("t.create_time");
-        return baseMapper.queryTask(Page.of(queryParam.getCurrent(), queryParam.getSize()), taskQueryWrapper, nQueryWrapper, queryWrapper);
+        return baseMapper.queryTask(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
     }
 
     public TaskCountVo getTaskCount() {
         UserAuth user = UserContextHolder.getCurrentUser();
-        QueryWrapper<SupTask> taskQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>();
-        taskQueryWrapper
+        queryWrapper
-                // 设置参数别名
-                .setParamAlias("ew1")
                 .and(q -> {
                     q.eq("p.id_code", user.getUserName());
                     if (StrUtil.isNotBlank(user.getPosition())) {
                         q.or().eq("t.sup_depart_id", user.getDepartId()).eq("t.task_type", TaskTypeEnum.selfexamination.name());
                     }
                 });
-        QueryWrapper<SupTask> nQueryWrapper = new QueryWrapper<>();
+        TaskCountVo taskCountVo = baseMapper.queryTaskCount(queryWrapper);
-        nQueryWrapper.setParamAlias("ew2");
+        Page<NegativeWorkModel> workModelPage = negativeWorkService.page(new NegativeQueryParam(), WorkStatusEnum.todo.name());
-        if (user.getRoleCodes().isEmpty() || user.getAuthDepartIds().isEmpty() || user.getAuthSources().isEmpty()) {
+        taskCountVo.setNegativeTodoCount(workModelPage.getTotal());
-            nQueryWrapper.apply("1 = 0");
+        return taskCountVo;
-        } else {
-            nQueryWrapper.in("w.role_code", user.getRoleCodes())
-                    .in("w.depart_id", user.getAuthDepartIds())
-                    .in("w.problem_sources_code", user.getAuthSources());
-        }
-        return baseMapper.queryTaskCount(taskQueryWrapper, nQueryWrapper);
     }
 
 }

src/main/resources/mapper/DataPetition12337Mapper.xml

@@ -168,7 +168,8 @@
 
     <select id="queryPageExport" resultType="com.biutag.supervision.pojo.vo.DataPetition12337ExportVo">
         SELECT
-            p.*, n.handle_second_depart_name, n.handle_polices, n.check_status_desc, n.checkStatus, n.checkStatusName, n.id, n.processing_status
+            p.*, n.handle_second_depart_name, n.handle_polices, n.check_status_desc, n.checkStatus, n.checkStatusName, n.id, n.processing_status,
+            n.accountability_target
         FROM
             data_petition_12337 p left join negative n on p.only_id = n.originId
             ${ew.getCustomSqlSegment}

src/main/resources/mapper/SupTaskMapper.xml

@@ -5,8 +5,7 @@
 <mapper namespace="com.biutag.supervision.mapper.SupTaskMapper">
 
     <select id="queryTask" resultType="com.biutag.supervision.pojo.vo.TaskVo">
-        select * from
+        select t.id,
-        (select t.id,
                 t.task_name,
                 t.sup_depart_name,
                 t.begin_time,
@@ -19,67 +18,26 @@
                 i.task_content,
                 i.has_sign,
                 s.requirement,
-                s.type,
+                s.type
-                ''  businessTypeName,
-                ''  involveProblem,
-                ''  negative_id,
-                '' flow_key
          from sup_task t
                   left join sup_task_person p on p.task_id = t.id
                   left join sup_task_inspection i on t.id = i.task_id
                   left join sup_task_testing_alcohol a on t.id = a.task_id
                   left join sup_task_selfexamination s on t.id = s.task_id
-             ${ew1.getCustomSqlSegment}
+             ${ew.getCustomSqlSegment}
-         UNION
-         SELECT DISTINCT
-             w.id, n.problemSources task_name, n.involveDepartName sup_depart_name, null, null, n.crtTime create_time, 'negative' task_type, w.`status` task_status, 0, n.special_supervision, n.thingDesc, '', '', '',
-             n.businessTypeName, n.involveProblem, w.negative_id, n.flow_key
-         FROM
-             negative_work w
-             LEFT JOIN negative n
-         ON w.negative_id = n.id
-             ${ew2.getCustomSqlSegment}
-         ) t ${ew.getCustomSqlSegment}
     </select>
 
     <select id="queryTaskCount" resultType="com.biutag.supervision.pojo.vo.TaskCountVo">
         select sum(CASE WHEN t.task_status = 'todo' THEN 1 ELSE 0 END ) todo_count,
                sum(CASE WHEN t.task_status = 'done' THEN 1 ELSE 0 END ) done_count
             from
-            (select t.id,
+            (select t.task_status
-                    t.task_name,
-                    t.sup_depart_name,
-                    t.begin_time,
-                    t.end_time,
-                    t.create_time,
-                    t.task_type,
-                    t.task_status,
-                    a.filter_people_number total_number,
-                    i.supervision_type,
-                    i.task_content,
-                    i.has_sign,
-                    s.requirement,
-                    s.type,
-                    ''  businessTypeName,
-                    ''  involveProblem,
-                    ''  negative_id,
-                    '' flow_key
              from sup_task t
                       left join sup_task_person p on p.task_id = t.id
                       left join sup_task_inspection i on t.id = i.task_id
                       left join sup_task_testing_alcohol a on t.id = a.task_id
                       left join sup_task_selfexamination s on t.id = s.task_id
-                 ${ew1.getCustomSqlSegment}
+                 ${ew.getCustomSqlSegment}) t
-        UNION
-        SELECT DISTINCT
-            w.id, n.problemSources task_name, n.involveDepartName sup_depart_name, null, null, n.crtTime create_time, 'negative' task_type, w.`status` task_status, 0, n.special_supervision, n.thingDesc, '', '', '',
-            n.businessTypeName, n.involveProblem, w.negative_id, n.flow_key
-        FROM
-            negative_work w
-                LEFT JOIN negative n
-                          ON w.negative_id = n.id
-            ${ew2.getCustomSqlSegment}
-         ) t
     </select>
 
 </mapper>