fit：1、日常督察 & 所队自查 督察问题下发 2、督察任务重点人员督察 人员列表分页

src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java

@@ -6,10 +6,12 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
+import com.biutag.supervision.mapper.DataCaseVerifMapper;
 import com.biutag.supervision.mapper.MailMapper;
 import com.biutag.supervision.mapper.NegativeMapper;
 import com.biutag.supervision.mapper.SupDepartMapper;
 import com.biutag.supervision.pojo.Result;
+import com.biutag.supervision.pojo.entity.DataCaseVerif;
 import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.vo.*;
@@ -52,6 +54,8 @@ public class DataVGlobalController {
     private final SupDepartMapper supDepartMapper;
 
     private final MailMapper mailMapper;
+
+    private final DataCaseVerifMapper dataCaseVerifMapper;
     //region  左边
 
     /**
@@ -111,13 +115,14 @@ public class DataVGlobalController {
         endTime = DateUtil.endOfDay(endTime);
         // 获取数据大屏中央总数概览
         GlobalOverViewVo overview = negativeMapper.getAllGlobalCount(beginTime, endTime);
-
-
+        long caseVerificationPro =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,endTime));
+        overview.setCaseVerificationPro(caseVerificationPro);
         MailOverviewVo vo = dataMailService.mailCount(beginTime, endTime);
         // 局长信箱
 //        long mailboxNumber = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()));
         long mailboxNumber = mailMapper.selectMailDataCount(beginTime,endTime);
         overview.setMailboxNumber(mailboxNumber);
+
         overview.setComplaintPro(vo.getCountryMail() + vo.getPoliceMail() + vo.getNumberMail());
         JSONObject data = new JSONObject().fluentPut("overview", overview);
         return Result.success(data);

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

@@ -21,6 +21,7 @@ import com.biutag.supervision.pojo.entity.SupPolice;
 import com.biutag.supervision.pojo.entity.SupRiskPersonal;
 import com.biutag.supervision.pojo.param.TaskInspectionQueryParam;
 import com.biutag.supervision.pojo.param.TaskQueryParam;
+import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.vo.TaskInspectionVo;
 import com.biutag.supervision.pojo.vo.TaskVo;
 import com.biutag.supervision.service.*;
@@ -75,6 +76,11 @@ public class TaskManagementController {
             }
         }
 
+        @GetMapping("/getRiskPersonalPage")
+        public Result<Page<SupRiskDto>> getRiskPersonalPage(TaskRiskPersonalQueryParam queryParam){
+            return Result.success(taskManagementService.getSupRiskDtoPage(queryParam));
+        }
+
         @DeleteMapping("/{id}")
         public Result delTaskById(@PathVariable Integer id){
             if(taskManagementService.delTaskById(id)){

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

@@ -9,24 +9,23 @@ 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.constants.enums.*;
 import com.biutag.supervision.pojo.Result;
-import com.biutag.supervision.pojo.dto.TaskTestingAlcoholDto;
-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.dto.*;
+import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.entity.SupPolice;
+import com.biutag.supervision.pojo.entity.SupTaskProblem;
 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.param.TaskTestingTaskDistribute;
 import com.biutag.supervision.pojo.vo.TaskCountVo;
+import com.biutag.supervision.pojo.vo.TaskInspectionProblemVo;
 import com.biutag.supervision.pojo.vo.TaskTestingAlcoholPeopleVo;
 import com.biutag.supervision.pojo.vo.TaskTestingAlcoholVo;
-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 com.biutag.supervision.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -55,6 +55,10 @@ public class TestingAlcoholController {
 
     private final SupTaskTestingAlcoholPeopleService testingAlcoholPeopleService;
 
+    private final NegativeService negativeService;
+
+    private final  SupTaskProblemService supTaskProblemService;
+
     @GetMapping
     public Result<Page<TaskTestingAlcoholVo>> page(TaskTestingAlcoholQueryParam queryParam) {
         return Result.success(taskTestingAlcoholService.page(queryParam));
@@ -151,4 +155,93 @@ public class TestingAlcoholController {
         return Result.success(list);
     }
 
+    @PostMapping("/issueMatter")
+    public Result  issueMatterFun(@RequestBody TaskTestingTaskDistribute distribute){
+
+        TaskInspectionProblemVo vo = distribute.getProblemVo();
+
+        NegativeDto dto =new NegativeDto();
+        //问题来源
+        dto.setProblemSources(ProblemSourcesEnum.ZXDC.getLabel());
+        dto.setProblemSourcesCode(ProblemSourcesEnum.ZXDC.getValue());
+        //业务类别
+        dto.setBusinessTypeCode(distribute.getBusinessTypeCode());
+        //涉及警种
+        dto.setPoliceType(distribute.getPoliceType());
+        dto.setPoliceTypeName(distribute.getPoliceTypeName());
+        if (CollectionUtil.isNotEmpty(distribute.getInvolveProblem())) {
+            dto.setInvolveProblem(distribute.getInvolveProblem());
+        }
+        //主办层级
+        dto.setHostLevel(Objects.equals(distribute.getDistributionFlow(), DistributionFlowEnum.SECOND.getValue()) ? HostLevelEnums.SECOND.getValue() : HostLevelEnums.THREE.getValue());
+        if(CollectionUtil.isNotEmpty(vo.getFiles())){
+            dto.setThingFiles(vo.getFiles());
+        }
+
+
+        //涉及单位
+        SupDepart depart = departService.getById(vo.getDepartId());
+        if (DepartLevelEnum.SECOND.getValue().equals(depart.getLevel()) || DepartLevelEnum.THREE.getValue().equals(depart.getLevel()) ){
+            dto.setInvolveDepartId(vo.getDepartId());
+            dto.setInvolveDepartName(vo.getDepartName());
+        }else{
+            SupDepart departData = departService.getById(depart.getPid());
+            dto.setInvolveDepartId(departData.getId());
+            dto.setInvolveDepartName(departData.getShortName());
+        }
+
+        //问题发现时间
+        dto.setDiscoveryTime(vo.getSupTime()!= null?vo.getSupTime():vo.getCreateTime());
+        //问题发生时间
+        dto.setHappenTime(vo.getCreateTime());
+        // 事情简要描述
+        dto.setThingDesc(vo.getThingDesc());
+
+        //办理单位
+        if (StrUtil.isNotBlank(distribute.getHandleDepartId())) {
+            distribute.setHandleDepartId(distribute.getHandleDepartId());
+            distribute.setHandleDepartType(ModelHandleDepartTypeEnum.ZDDW.getValue());
+        } else {
+            distribute.setHandleDepartType(ModelHandleDepartTypeEnum.SJDW.getValue());
+        }
+        // 涉及单位
+        if (Objects.isNull(distribute.getHandleDepartId()) || ModelHandleDepartTypeEnum.SJDW.getValue().equals(distribute.getHandleDepartType())) {
+            depart = departService.getById(dto.getInvolveDepartId());
+            if (Objects.isNull(depart)) {
+                throw new RuntimeException(String.format("单位[%s]为空", dto.getInvolveDepartId()));
+            }
+        }
+        else {
+            // 指定办理单位
+            depart = departService.getById(distribute.getHandleDepartId());
+            if (Objects.isNull(depart)) {
+                throw new RuntimeException(String.format("单位[%s]为空", distribute.getHandleDepartId()));
+            }
+        }
+        //DepartId
+        if (depart.getLevel().equals(DepartLevelEnum.SECOND.getValue())) {
+            dto.setDepartId(depart.getId());
+        }
+        if (depart.getLevel().equals(DepartLevelEnum.THREE.getValue()) && Objects.equals(distribute.getDistributionFlow(), DistributionFlowEnum.SECOND.getValue())) {
+            SupDepart parentDepart = departService.getParentDepart(depart.getId());
+            dto.setDepartId(parentDepart.getId());
+        }
+        if (depart.getLevel().equals(DepartLevelEnum.THREE.getValue()) && Objects.equals(distribute.getDistributionFlow(), DistributionFlowEnum.THIRD.getValue())) {
+            dto.setDepartId(depart.getId());
+        }
+        dto.setTimeLimit(distribute.getTimeLimit());
+        dto.setMaxSignDuration(distribute.getMaxSignDuration());
+        dto.setMaxHandleDuration(distribute.getMaxHandleDuration());
+        dto.setMaxExtensionDuration(distribute.getMaxExtensionDuration());
+        // 审批流程
+        dto.setApprovalFlow(distribute.getApprovalFlow());
+        negativeService.save(dto);
+
+        //修改状态
+        LambdaUpdateWrapper<SupTaskProblem>  updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(SupTaskProblem::getDistributionState,"1")
+                .eq(SupTaskProblem::getId,vo.getId());
+        supTaskProblemService.update(updateWrapper);
+        return  Result.success();
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.biutag.supervision.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -8,6 +9,7 @@ import com.biutag.supervision.pojo.entity.SupRiskPersonal;
 import com.biutag.supervision.pojo.entity.SupTaskSelfexamination;
 import com.biutag.supervision.pojo.param.SupRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.param.TaskInspectionQueryParam;
+import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.vo.SupRiskPersonalVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -17,6 +19,8 @@ import java.util.List;
 public interface SupRiskPersonalMapper extends BaseMapper<SupRiskPersonal> {
     Page<SupRiskPersonalVo> queryPage(@Param("page") Page<SupRiskPersonalQueryParam> page, @Param(Constants.WRAPPER) QueryWrapper<SupRiskPersonal> queryWrapper);
 
+    Page<SupRiskPersonal> riskPersonalPage(@Param("page")Page<TaskRiskPersonalQueryParam> page,@Param(Constants.WRAPPER) LambdaQueryWrapper<SupRiskPersonal> queryWrapper);
+
     @Select("SELECT\n" +
             "            srp.id_code,\n" +
             "            srp.name,\n" +

src/main/java/com/biutag/supervision/pojo/dto/TaskInspectionDto.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,7 +29,7 @@ public class TaskInspectionDto {
 
     private String taskContentHtml;
 
-    private List<LocalDateTime> times = new ArrayList<>();
+    private List<Date> times = new ArrayList<>();
 
 
     private List<SupTaskPerson> persons = new ArrayList<>();

src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java

@@ -8,9 +8,11 @@ import com.biutag.supervision.pojo.vo.TemperancePoliceVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Setter
@@ -26,7 +28,9 @@ public class TaskManagementDto {
     //专项督察类型
     private String specialType;
     //督察时间
-    private List<LocalDateTime> times = new ArrayList<>();
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<Date> times = new ArrayList<>();
     //督察人员
     private List<SupTaskPerson> persons = new ArrayList<>();
     //督察对象方式（禁酒督察）

src/main/java/com/biutag/supervision/pojo/dto/TaskSelfexaminationDto.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,7 +25,7 @@ public class TaskSelfexaminationDto {
     // 自查类型
     private String type;
 
-    private List<LocalDateTime> times = new ArrayList<>();
+    private List<Date> times = new ArrayList<>();
 
     // 任务要求
     private String requirement;

src/main/java/com/biutag/supervision/pojo/dto/TaskTestingAlcoholDto.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -41,7 +42,7 @@ public class TaskTestingAlcoholDto {
     private List<TestingAlcoholFilter> filterPeopleConditions = new ArrayList<>();
 
 
-    private List<LocalDateTime> times = new ArrayList<>();
+    private List<Date> times = new ArrayList<>();
 
 
     private List<SupTaskPerson> persons = new ArrayList<>();

src/main/java/com/biutag/supervision/pojo/entity/SupTask.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Setter
 @Getter
@@ -34,11 +35,11 @@ public class SupTask {
 
     // 开始时间
     @TableField("begin_time")
-    private LocalDateTime beginTime;
+    private Date beginTime;
 
     // 结束时间
     @TableField("end_time")
-    private LocalDateTime endTime;
+    private Date endTime;
 
     // 创建时间
     @TableField("create_time")

src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java

@@ -64,5 +64,8 @@ public class SupTaskTestingAlcoholPeople {
 
     // 检测照片
     private String testingFiles;
+    //下发状态
+//    @TableField("issue_state")
+//    private String issueState;
 
 }

src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java

@@ -23,6 +23,7 @@ public class ConfinementQueryParam extends BasePage {
 
     //禁闭时间
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> confinementTime;
 
 

src/main/java/com/biutag/supervision/pojo/param/TaskRiskPersonalQueryParam.java

@@ -0,0 +1,44 @@
+package com.biutag.supervision.pojo.param;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TaskRiskPersonalQueryParam extends BasePage{
+
+    private String id;
+    // 姓名
+    private String name;
+
+    // 性别男1女2
+    private String gender;
+    // 证件号码
+    private String idCode;
+
+
+    // 手机号
+    private String mobile;
+
+    // 人员类别
+    private String personalType;
+
+    // 管控级别
+    private String controlLevel;
+    // 管控间隔
+    private String controlTimeInterval;
+
+    // 责任单位名称
+    private String responsibleDepartName;
+
+    // 责任民警姓名
+    private String responsibleName;
+
+    //责任民警警号
+    private String responsibleEmpNo;
+    //责任单位Id
+    private String responsibleDepartId;
+
+    private String supStatus;
+}

src/main/java/com/biutag/supervision/pojo/param/TaskTestingTaskDistribute.java

@@ -0,0 +1,66 @@
+package com.biutag.supervision.pojo.param;
+
+import com.biutag.supervision.pojo.vo.FileVo;
+import com.biutag.supervision.pojo.vo.TaskInspectionProblemVo;
+import com.biutag.supervision.pojo.vo.TaskTestingAlcoholPeopleVo;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class TaskTestingTaskDistribute {
+
+    private String id;
+
+    //禁酒督察人员
+//    private TaskTestingAlcoholPeopleVo peopleVos;
+    //问题
+    private TaskInspectionProblemVo problemVo;
+
+    private String taskName;
+
+    // 办理时限
+    @NotBlank
+    private String timeLimit;
+
+    // 最大签收时长(天)
+    private Integer maxSignDuration;
+
+    // 最大办理时长(天)
+    private Integer maxHandleDuration;
+
+    // 最大延期时长(天)
+    private Integer maxExtensionDuration;
+
+    // 下发流程
+    private String distributionFlow;
+
+    // 审批流程
+    @NotBlank
+    private String approvalFlow;
+
+    // 通知单位
+    private String handleDepartType;
+
+    private String handleDepartId;
+
+    // 业务类型
+    private String businessTypeCode;
+
+    // 警种
+    private String policeType;
+
+    private String policeTypeName;
+
+    private List<String> involveProblem ;
+
+
+
+
+
+    private List<FileVo> thingFiles = new ArrayList<>();
+}

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

@@ -15,6 +15,7 @@ import java.util.List;
 @Setter
 @Getter
 public class TaskTestingAlcoholPeopleVo {
+    private String id;
 
     private String taskId;
 
@@ -33,6 +34,8 @@ public class TaskTestingAlcoholPeopleVo {
 
     private String departName;
 
+    private String departId;
+
     // 职位
     private String position = "/";
 
@@ -60,6 +63,8 @@ public class TaskTestingAlcoholPeopleVo {
     // 检测照片
     private String testingFiles;
 
+//    private String issueState;
+
     private List<FileVo> testingFileList = new ArrayList<>();
 
 }

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

@@ -11,6 +11,7 @@ import com.biutag.supervision.pojo.entity.SupRiskPersonal;
 import com.biutag.supervision.pojo.entity.SupRiskPersonalSupRecord;
 import com.biutag.supervision.pojo.param.SupRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.param.SupRiskPersonalSupRecordQueryParam;
+import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.biutag.supervision.pojo.vo.SupRiskPersonalSupRecordVo;
 import com.biutag.supervision.pojo.vo.SupRiskPersonalVo;
@@ -38,6 +39,8 @@ public class SupRiskPersonalService extends ServiceImpl<SupRiskPersonalMapper, S
         return page;
     }
 
+
+
     public SupRiskPersonalVo getPersonal(Integer taskId, String idCode) {
         return baseMapper.getPersonal(taskId, idCode);
     }

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

@@ -6,12 +6,14 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.constants.enums.TaskStatusEnum;
+import com.biutag.supervision.mapper.SupRiskPersonalMapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.SupRiskDto;
 import com.biutag.supervision.pojo.dto.TaskInspectionDto;
 import com.biutag.supervision.pojo.dto.TaskManagementDto;
 import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.param.TaskQueryParam;
+import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam;
 import com.biutag.supervision.pojo.vo.TaskVo;
 import com.biutag.supervision.pojo.vo.TemperancePoliceVo;
 import com.biutag.supervision.util.CommonUtil;
@@ -27,10 +29,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor
@@ -61,6 +60,7 @@ public class TaskManagementService {
 
     private final SupRiskPersonalService supRiskPersonalService;
 
+    private final SupRiskPersonalMapper supRiskPersonalMapper;
 
     @Transactional(rollbackFor = Exception.class)
     public boolean save(TaskManagementDto dto) {
@@ -224,7 +224,7 @@ public class TaskManagementService {
         TaskManagementDto taskManagementDto =new TaskManagementDto();
         SupTask supTask = taskService.getById(id);
         BeanUtils.copyProperties(supTask,taskManagementDto);
-        List<LocalDateTime> times = new ArrayList<>();
+        List<Date> times = new ArrayList<>();
         times.add(supTask.getBeginTime());
         times.add(supTask.getEndTime());
 
@@ -302,6 +302,43 @@ public class TaskManagementService {
         return taskManagementDto;
     }
 
+    public Page<SupRiskDto> getSupRiskDtoPage(TaskRiskPersonalQueryParam queryParam){
+        LambdaQueryWrapper<SupRiskPersonal> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getId()),SupRiskPersonal::getTaskId,queryParam.getId());
+        queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()),SupRiskPersonal::getName,queryParam.getName());
+        queryWrapper.like(StrUtil.isNotBlank(queryParam.getIdCode()),SupRiskPersonal::getIdCode,queryParam.getIdCode());
+        queryWrapper.like(StrUtil.isNotBlank(queryParam.getMobile()),SupRiskPersonal::getMobile,queryParam.getMobile());
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getPersonalType()),SupRiskPersonal::getPersonalType,queryParam.getPersonalType());
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getControlLevel()),SupRiskPersonal::getControlLevel,queryParam.getControlLevel());
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getResponsibleDepartId()),SupRiskPersonal::getResponsibleDepartId,queryParam.getResponsibleDepartId());
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getResponsibleName()),SupRiskPersonal::getResponsibleName,queryParam.getResponsibleName());
+        queryWrapper.like(StrUtil.isNotBlank(queryParam.getControlTimeInterval()),SupRiskPersonal::getControlTimeInterval,queryParam.getControlTimeInterval());
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getSupStatus()),SupRiskPersonal::getSupStatus,queryParam.getSupStatus());
+       Page<SupRiskPersonal> supRiskPersonalPage= supRiskPersonalMapper.riskPersonalPage(Page.of(queryParam.getCurrent(), queryParam.getSize()),queryWrapper);
+        List<SupRiskDto> supRiskDtoList = new ArrayList<>();
+        supRiskPersonalPage.getRecords().forEach((s)->{
+            SupRiskDto supRiskDto = new SupRiskDto();
+            BeanUtils.copyProperties(s,supRiskDto);
+            if (StrUtil.isNotBlank(s.getImageBase64())){
+                supRiskDto.setImgBase64(s.getImageBase64());
+            }
+            if(s.getTaskPersonId() != null){
+                SupTaskPerson person =  taskPersonService.getById(s.getTaskPersonId());
+                supRiskDto.setControlEmpNo(person.getEmpNo());
+                supRiskDto.setControlName(person.getName());
+            }
+            supRiskDtoList.add(supRiskDto);
+        });
+        Page<SupRiskDto> supRiskDtoPage=new Page<>();
+        supRiskDtoPage.setCurrent(supRiskPersonalPage.getCurrent());
+        supRiskDtoPage.setSize(supRiskPersonalPage.getSize());
+        supRiskDtoPage.setTotal(supRiskPersonalPage.getTotal());
+        supRiskDtoPage.setRecords(supRiskDtoList);
+        return supRiskDtoPage;
+    }
+
+
+
     /**
      * 删除数据
      * */

src/main/resources/mapper/SupRiskPersonalMapper.xml

@@ -31,4 +31,10 @@
                 LEFT JOIN sup_police p on stp.emp_no = p.emp_no
             ${ew.getCustomSqlSegment}
     </select>
+
+    <select id="riskPersonalPage" resultType="com.biutag.supervision.pojo.entity.SupRiskPersonal">
+        select *
+        from sup_risk_personal
+        ${ew.getCustomSqlSegment}
+    </select>
 </mapper>

src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml

@@ -10,6 +10,9 @@
             peo.name,
             peo.emp_no,
             peo.id_code,
+            peo.id,
+
+            peo.depart_id,
             d.short_name depart_name,
             p.position,
             p.avatar_url,