diff --git a/pom.xml b/pom.xml
index 1657e0e..73ae78c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,13 @@
             <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
         </dependency>
 
+        <!-- 达梦数据库驱动 -->
+        <!-- 达梦数据库驱动 -->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.3.140</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-devtools</artifactId>-->
diff --git a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java
index 0bb02a9..4b48491 100644
--- a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java
+++ b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java
@@ -47,7 +47,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/common/**")
                 .excludePathPatterns("/app/**")
                 // excel导出
-                .excludePathPatterns("/data/petitionComplaint12337/export/result", "/negative/books/export/**","/data/petitionComplaint/export/**","/confinement/export")
+                .excludePathPatterns("/data/petitionComplaint12337/export/result","/sampling/export/samplingPoling", "/negative/books/export/**","/data/petitionComplaint/export/**","/confinement/export")
                 .excludePathPatterns(List.of("/doc.html", "/webjars/**", "/favicon.ico", "/v3/api-docs/**"));
         registry.addInterceptor(new ApiInterceptor())
                 .addPathPatterns("/api/jwdc/**");
diff --git a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java
index e43fdac..a127664 100644
--- a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java
+++ b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java
@@ -3,6 +3,7 @@ package com.biutag.supervision.controller.data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
@@ -24,9 +25,6 @@ import com.biutag.supervision.pojo.entity.NegativeTask;
 import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam;
-import com.biutag.supervision.pojo.param.NegativeQueryParam;
-import com.biutag.supervision.pojo.vo.DataPetitionComplaintExportGabxfVo;
-import com.biutag.supervision.pojo.vo.DataPetitionComplaintNegativeVo;
 import com.biutag.supervision.pojo.vo.DataPetitionComplaintVo;
 import com.biutag.supervision.pojo.vo.ExportGabxfVo;
 import com.biutag.supervision.service.DataPetitionComplaintService;
@@ -133,10 +131,6 @@ public class DataPetitionComplaintController {
                                 data.setDepartId(departs.get(0).getId());
                             }
                         }
-
-
-
-
                     }
                 }
 
@@ -300,7 +294,12 @@ public class DataPetitionComplaintController {
             dataPetitionComplaint.setProblemSourcesCode(ProblemSourcesEnum.GABXF.getValue());
             dataPetitionComplaint.setCreateTime(LocalDateTime.now());
             dataPetitionComplaint.setUpdateTime(LocalDateTime.now());
-            dataPetitionComplaint.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue());
+            DataPetitionComplaint obj = dataPetitionComplaintService.getOne(new LambdaQueryWrapper<DataPetitionComplaint>().eq(DataPetitionComplaint::getOriginId,item.getOriginId()));
+            if(ObjectUtil.isNotEmpty(obj)){
+                dataPetitionComplaint.setDistributionState(obj.getDistributionState());
+            }else{
+                dataPetitionComplaint.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue());
+            }
             //信访形式
             if (StringUtil.isNotEmpty(item.getPetitionType())) {
                 dataPetitionComplaint.setChannelForFilingComplaints(item.getPetitionType());
diff --git a/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java b/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java
index a288134..f0fb8b4 100644
--- a/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java
+++ b/src/main/java/com/biutag/supervision/controller/data/VideoInspectionController.java
@@ -22,7 +22,6 @@ import com.biutag.supervision.pojo.vo.VideoInspectionVo;
 import com.biutag.supervision.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java
index 0c42013..e9971ed 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVAuditController.java
@@ -1,19 +1,15 @@
 package com.biutag.supervision.controller.datav;
 
 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.pojo.Result;
 import com.biutag.supervision.pojo.dto.common.PieItem;
 import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.entity.NegativeBlame;
-import com.biutag.supervision.pojo.entity.NegativeProblemRelation;
 import com.biutag.supervision.pojo.entity.News;
 import com.biutag.supervision.pojo.vo.AuditOverview;
-import com.biutag.supervision.pojo.vo.NewsVo;
 import com.biutag.supervision.service.NegativeBlameService;
-import com.biutag.supervision.service.NegativeProblemRelationService;
 import com.biutag.supervision.service.NegativeService;
 import com.biutag.supervision.service.NewsService;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
index 7b38492..d735152 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
@@ -8,23 +8,22 @@ import com.biutag.supervision.mapper.DataCaseVerifMapper;
 import com.biutag.supervision.mapper.NegativeMapper;
 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.vo.CaseVerificationCountVo;
 import com.biutag.supervision.pojo.vo.CaseVerificationMapVo;
 import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo;
-import com.biutag.supervision.service.CaseVerificationService;
-import com.biutag.supervision.service.DataCaseVerifService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -134,8 +133,12 @@ public class DataVCaseVerifController {
         endTime = DateUtil.endOfDay(endTime);
 //        "IFNULL( ROUND(   COUNT( DISTINCT IF(ng.checkStatus IN (1, 2), ng.id, NULL) ) / count(DISTINCT ng.id)*100, 1  ), 0   ) AS rate "
         CaseVerificationCountVo overview =  negativeMapper.getAllCaseVerificationCount(beginTime, endTime);
+        List<String> list = Arrays.asList( A12389.getValue(),SLDJB.getValue(), ZDDJB.getValue(), SJJB.getValue());
+        long confirmed = negativeMapper.selectCount(new LambdaQueryWrapper<Negative>().in(Negative::getProblemSourcesCode,list).between(Negative::getCrtTime,beginTime,endTime));
+
         long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,endTime));
         overview.setTotal((int) total);
+        overview.setConfirmed((int) confirmed);
 //        overview.setRate((double) ((overview.getConfirmed() / total * 100) ));
         overview.setRate(NumberUtil.div((Number) (overview.getConfirmed() * 100),total ).doubleValue());
         JSONObject res = new JSONObject().fluentPut("overview", overview);
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java
index bd42c6e..8f509d8 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVGlobalController.java
@@ -6,6 +6,7 @@ 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.MailMapper;
 import com.biutag.supervision.mapper.NegativeMapper;
 import com.biutag.supervision.mapper.SupDepartMapper;
 import com.biutag.supervision.pojo.Result;
@@ -14,12 +15,10 @@ import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.vo.*;
 import com.biutag.supervision.service.DataMailService;
 import com.biutag.supervision.service.NegativeService;
-import com.gbase.jdbc.log.Log;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,6 +50,8 @@ public class DataVGlobalController {
     private final NegativeService negativeService;
 
     private final SupDepartMapper supDepartMapper;
+
+    private final MailMapper mailMapper;
     //region  左边
 
     /**
@@ -85,6 +86,7 @@ public class DataVGlobalController {
     @GetMapping("/getBusinessRate")
     public Result<JSONObject> getBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                               @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime = DateUtil.endOfDay(endTime);
         // 业务类型占比
         List<EchartsVo> ywzblist = negativeMapper.selectBusinessRate(beginTime, endTime);
         JSONObject res = new JSONObject().fluentPut("ywzblist", ywzblist);
@@ -113,7 +115,8 @@ public class DataVGlobalController {
 
         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 = 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);
@@ -132,17 +135,18 @@ public class DataVGlobalController {
 //    @Cacheable(cacheNames = "Supervision:Screen:GlobalMap", key = "#beginTime.getTime()+'_'+#endTime.getTime()")
     public Result<JSONObject> getGlobalMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                            @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        Date bigEndTime = DateUtil.endOfDay(endTime);
         // 地图数据
         List<GlobalMapIconVo> mapIconVos = new ArrayList<>();
         List<SupDepart> list = supDepartMapper.selectList(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getStatisticsGroupId,"3"));
         list.forEach((s)->{
             Integer departId =Integer.valueOf(s.getId());
             GlobalMapIconVo vos=new GlobalMapIconVo();
-            GlobalOverViewVo overview = negativeMapper.getSuoOneAllGlobalCount(departId, beginTime, endTime);
-            MailOverviewVo vo = dataMailService.mailCount(departId,beginTime, endTime);
+            GlobalOverViewVo overview = negativeMapper.getSuoOneAllGlobalCount(departId, beginTime, bigEndTime);
+            MailOverviewVo vo = dataMailService.mailCount(departId,beginTime, bigEndTime);
             // 局长信箱
             long mailboxNumber = negativeService.count(new LambdaQueryWrapper<Negative>()
-                    .between(Negative::getCrtTime, beginTime, endTime)
+                    .between(Negative::getCrtTime, beginTime, bigEndTime)
                     .eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue())
                     .eq(Negative::getSecondInvolveDepartId,departId)
             );
@@ -168,6 +172,7 @@ public class DataVGlobalController {
     @Operation(summary = "数据大屏问题趋势统计")
     @GetMapping("/getGlobalTrend")
     public Result<JSONObject> getGlobalRecentlyTrendByMonth(@RequestParam Integer year) {
+
         List<EchartsVo> GlobalRecentlyTrendList = negativeMapper.getGlobalRecentlyTrendByMonth(year.toString());
         JSONObject jsonObject = new JSONObject().fluentPut("globalRecentlyTrendList", GlobalRecentlyTrendList);
         return Result.success(jsonObject);
@@ -210,6 +215,7 @@ public class DataVGlobalController {
     @GetMapping("/getProblemBusinessRate")
     public Result<JSONObject> getProblemBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                      @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime = DateUtil.endOfDay(endTime);
         // 问题类型占比
         List<EchartsVo> wtlxlist = negativeMapper.selectProblemRate(beginTime, endTime);
         JSONObject res = new JSONObject().fluentPut("wtlxlist", wtlxlist);
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java
index c5ce28f..9efe3c2 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVJwpyController.java
@@ -1,16 +1,13 @@
 package com.biutag.supervision.controller.datav;
 
-import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.biutag.supervision.mapper.NegativeMapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.SupDictData;
 import com.biutag.supervision.pojo.vo.DistributionVo;
-import com.biutag.supervision.service.DataVJwpyService;
 import com.biutag.supervision.service.SupDictDataService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java
index 6a3184c..5bc35c9 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java
@@ -14,7 +14,6 @@ import com.biutag.supervision.service.DataMailService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,6 +59,9 @@ public class DataVMailViewController {
         MailFirstAndRepeatOverviewVo fxjsFirstAndRepeatOverview = dataPetitionComplaintMapper.getFirstAndRepeatOverview(beginTime, endTime, 3,codes);
         MailFirstAndRepeatOverviewVo bwzdFirstAndRepeatOverview = dataPetitionComplaintMapper.getFirstAndRepeatOverview(beginTime, endTime, 4,codes);
 
+        //未知数据
+        int nullNumber =  dataPetitionComplaintMapper.getNullObjectData(beginTime, endTime, codes);
+        fxjsFirstAndRepeatOverview.setFirstMail(fxjsFirstAndRepeatOverview.getFirstMail() + nullNumber);
         // 初访重访分类数据排行
         List<OrganizeProblemRankVo> fxsjFirstRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 3, RepeatEnum.FIRST_MAIL.getId(),codes);   // 1
         List<OrganizeProblemRankVo> fxsjRepeatRankList = dataPetitionComplaintMapper.getMailRank(beginTime, endTime, 3, RepeatEnum.REPEAT_MAIL.getId(),codes);  // 2
@@ -76,6 +78,7 @@ public class DataVMailViewController {
                 .fluentPut("fxsjLeaderViewRankList", fxsjLeaderViewRankList)
                 .fluentPut("bwzdFirstRankList", bwzdFirstRankList)
                 .fluentPut("bwzdRepeatRankList", bwzdRepeatRankList)
+                .fluentPut("nullNumber",nullNumber)
                 .fluentPut("bwzdLeaderViewRankList", bwzdLeaderViewRankList);
         return Result.success(data);
     }
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
index b71851f..f86491b 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
@@ -4,13 +4,11 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.biutag.supervision.constants.enums.RpcApplyTypeEnum;
 import com.biutag.supervision.mapper.RpcApplyMapper;
 import com.biutag.supervision.mapper.RpcInfringerResultMapper;
 import com.biutag.supervision.mapper.SupDepartMapper;
-import com.biutag.supervision.mapper.SupDictDataMapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.common.PieItem;
 import com.biutag.supervision.pojo.entity.RpcApply;
@@ -20,15 +18,12 @@ import com.biutag.supervision.pojo.entity.SupDictData;
 import com.biutag.supervision.pojo.model.DataRightsComfortModel;
 import com.biutag.supervision.pojo.vo.ComfortMapIconVo;
 import com.biutag.supervision.pojo.vo.EchartsVo;
-import com.biutag.supervision.pojo.vo.MailMapIconVo;
 import com.biutag.supervision.service.DataRightsComfortService;
 import com.biutag.supervision.service.RpcApplyService;
-import com.biutag.supervision.service.RpcInfringerResultService;
 import com.biutag.supervision.service.SupDictDataService;
 import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
@@ -93,13 +88,36 @@ public class DataVRightsComfortController {
                         result.setHitPersonNumber(initialListSize -  hitPersonNumber +nums);
                     }
 
-                    Map<String, List<RpcApply>> collect = list.stream()
-                            .filter(s-> StrUtil.isNotEmpty(s.getInfringerHandle()) )
-                            .collect(Collectors.groupingBy(RpcApply::getInfringerHandle));
-                    // 打处情况
-                    result.setPunishmentSituation(collect.keySet().stream().map(name -> {
-                        return new PieItem(name, collect.get(name).size());
+                   List<RpcInfringerResult> rpcInfringerResults =  rpcInfringerResultMapper.selectDataByTime(beginTime, finalEndTime);
+                    Map<String, List<RpcInfringerResult>> collect = rpcInfringerResults.stream()
+                            .filter(s-> StrUtil.isNotEmpty(s.getDefendHandleWayName()) )
+                            .collect(Collectors.groupingBy(RpcInfringerResult::getDefendHandleWayName));
+
+                    result.setPunishmentSituation( collect.keySet().stream().map(name->{
+                        long size = collect.get(name).size();
+                        long number = collect.get(name).stream()
+                                .filter(s -> s.getTortName().contains(",")).toList().size();
+                        // 筛选出包含逗号的名称
+                        long numData = collect.get(name).stream()
+                                .filter(s -> s.getTortName().contains(","))
+                                .mapToLong(s -> s.getTortName().split(",").length) // 拆分每个名称并计算拆分后的数组长度
+                                .sum();// 计算所有拆分后数组长度的总和
+                        if(tortNames.stream().noneMatch(s -> s.contains(","))){
+                            return new PieItem(name, (int) size);
+                        }else{
+                            return new PieItem(name, (int) (size -  number +numData));
+                        }
                     }).toList());
+
+
+
+//                    Map<String, List<RpcApply>> collect = list.stream()
+//                            .filter(s-> StrUtil.isNotEmpty(s.getInfringerHandle()) )
+//                            .collect(Collectors.groupingBy(RpcApply::getInfringerHandle));
+//                    // 打处情况
+//                    result.setPunishmentSituation(collect.keySet().stream().map(name -> {
+//                        return new PieItem(name, collect.get(name).size());
+//                    }).toList());
                 }),
                 CompletableFutureUtil.runSyncObject(() -> {
                     //  抚慰人数
diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java
index 2837739..091e37f 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVVideoSuperviseController.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.controller.datav;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.biutag.supervision.mapper.NegativeMapper;
 import com.biutag.supervision.mapper.WvpDeviceChannelMapper;
@@ -14,7 +13,6 @@ import com.biutag.supervision.pojo.vo.VideoSuperviseMapIconVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,6 +104,7 @@ public class DataVVideoSuperviseController {
     @GetMapping("/getAllVideoSuperviseCount")
     public Result<JSONObject> getAllVideoSuperviseCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                         @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        endTime = DateUtil.endOfDay(endTime);
         // 获取视频督察中央数据
         VideoSuperviseCountVo overview = negativeMapper.getAllVideoSuperviseCount(beginTime, endTime);
         JSONObject data = new JSONObject().fluentPut("overview", overview);
@@ -159,6 +158,8 @@ public class DataVVideoSuperviseController {
     @GetMapping("/getVideoSuperviseProblemTypeRate")
     public Result<JSONObject> getVideoSuperviseProblemTypeRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                                @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+
+        endTime =DateUtil.endOfDay(endTime);
         List<EchartsVo> videoSuperviseProblemTypeRate = negativeMapper.getVideoSuperviseProblemTypeRate(beginTime, endTime);
         JSONObject jsonObject = new JSONObject().fluentPut("videoSuperviseProblemTypeRate", videoSuperviseProblemTypeRate);
         return Result.success(jsonObject);
diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java
new file mode 100644
index 0000000..fa2b297
--- /dev/null
+++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/SamplingController.java
@@ -0,0 +1,101 @@
+package com.biutag.supervision.controller.mobileSupervision;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.biutag.supervision.pojo.Result;
+import com.biutag.supervision.pojo.dto.SamplingPoliceDto;
+import com.biutag.supervision.pojo.param.SamplingQueryParam;
+import com.biutag.supervision.pojo.vo.DataPetitionComplaintExportGabxfVo;
+import com.biutag.supervision.pojo.vo.PoliceVo;
+import com.biutag.supervision.pojo.vo.SamplingVo;
+import com.biutag.supervision.service.SamplingService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@RequestMapping("sampling")
+@RequiredArgsConstructor
+@RestController
+public class SamplingController {
+
+    private final SamplingService samplingService;
+
+    /**
+     * 分页查询
+     * */
+    @GetMapping
+    public Result<Page<SamplingVo>> list(SamplingQueryParam param) {
+        return Result.success(samplingService.page(param));
+    }
+
+    /**
+     * 添加或者修改
+     * */
+    @PostMapping
+    public Result<Boolean> addOrUpdata(@RequestBody SamplingVo samplingVo){
+        if(samplingService.addOrUpdata(samplingVo)){
+            return Result.success();
+        }else{
+           return  Result.failed(5000,"操作失败");
+        }
+    }
+
+    /**
+     * 删除数据
+     * */
+    @DeleteMapping("{id}")
+    public Result<Boolean> delData(@PathVariable String id){
+        if(samplingService.delDataById(id)){
+            return Result.success();
+        }else{
+            return  Result.failed(5000,"操作失败");
+        }
+    }
+    /**
+     *获取随机
+     * */
+    @PostMapping("/postSamplingPolice")
+    public Result<List<PoliceVo>> postSamplingPolice(@RequestBody SamplingVo vo){
+        List<PoliceVo> list = samplingService.getSamplingPolice(vo);
+        return Result.success(list);
+    }
+
+    /**
+     * 获取详情
+     * */
+    @GetMapping("{id}")
+    public Result<SamplingVo> getDetail(@PathVariable String id){
+        SamplingVo samplingVo=samplingService.getDetail(id);
+        return  Result.success(samplingVo);
+    }
+
+    /**
+     *导出抽检人员数据
+     * */
+    @GetMapping("export/samplingPoling")
+    public void exportBySampling(SamplingVo vo, HttpServletResponse response) throws IOException {
+        AtomicInteger i = new AtomicInteger(1);
+        if(StrUtil.isNotBlank(vo.getOrgStr())){
+            vo.setOrgIds(List.of(vo.getOrgStr().split(",")));
+        }
+        List<PoliceVo> data  =  samplingService.getSamplingPolice(vo);
+        List<SamplingPoliceDto> list = data.stream().map(item -> {
+            SamplingPoliceDto exportGabVo = new SamplingPoliceDto();
+            BeanUtil.copyProperties(item, exportGabVo);
+            return exportGabVo;
+        }).toList();
+        String excelName = StrUtil.isNotBlank( vo.getSamplingName())?vo.getSamplingName():"人员抽检规则";
+        String headerValue = "attachment; filename=\"" + URLEncoder.encode(excelName+".xlsx", "UTF-8") + "\"";
+        response.setHeader("Content-Disposition", headerValue);
+        response.setContentType("application/octet-stream");
+        EasyExcel.write(response.getOutputStream(), SamplingPoliceDto.class).inMemory(Boolean.TRUE).sheet(excelName+".xlsx").doWrite(list);
+
+    }
+}
diff --git a/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java b/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java
index 95d52f7..76942a4 100644
--- a/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java
+++ b/src/main/java/com/biutag/supervision/controller/rightsComfort/SuperviseController.java
@@ -4,14 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.RpcApplySupervise;
-import com.biutag.supervision.pojo.param.RpcApplyQueryParam;
 import com.biutag.supervision.pojo.param.RpcApplySupervisionQueryParam;
 import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import com.biutag.supervision.pojo.vo.RpcSuperviseVo;
-import com.biutag.supervision.service.RpcApplyService;
 import com.biutag.supervision.service.RpcApplySuperviseService;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,6 +40,14 @@ public class SuperviseController  {
             return Result.failed("没有找到相关的数据");
         }
     }
+
+    //上报数据
+    @PostMapping("/reportedData")
+    public Result<String> reportedData(@RequestBody RpcSuperviseVo vo){
+        rpcApplySuperviseService.upSuperviseData(vo);
+        return Result.success();
+    }
+
     /**
      * 不属实
      * */
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java
index ca278ed..a4860fb 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java
@@ -16,7 +16,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java
index af11dce..1477c44 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java
@@ -4,7 +4,6 @@ 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.NegativeMapper;
-import com.biutag.supervision.mapper.NegativeProblemRelationMapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.vo.*;
@@ -13,7 +12,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
 
-import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.*;
-
 /**
  * @Auther: sh
  * @Date: 2024/12/4 16:30
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java
index 674f808..9cd5698 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneMailViewController.java
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java
index 1c818c8..49cbc76 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java
@@ -8,23 +8,19 @@ import com.biutag.supervision.constants.enums.RpcApplyTypeEnum;
 import com.biutag.supervision.mapper.CountyStreetDeptMapper;
 import com.biutag.supervision.mapper.RpcApplyMapper;
 import com.biutag.supervision.mapper.RpcInfringerResultMapper;
-import com.biutag.supervision.mapper.SupDepartMapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.common.BarItem;
 import com.biutag.supervision.pojo.dto.common.PieItem;
 import com.biutag.supervision.pojo.entity.CountyStreetDept;
 import com.biutag.supervision.pojo.entity.RpcApply;
-import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.entity.SupDictData;
 import com.biutag.supervision.pojo.vo.ComfortCountVO;
 import com.biutag.supervision.pojo.vo.ComfortMapIconVo;
 import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.service.DataRightsComfortService;
 import com.biutag.supervision.service.RpcApplyService;
-import com.biutag.supervision.service.SupDepartService;
 import com.biutag.supervision.service.SupDictDataService;
 import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil;
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -37,8 +33,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.biutag.supervision.constants.enums.DepartGroupEnum.COUNTY_CITY_BUREAUS;
-
 /**
  * @Auther: sh
  * @Date: 2024/12/24 17:50
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java
index e79c4fa..c59833e 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java
@@ -2,7 +2,6 @@ package com.biutag.supervision.controller.subdatav;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.biutag.supervision.constants.enums.InspectCaseEnum;
@@ -16,7 +15,6 @@ import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.entity.NegativeBlame;
 import com.biutag.supervision.pojo.entity.News;
 import com.biutag.supervision.pojo.vo.*;
-import com.biutag.supervision.service.CountyStreetDeptService;
 import com.biutag.supervision.service.NegativeBlameService;
 import com.biutag.supervision.service.NewsService;
 import com.biutag.supervision.service.SubOneSupervisionNotifyService;
@@ -25,7 +23,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java
index 3d58883..9a14c97 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneVideoSuperviseController.java
@@ -12,7 +12,6 @@ import com.biutag.supervision.service.SubOneVideoSuperviseService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/biutag/supervision/controller/system/DepartController.java b/src/main/java/com/biutag/supervision/controller/system/DepartController.java
index 5a27b1a..f7d1966 100644
--- a/src/main/java/com/biutag/supervision/controller/system/DepartController.java
+++ b/src/main/java/com/biutag/supervision/controller/system/DepartController.java
@@ -21,7 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
diff --git a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java
index f393867..3075d88 100644
--- a/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java
+++ b/src/main/java/com/biutag/supervision/controller/work/ConfinementController.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.controller.work;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,25 +10,20 @@ import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.ConfinementDto;
 import com.biutag.supervision.pojo.entity.Confinement;
 import com.biutag.supervision.pojo.entity.SupDepart;
-import com.biutag.supervision.pojo.model.PoliceModel;
 import com.biutag.supervision.pojo.param.ConfinementFile;
 import com.biutag.supervision.pojo.param.ConfinementQueryParam;
-import com.biutag.supervision.pojo.param.PoliceQueryParam;
 import com.biutag.supervision.pojo.vo.*;
 import com.biutag.supervision.service.ConfinementFileService;
 import com.biutag.supervision.service.ConfinementService;
 import com.biutag.supervision.util.CommonUtil;
 import jakarta.servlet.http.HttpServletResponse;
-import jdk.jfr.TransitionFrom;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.beans.Transient;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java
index 6824c8a..d876119 100644
--- a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java
+++ b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.controller.work;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
diff --git a/src/main/java/com/biutag/supervision/job/Job.java b/src/main/java/com/biutag/supervision/job/Job.java
index 43a5a0e..56dcbef 100644
--- a/src/main/java/com/biutag/supervision/job/Job.java
+++ b/src/main/java/com/biutag/supervision/job/Job.java
@@ -149,7 +149,9 @@ public class Job {
                     }
 
                 }
-
+                if(StrUtil.isNotBlank(ajjbxx.getAjmc())){
+                    rpcApply.setCaseName(ajjbxx.getAjmc());
+                }
                 //获取单位进行处理
                 if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){
 
@@ -201,7 +203,13 @@ public class Job {
             rpcApplyPerson.setIdCode(item.getGmsfhm());
             //受到侵权形式
 //            rpcApplyPerson.setFormsOfTort(item.getShxsmc());
+            rpcApplyPerson.setEmpName(item.getXm());
+            if(StrUtil.isNotEmpty(item.getXbmc())){
+                rpcApplyPerson.setGender( item.getXbmc().split("性")[0]);
+            }
 
+            SupPolice policeData = policeService.getByIdCode(item.getGmsfhm());
+//            rpcApplyPerson.setEmpNo(item.get);
             if(Objects.nonNull(police)){
                 rpcApply.setApplicantEmpNo(police.getEmpNo());
             }
@@ -210,6 +218,7 @@ public class Job {
             if(ObjectUtil.isNotEmpty(police)){
                 rpcApplyPerson.setEmpType(police.getJobType());
             }
+            rpcApplyPerson.setEmpNo(rpcApply.getApplicantEmpNo());
 
             //存储受害人信息
             rpcApplyPersonService.save(rpcApplyPerson);
diff --git a/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java b/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java
index d3e4202..755ac50 100644
--- a/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/DataAlarmDispositionInfoMapper.java
@@ -11,4 +11,4 @@ public interface DataAlarmDispositionInfoMapper extends BaseMapper<DataAlarmDisp
 
     Page<VideoInspectionVo> queryPage(@Param("page") Page<DataAlarmDispositionInfo> page, @Param("ew") QueryWrapper<DataAlarmDispositionInfo> ew);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java
index 8b1842e..affa888 100644
--- a/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/DataPetition12337Mapper.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.entity.DataPetition12337;
-import com.biutag.supervision.pojo.entity.DataPetitionComplaint;
 import com.biutag.supervision.pojo.vo.DataPetition12337ExportVo;
 import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.pojo.vo.RecentMailTrendByMonthVo;
diff --git a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
index 29b3ec6..b90f1c9 100644
--- a/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/DataPetitionComplaintMapper.java
@@ -71,6 +71,19 @@ public interface DataPetitionComplaintMapper extends BaseMapper<DataPetitionComp
             "</script>")
     MailFirstAndRepeatOverviewVo getFirstAndRepeatOverview(Date beginTime, Date endTime, Integer groupId,List<String> codes);
 
+
+    @Select( "<script>"+
+            "SELECT   count(*) " +
+            "FROM data_petition_complaint dpc " +
+            "WHERE dpc.create_time BETWEEN #{beginTime} AND #{endTime} " +
+            "and dpc.second_depart_id is null and dpc.initial_petition is null "+
+            "AND dpc.problem_sources_code in "+
+            "<foreach collection='codes' item='item' open='(' separator=',' close=')'>"+
+            "#{item}"+
+            "</foreach>"+
+            "</script>")
+    int getNullObjectData(Date beginTime, Date endTime,List<String> codes);
+
     @Select(
             "<script>"+
             "SELECT  " +
diff --git a/src/main/java/com/biutag/supervision/mapper/MailMapper.java b/src/main/java/com/biutag/supervision/mapper/MailMapper.java
index e8200c5..5eb9e5d 100644
--- a/src/main/java/com/biutag/supervision/mapper/MailMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/MailMapper.java
@@ -6,6 +6,7 @@ import com.biutag.supervision.pojo.entity.mailbox.Mail;
 import com.biutag.supervision.pojo.vo.EchartsVo;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,8 +20,14 @@ public interface MailMapper extends BaseMapper<Mail> {
             "COUNT(*) AS value  " +
             "FROM mailbox.mail  " +
             "WHERE EXTRACT(YEAR FROM create_time) = #{year}  " +
-            "AND mail_state='terminated'  " +
+            "AND mail_state !='terminated'  " +
             "GROUP BY TO_CHAR(DATE_TRUNC('month', create_time), 'MM')  " +
             "ORDER BY name;")
     List<EchartsVo> selectTrendByYear(Integer year);
+
+
+    @Select("   select count(*) as value from mailbox.mail "+
+    "   where create_time between #{startTime} and #{endTime} ")
+    int selectMailDataCount(Date startTime, Date endTime);
+
 }
diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeFileMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeFileMapper.java
index 33145b1..fb8092c 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeFileMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeFileMapper.java
@@ -13,4 +13,4 @@ public interface NegativeFileMapper extends BaseMapper<NegativeFile> {
     @Select("select f.*, c.class_title file_class_title from negative_file f left join file_class c on f.file_class_id = c.id where f.negtiveId = #{negativeId}")
     List<NegativeFileVo> selectVoByNegativeId(String negativeId);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
index a5ce2f2..0543124 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
@@ -32,7 +32,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "sd.short_name AS label, " +
             "COUNT(DISTINCT ng.id ) AS `value` " +
             "FROM negative ng " +
-            "LEFT JOIN sup_depart sd ON ng.second_involve_depart_id=sd.id " +
+            "LEFT JOIN sup_depart sd ON ng.handle_second_depart_id=sd.id " +
             "WHERE ng.crtTime BETWEEN #{beginTime} AND #{endTime}  " +
             "AND sd.statistics_group_id=#{groupType} " +
             "GROUP BY sd.short_name " +
@@ -44,7 +44,6 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "businessTypeName as name, " +
             "count(*) value FROM negative " +
             "WHERE crtTime BETWEEN #{beginTime} and #{endTime} " +
-            "and checkStatus in (1, 2) " +
             "GROUP BY businessTypeName")
     List<EchartsVo> selectBusinessRate(Date beginTime, Date endTime);
     @Select("SELECT  " +
@@ -54,7 +53,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "COALESCE(SUM(IF(problemSourcesCode IN (27,28,29,30), 1, 0)), 0) AS auditPro,   " +
             "COALESCE(SUM(IF(problemSourcesCode IN (2), 1, 0)), 0) AS talkPro   " +
             "FROM negative ng WHERE ng.crtTime BETWEEN #{beginTime} AND #{endTime} " +
-            "AND ng.second_involve_depart_id=#{departId} ")
+            "AND ng.handle_second_depart_id=#{departId} ")
 //               "COALESCE(SUM(IF(problemSourcesCode IN (27, 28, 29, 30), 1, 0)), 0) AS auditPro  " +
     GlobalOverViewVo getSuoOneAllGlobalCount(Integer departId, Date beginTime, Date endTime);
 
diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java
index 470cb6c..72b41bb 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeProblemRelationMapper.java
@@ -2,13 +2,6 @@ package com.biutag.supervision.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervision.pojo.entity.NegativeProblemRelation;
-import com.biutag.supervision.pojo.vo.CommonVo;
-import com.biutag.supervision.pojo.vo.EchartsVo;
-import com.biutag.supervision.pojo.vo.StrongProblemRank;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Date;
-import java.util.List;
 
 public interface NegativeProblemRelationMapper extends BaseMapper<NegativeProblemRelation> {
 
@@ -18,4 +11,4 @@ public interface NegativeProblemRelationMapper extends BaseMapper<NegativeProble
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeScorePoliceMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeScorePoliceMapper.java
index 9ddd2d7..d47baed 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeScorePoliceMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeScorePoliceMapper.java
@@ -3,7 +3,6 @@ package com.biutag.supervision.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervision.pojo.entity.NegativeScorePolice;
 import com.biutag.supervision.pojo.vo.RiskStatisticsVo;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
diff --git a/src/main/java/com/biutag/supervision/mapper/RiskModelTaskClueMapper.java b/src/main/java/com/biutag/supervision/mapper/RiskModelTaskClueMapper.java
index 7fbf8cf..24994a3 100644
--- a/src/main/java/com/biutag/supervision/mapper/RiskModelTaskClueMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RiskModelTaskClueMapper.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.entity.RiskModelTaskClue;
-import com.biutag.supervision.pojo.model.NegativeWorkModel;
 import com.biutag.supervision.pojo.vo.RiskModelTaskClueVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,4 +12,4 @@ public interface RiskModelTaskClueMapper extends BaseMapper<RiskModelTaskClue> {
 
     Page<RiskModelTaskClueVo> queryPage(@Param("page") Page<RiskModelTaskClue> page, @Param(Constants.WRAPPER) QueryWrapper<RiskModelTaskClue> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/RiskPersonalMapper.java b/src/main/java/com/biutag/supervision/mapper/RiskPersonalMapper.java
index a33566a..155df7a 100644
--- a/src/main/java/com/biutag/supervision/mapper/RiskPersonalMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RiskPersonalMapper.java
@@ -11,4 +11,4 @@ public interface RiskPersonalMapper extends BaseMapper<RiskPersonal> {
 
     Page<RiskPersonalVo> queryPage(@Param("page") Page<RiskPersonal> page, @Param("param") RiskPersonalQueryParam param);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
index 07889da..32d830e 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
@@ -311,6 +311,7 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
 
     )
     List<PieItem> selectComfortPoliceInjurySituation(Date beginTime, Date endTime);
+
     @Select("select  p.injury_severity_name name, count(r.rpc_id) value from rpc_apply r left join rpc_apply_person p on r.rpc_id = p.rpc_id where r.crt_time between #{beginTime} and #{endTime} and r.type = 2 GROUP BY p.injury_severity_name")
     List<PieItem> selectComfortInjuryCategory(Date beginTime, Date endTime);
 
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
index c200350..d14715f 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.biutag.supervision.pojo.entity.RpcApply;
 import com.biutag.supervision.pojo.entity.RpcApplyPerson;
 import com.biutag.supervision.pojo.entity.RpcApplySupervise;
 import com.biutag.supervision.pojo.vo.RpcApplyVo;
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
index aee72d7..7173634 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.biutag.supervision.pojo.entity.RpcApply;
 import com.biutag.supervision.pojo.entity.RpcApplySupervise;
 import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyWorkMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyWorkMapper.java
index 0976b14..0c35e09 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplyWorkMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyWorkMapper.java
@@ -13,4 +13,4 @@ public interface RpcApplyWorkMapper extends BaseMapper<RpcApplyWork> {
 
     Page<RpcApplyVo> queryPage(@Param("page") Page<RpcApply> page, @Param(Constants.WRAPPER) QueryWrapper<RpcApply> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcInfringerResultMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcInfringerResultMapper.java
index 5570a0c..3b33f03 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcInfringerResultMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcInfringerResultMapper.java
@@ -15,6 +15,14 @@ public interface RpcInfringerResultMapper extends BaseMapper<RpcInfringerResult>
             " and rpa.type = 1 ")
     List<String> selectNamesByTime(Date beginTime, Date endTime);
 
+
+    @Select(" SELECT rir.* from  rpc_infringer_result rir  LEFT JOIN  rpc_apply as rpa" +
+            " on rpa.rpc_id = rir.rpc_id" +
+            " WHERE rpa.crt_time  between #{beginTime} and #{endTime} " +
+            " and rpa.type = 1 ")
+    List<RpcInfringerResult> selectDataByTime(Date beginTime, Date endTime);
+
+
     @Select(" SELECT rir.tort_name from  rpc_infringer_result rir  LEFT JOIN  rpc_apply as rpa" +
             " on rpa.rpc_id = rir.rpc_id " +
             " WHERE rpa.crt_time  between #{beginTime} and #{endTime} " +
diff --git a/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java b/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java
index 4dc4d38..0e5d72f 100644
--- a/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java
@@ -4,14 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.biutag.supervision.pojo.entity.RpcApply;
 import com.biutag.supervision.pojo.entity.Sampling;
-import com.biutag.supervision.pojo.vo.RpcApplyVo;
-import org.apache.ibatis.annotations.Mapper;
+import com.biutag.supervision.pojo.vo.PoliceVo;
+import com.biutag.supervision.pojo.vo.SamplingVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 public interface SamplingMapper extends BaseMapper<Sampling> {
 
     Page<Sampling> queryPage(@Param("page") Page<Sampling> page, @Param(Constants.WRAPPER) QueryWrapper<Sampling> queryWrapper);
+
+    List<PoliceVo> selectPoliceData(SamplingVo vo);
+
+    List<PoliceVo> selectPoliceDataLead(SamplingVo vo);
+
 }
diff --git a/src/main/java/com/biutag/supervision/mapper/SupTaskInspectionMapper.java b/src/main/java/com/biutag/supervision/mapper/SupTaskInspectionMapper.java
index 18a9d0a..a9abd60 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupTaskInspectionMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupTaskInspectionMapper.java
@@ -12,4 +12,4 @@ public interface SupTaskInspectionMapper extends BaseMapper<SupTaskInspection> {
 
     Page<TaskInspectionVo> queryPage(@Param("page") Page<SupTaskInspection> page, @Param(Constants.WRAPPER) QueryWrapper<SupTaskInspection> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/SupTaskMapper.java b/src/main/java/com/biutag/supervision/mapper/SupTaskMapper.java
index f9b1f55..d8c5bc1 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupTaskMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupTaskMapper.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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;
@@ -17,4 +16,4 @@ public interface SupTaskMapper extends BaseMapper<SupTask> {
 
     TaskCountVo queryTaskCount(@Param(Constants.WRAPPER) QueryWrapper<SupTask> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/SupTaskSelfexaminationMapper.java b/src/main/java/com/biutag/supervision/mapper/SupTaskSelfexaminationMapper.java
index 339d197..21dfc5b 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupTaskSelfexaminationMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupTaskSelfexaminationMapper.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.entity.SupTaskSelfexamination;
-import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople;
 import com.biutag.supervision.pojo.vo.TaskSelfexaminationVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,4 +12,4 @@ public interface SupTaskSelfexaminationMapper extends BaseMapper<SupTaskSelfexam
 
     Page<TaskSelfexaminationVo> queryPage(@Param("page") Page<SupTaskSelfexamination> page, @Param(Constants.WRAPPER) QueryWrapper<SupTaskSelfexamination> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholMapper.java b/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholMapper.java
index dc94897..ba8c94b 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholMapper.java
@@ -12,4 +12,4 @@ public interface SupTaskTestingAlcoholMapper extends BaseMapper<SupTaskTestingAl
 
     Page<TaskTestingAlcoholVo> queryPage(@Param("page") Page<SupTaskTestingAlcohol> page, @Param(Constants.WRAPPER) QueryWrapper<SupTaskTestingAlcohol> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholPeopleMapper.java b/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholPeopleMapper.java
index 7b86078..5e51930 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholPeopleMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupTaskTestingAlcoholPeopleMapper.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.biutag.supervision.pojo.entity.SupTaskTestingAlcohol;
 import com.biutag.supervision.pojo.vo.TaskTestingAlcoholPeopleVo;
 import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople;
 import org.apache.ibatis.annotations.Param;
@@ -13,4 +12,4 @@ public interface SupTaskTestingAlcoholPeopleMapper extends BaseMapper<SupTaskTes
 
     Page<TaskTestingAlcoholPeopleVo> queryPage(@Param("page") Page<SupTaskTestingAlcoholPeople> page, @Param(Constants.WRAPPER) QueryWrapper<SupTaskTestingAlcoholPeople> queryWrapper);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/domain/RpcApplyDetail.java b/src/main/java/com/biutag/supervision/pojo/domain/RpcApplyDetail.java
index 4897edd..441f0ed 100644
--- a/src/main/java/com/biutag/supervision/pojo/domain/RpcApplyDetail.java
+++ b/src/main/java/com/biutag/supervision/pojo/domain/RpcApplyDetail.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.pojo.domain;
 
 import com.biutag.supervision.pojo.entity.RpcApply;
-import com.biutag.supervision.pojo.entity.RpcApplyApprove;
 import com.biutag.supervision.pojo.entity.RpcApplyPerson;
 import com.biutag.supervision.pojo.entity.RpcPerson;
 import com.biutag.supervision.pojo.vo.RpcApplyApproveVo;
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/ConfinementDto.java b/src/main/java/com/biutag/supervision/pojo/dto/ConfinementDto.java
index 28609be..8117e87 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/ConfinementDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/ConfinementDto.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
@@ -8,7 +7,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataPetition12337Distribute.java b/src/main/java/com/biutag/supervision/pojo/dto/DataPetition12337Distribute.java
index 2f4198b..6671d19 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/DataPetition12337Distribute.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/DataPetition12337Distribute.java
@@ -1,9 +1,6 @@
 package com.biutag.supervision.pojo.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.biutag.supervision.pojo.vo.FileVo;
-import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/ModelClueTaskDistribute.java b/src/main/java/com/biutag/supervision/pojo/dto/ModelClueTaskDistribute.java
index 398f771..c9f9efa 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/ModelClueTaskDistribute.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/ModelClueTaskDistribute.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.pojo.dto;
 
 import com.biutag.supervision.pojo.entity.ModelClue;
-import com.biutag.supervision.pojo.model.ModelClueModel;
 import com.biutag.supervision.pojo.vo.FileVo;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDistributeAuditDto.java b/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDistributeAuditDto.java
index 7e49d14..b37ac6a 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDistributeAuditDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/NegativeImportDistributeAuditDto.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.dto;
 
-import com.biutag.supervision.pojo.vo.FileVo;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/NewsDto.java b/src/main/java/com/biutag/supervision/pojo/dto/NewsDto.java
index cc4179f..2428ea3 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/NewsDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/NewsDto.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/SamplingPoliceDto.java b/src/main/java/com/biutag/supervision/pojo/dto/SamplingPoliceDto.java
new file mode 100644
index 0000000..344add0
--- /dev/null
+++ b/src/main/java/com/biutag/supervision/pojo/dto/SamplingPoliceDto.java
@@ -0,0 +1,18 @@
+package com.biutag.supervision.pojo.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SamplingPoliceDto {
+    @ExcelProperty("姓名")
+    private String name;
+
+    @ExcelProperty("单位")
+    private String shortName;
+
+    @ExcelProperty("警号")
+    private String empNo;
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java b/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java
index adcbaa4..4742f9c 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java
@@ -1,8 +1,6 @@
 package com.biutag.supervision.pojo.dto.flow;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.vo.FileVo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java
index b69f6a6..8e9ef3c 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java
@@ -21,9 +21,13 @@ public class DwdAsjZfbaAjjbxx {
     @TableField("ajbzdm")
     private String ajbzdm;
 
-    // 案件标准名称
+    // 案件标志名称
     @TableField("ajbzmc")
     private String ajbzmc;
+    //案件名称
+    @TableField("ajmc")
+    private String ajmc;
+
 
     // 简要案情
     @TableField("jyaq")
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java b/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java
index 37515d4..b69f9cd 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java
@@ -50,6 +50,9 @@ public class RpcApplyPerson {
     //警员身份
     @TableField("emp_type")
     private String empType;
+    //性别
+    @TableField("gender")
+    private String gender;
     //警员姓名
     private String empName;
     // 类型，1维权，2，抚慰，3容错
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java b/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java
index 463e31a..4b29715 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java
@@ -56,11 +56,11 @@ public class Sampling {
     //开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField("start_time")
-    private DateTime startTime;
+    private LocalDateTime startTime;
     //结束时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField("end_time")
-    private DateTime endTime;
+    private LocalDateTime endTime;
     //被抽检次数
     @TableField("sampling_number")
     private int samplingNumber;
@@ -90,4 +90,5 @@ public class Sampling {
     @TableField("crt_time")
     LocalDateTime crtTime;
 
+
 }
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java b/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java
index aa5d840..287d709 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java
@@ -2,9 +2,12 @@ package com.biutag.supervision.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.LocalDateTime;
+
 @Getter
 @Setter
 public class SamplingPolice {
@@ -23,6 +26,10 @@ public class SamplingPolice {
     @TableField("sampling_id")
     private String samplingId;
     //是否领导
-    @TableField("是否为领导")
+    @TableField("is_leader")
     private String isLeader;
+    //创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @TableField("crt_time")
+    private LocalDateTime crtTime;
 }
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java
index 97aef25..85d027e 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementExcelVo.java
@@ -1,11 +1,8 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
index 0cec260..c160662 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
@@ -1,11 +1,8 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java
index 3bb8fb2..609c333 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java
@@ -2,7 +2,6 @@ package com.biutag.supervision.pojo.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -10,7 +9,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * 
+ *
  * @TableName data_petition_12337
  */
 @Data
@@ -597,4 +596,4 @@ public class DataPetition12337ExportVo implements Serializable {
     @ExcelIgnore
     private String accountabilityTarget;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337Vo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337Vo.java
index 8e32723..3742d1d 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337Vo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337Vo.java
@@ -1,17 +1,13 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
- * 
+ *
  * @TableName data_petition_12337
  */
 @Data
@@ -175,4 +171,4 @@ public class DataPetition12337Vo implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java
index 1ae7c96..3ed6292 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java
@@ -1,7 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java b/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java
index 679a2c3..23ff63a 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ExPortConfinement.java
@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 @Getter
 @Setter
 public class ExPortConfinement {
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java
index 85da4b7..180217a 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java
@@ -100,4 +100,4 @@ public class ExportNegativeBlameVo {
     // 问题类型
     @ExcelProperty({"问题类型"})
     private String problemType;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java
index cf8aa4f..5779f4b 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java
@@ -127,4 +127,4 @@ public class ExportNegativeVo {
     @ExcelProperty({"","办理超时情况"})
     private String handleTimeout;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java b/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java
index fd19e06..5ba81df 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/GlobalMapIconVo.java
@@ -1,11 +1,6 @@
 package com.biutag.supervision.pojo.vo;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
 
 /**
  * @Auther: sh
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ModelVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ModelVo.java
index 7739fd7..a4c4098 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ModelVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ModelVo.java
@@ -113,4 +113,4 @@ public class ModelVo {
     // 同步机构映射
     private String clueDepartSource;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/NegativeAuditExportVo.java b/src/main/java/com/biutag/supervision/pojo/vo/NegativeAuditExportVo.java
index d20d665..bd9c578 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/NegativeAuditExportVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/NegativeAuditExportVo.java
@@ -2,17 +2,15 @@ package com.biutag.supervision.pojo.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
- * 
+ *
  * @TableName data_petition_12337
  */
 @Data
@@ -56,4 +54,4 @@ public class NegativeAuditExportVo implements Serializable {
     @ExcelProperty("责任人员")
     private String blames;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/NegativeHdjq.java b/src/main/java/com/biutag/supervision/pojo/vo/NegativeHdjq.java
index efb99c7..86e0e4f 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/NegativeHdjq.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/NegativeHdjq.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/NewsVo.java b/src/main/java/com/biutag/supervision/pojo/vo/NewsVo.java
index 08ff3f5..20469b7 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/NewsVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/NewsVo.java
@@ -1,8 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java b/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java
new file mode 100644
index 0000000..443be1a
--- /dev/null
+++ b/src/main/java/com/biutag/supervision/pojo/vo/PoliceVo.java
@@ -0,0 +1,38 @@
+package com.biutag.supervision.pojo.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PoliceVo {
+
+    //警员姓名
+    private String name;
+
+    //警号
+    private String empNo;
+    //单位名称
+    private String shortName;
+    //人员属性
+    private String personnelType;
+    //单位id
+    private String deptId;
+
+    //年龄
+    private int age;
+    //在规定时间中 抽检次数
+    private int cjnum;
+
+    //性别
+    private String gender;
+
+    //是否为领导
+    private String isLeader;
+
+    //距最后一次检测时间
+    private int daysDifference;
+    //是否违反过六项规定（饮酒）
+    private int isdrink;
+
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RecentMailTrendByDayVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RecentMailTrendByDayVo.java
index cafad1d..290bfff 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/RecentMailTrendByDayVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/RecentMailTrendByDayVo.java
@@ -2,8 +2,6 @@ package com.biutag.supervision.pojo.vo;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class RecentMailTrendByDayVo {
     private String dayTime;  // 10/01
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RiskPersonalVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RiskPersonalVo.java
index 842e8e2..3b2a05d 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/RiskPersonalVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/RiskPersonalVo.java
@@ -42,4 +42,4 @@ public class RiskPersonalVo {
 
     private String avatar;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RpcSuperviseVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RpcSuperviseVo.java
index 919f95a..b08d653 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/RpcSuperviseVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/RpcSuperviseVo.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.pojo.vo;
 
 import com.biutag.supervision.pojo.entity.RpcApplyPerson;
-import com.biutag.supervision.pojo.entity.RpcApplySupervise;
 import com.biutag.supervision.pojo.entity.RpcInfringerResult;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java
index 5e9f6e6..fa49480 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java
@@ -1,12 +1,12 @@
 package com.biutag.supervision.pojo.vo;
-
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.biutag.supervision.pojo.entity.SamplingPolice;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.sql.Date;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -19,6 +19,9 @@ public class SamplingVo {
     private String samplingName;
     //督察类型
     private String inspectorType;
+    //抽检规则
+    private String samplingInspection;
+
     //年龄范围
     //最大年龄
     private int ageMax;
@@ -28,6 +31,8 @@ public class SamplingVo {
     private String gender;
     //人员属性
     private String personnelType;
+    //人员属性Array
+    private List<String> personnelTypeArray;
     //是否违法6项规定
     private String drinkAlcohol;
     //抽检人数
@@ -39,38 +44,51 @@ public class SamplingVo {
     //辅警比例
     private int assistRatio;
     //时间范围
-    //开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    private DateTime startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<LocalDateTime> samplingTime;
+    //时间范围
+    //开始时间
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
     //结束时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    private DateTime endTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
     //被抽检次数
-    @TableField("sampling_number")
     private int samplingNumber;
     //距离最后一次检测时间
     private int distanceDay;
     //是否值班人员
     private String beDuty;
     //创建单位
-    @TableField("org_id")
     private String orgId;
     //创建人名称
-    @TableField("crt_name")
     String crtName;
     //创建时间
     LocalDateTime crtTime;
     //抽检对象
     private String samplingObj;
-
+    //状态
+    private String state;
+    //抽检对象列表
     private List<SamplingObject> samplingObjectList;
-
+    //导出使用传参
+    private String orgStr;
+    //组织机构list
+    private List<String> orgIds;
+    //抽检人员列表
     private List<SamplingPolice> samplingPolices;
+
+    @Getter
+    @Setter
+    public static class SamplingObject{
+        private String deptId;
+
+        private String value;
+    }
 }
 
 
-class SamplingObject{
-    private String deptId;
 
-    private String value;
-}
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskCountVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskCountVo.java
index 2db530b..f161951 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/TaskCountVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/TaskCountVo.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationVo.java
index 98ac621..a3fcabc 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/TaskSelfexaminationVo.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TokenVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TokenVo.java
index d8cc323..a149800 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/TokenVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/TokenVo.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/VideoInspectionInfo.java b/src/main/java/com/biutag/supervision/pojo/vo/VideoInspectionInfo.java
index 19a554d..22094d0 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/VideoInspectionInfo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/VideoInspectionInfo.java
@@ -1,6 +1,5 @@
 package com.biutag.supervision.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.biutag.supervision.pojo.entity.DataAlarmYjzj;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseCountVo.java b/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseCountVo.java
index 749eb87..8d95510 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseCountVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseCountVo.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.pojo.vo;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseMapIconVo.java b/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseMapIconVo.java
index f1b5d11..b7eb003 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseMapIconVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/VideoSuperviseMapIconVo.java
@@ -5,8 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-
 /**
  * @Auther: sh
  * @Date: 2024/11/29 09:50
diff --git a/src/main/java/com/biutag/supervision/service/CaseVerificationService.java b/src/main/java/com/biutag/supervision/service/CaseVerificationService.java
index e0697d1..8506f81 100644
--- a/src/main/java/com/biutag/supervision/service/CaseVerificationService.java
+++ b/src/main/java/com/biutag/supervision/service/CaseVerificationService.java
@@ -2,17 +2,9 @@ package com.biutag.supervision.service;
 
 import com.biutag.supervision.mapper.DataCaseVerifMapper;
 import com.biutag.supervision.mapper.NegativeMapper;
-import com.biutag.supervision.pojo.dto.common.PieItem;
-import com.biutag.supervision.pojo.vo.CaseVerificationCountVo;
-import com.biutag.supervision.pojo.vo.CaseVerificationMapVo;
-import com.biutag.supervision.pojo.vo.EchartsVo;
-import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @Auther: sh
  * @Date: 2024/11/29 15:55
diff --git a/src/main/java/com/biutag/supervision/service/ConfinementService.java b/src/main/java/com/biutag/supervision/service/ConfinementService.java
index 5454a02..01e20a1 100644
--- a/src/main/java/com/biutag/supervision/service/ConfinementService.java
+++ b/src/main/java/com/biutag/supervision/service/ConfinementService.java
@@ -1,31 +1,20 @@
 package com.biutag.supervision.service;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 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.AppConstants;
 import com.biutag.supervision.constants.enums.RoleCodeEnum;
 import com.biutag.supervision.mapper.ConfinementMapper;
-import com.biutag.supervision.mapper.SupTaskInspectionMapper;
 import com.biutag.supervision.pojo.entity.Confinement;
-import com.biutag.supervision.pojo.entity.SupTaskInspection;
-import com.biutag.supervision.pojo.model.PoliceModel;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.ConfinementQueryParam;
-import com.biutag.supervision.pojo.param.PoliceQueryParam;
 import com.biutag.supervision.pojo.vo.ConfinementExcelVo;
 import com.biutag.supervision.pojo.vo.ConfinementVo;
-import com.biutag.supervision.pojo.vo.TaskInspectionVo;
-import dm.jdbc.util.StringUtil;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/biutag/supervision/service/DataGlobalService.java b/src/main/java/com/biutag/supervision/service/DataGlobalService.java
index 84c4b2f..a79cdd5 100644
--- a/src/main/java/com/biutag/supervision/service/DataGlobalService.java
+++ b/src/main/java/com/biutag/supervision/service/DataGlobalService.java
@@ -5,17 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.biutag.supervision.constants.enums.InspectCaseEnum;
 import com.biutag.supervision.mapper.*;
 import com.biutag.supervision.pojo.entity.Negative;
-import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static com.biutag.supervision.constants.enums.DepartGroupEnum.COUNTY_CITY_BUREAUS;
-
 /**
  * 数据大屏服务层
  *
diff --git a/src/main/java/com/biutag/supervision/service/DataMailService.java b/src/main/java/com/biutag/supervision/service/DataMailService.java
index dd8a8e1..803836c 100644
--- a/src/main/java/com/biutag/supervision/service/DataMailService.java
+++ b/src/main/java/com/biutag/supervision/service/DataMailService.java
@@ -66,7 +66,11 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
         // 12337
         long mail12337 = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.XF12337.getValue()));
         // 局长信箱
-        long mailCount = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()));
+//        long mailCount =
+//                negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()));
+
+        long mailCount = mailMapper.selectMailDataCount(beginTime,endTime);
+
 
         temp.setCountryMail(countryMail);
         temp.setPoliceMail(policeMail);
@@ -99,10 +103,10 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
                 new LambdaQueryWrapper<Negative>()
                         .between(Negative::getCrtTime, beginTime, endTime)
                         .eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.XF12337.getValue())
-                        .eq(Negative::getSecondInvolveDepartId,deptId)
+                        .eq(Negative::getHandleSecondDepartId,deptId)
         );
         // 局长信箱
-        long mailCount = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()) .eq(Negative::getSecondInvolveDepartId,deptId));
+        long mailCount = negativeService.count(new LambdaQueryWrapper<Negative>().between(Negative::getCrtTime, beginTime, endTime).eq(Negative::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue()) .eq(Negative::getHandleSecondDepartId,deptId));
 
         temp.setCountryMail(countryMail);
         temp.setPoliceMail(policeMail);
diff --git a/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java b/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
index 30ab206..d6a6cc7 100644
--- a/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
+++ b/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
@@ -1,26 +1,12 @@
 package com.biutag.supervision.service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.biutag.supervision.constants.enums.DepartGroupEnum;
-import com.biutag.supervision.constants.enums.InspectCaseEnum;
-import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
-import com.biutag.supervision.constants.enums.RepeatEnum;
 import com.biutag.supervision.mapper.*;
-import com.biutag.supervision.pojo.dto.CaseVerifDepart;
 import com.biutag.supervision.pojo.entity.*;
-import com.biutag.supervision.pojo.vo.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.Intercept;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.XCDC;
-
 /**
  * @author 舒云
  * @description 针对表【data_supervision_notify】的数据库操作Service实现
diff --git a/src/main/java/com/biutag/supervision/service/DataVJwpyService.java b/src/main/java/com/biutag/supervision/service/DataVJwpyService.java
index 98f3952..2d187a3 100644
--- a/src/main/java/com/biutag/supervision/service/DataVJwpyService.java
+++ b/src/main/java/com/biutag/supervision/service/DataVJwpyService.java
@@ -1,16 +1,7 @@
 package com.biutag.supervision.service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.biutag.supervision.mapper.NegativeMapper;
-import com.biutag.supervision.pojo.vo.DistributionVo;
-import com.biutag.supervision.util.JSON;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-
 
 @Service
 public class DataVJwpyService {
diff --git a/src/main/java/com/biutag/supervision/service/NegativeBookService.java b/src/main/java/com/biutag/supervision/service/NegativeBookService.java
index 9095bbf..248d7c2 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeBookService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeBookService.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.constants.enums.DepartLevelEnum;
 import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
 import com.biutag.supervision.mapper.DataPetitionComplaintMapper;
-import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.DataPetitionComplaint;
 import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.entity.NegativeBlame;
diff --git a/src/main/java/com/biutag/supervision/service/NegativeWorkService.java b/src/main/java/com/biutag/supervision/service/NegativeWorkService.java
index 2d661ca..933e703 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeWorkService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeWorkService.java
@@ -164,4 +164,4 @@ public class NegativeWorkService extends ServiceImpl<NegativeWorkMapper, Negativ
     public List<NegativeWork> list(String negativeId) {
         return list(new LambdaQueryWrapper<NegativeWork>().eq(NegativeWork::getNegativeId, negativeId));
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyApproveService.java b/src/main/java/com/biutag/supervision/service/RpcApplyApproveService.java
index abf4bf5..d00746e 100644
--- a/src/main/java/com/biutag/supervision/service/RpcApplyApproveService.java
+++ b/src/main/java/com/biutag/supervision/service/RpcApplyApproveService.java
@@ -10,7 +10,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
 
 @Service
 public class RpcApplyApproveService extends ServiceImpl<RpcApplyApproveMapper, RpcApplyApprove> {
diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyService.java b/src/main/java/com/biutag/supervision/service/RpcApplyService.java
index 6b27f1a..fcb078e 100644
--- a/src/main/java/com/biutag/supervision/service/RpcApplyService.java
+++ b/src/main/java/com/biutag/supervision/service/RpcApplyService.java
@@ -18,7 +18,6 @@ import com.biutag.supervision.pojo.dto.RpcApplyDto;
 import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.RpcApplyQueryParam;
-import com.biutag.supervision.pojo.vo.NegativeQueryVo;
 import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import com.biutag.supervision.util.JSON;
 import lombok.RequiredArgsConstructor;
@@ -32,8 +31,6 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @Service
@@ -53,16 +50,25 @@ public class RpcApplyService extends ServiceImpl<RpcApplyMapper, RpcApply> {
     public Page<RpcApplyVo> page(RpcApplyQueryParam queryParam, String type) {
         UserAuth user = UserContextHolder.getCurrentUser();
         QueryWrapper<RpcApply> queryWrapper = new QueryWrapper<>();
+//        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) {
+//            List<RpcRightPerson> rightPeoples = rpcRightPersonService.list(user.getUserName());
+//            if (rightPeoples.isEmpty()) {
+//                return new Page<RpcApplyVo>().setTotal(0).setRecords(new ArrayList<>());
+//            }
+//            // 是否是市局维权专干
+//            if (rightPeoples.stream().noneMatch(item -> "1".equals(item.getCouncil()))) {
+//                Set<String> departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet());
+//                List<String> childrenIds = departService.getAllNodeIds(departIds);
+//                queryWrapper.in("a.handle_depart_id", childrenIds);
+//            }
+//        }
         if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) {
-            List<RpcRightPerson> rightPeoples = rpcRightPersonService.list(user.getUserName());
-            if (rightPeoples.isEmpty()) {
-                return new Page<RpcApplyVo>().setTotal(0).setRecords(new ArrayList<>());
+            List<String> orgIds = new ArrayList<>();
+            if(StrUtil.isNotBlank(user.getDepartId())){
+                orgIds.add(user.getDepartId());
             }
-            // 是否是市局维权专干
-            if (rightPeoples.stream().noneMatch(item -> "1".equals(item.getCouncil()))) {
-                Set<String> departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet());
-                List<String> childrenIds = departService.getAllNodeIds(departIds);
-                queryWrapper.in("a.handle_depart_id", childrenIds);
+            if(CollectionUtil.isNotEmpty(orgIds)){
+                orgIds.addAll(departService.getAllNodeIds(user.getAuthDepartIds()));
             }
         }
         queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName())
diff --git a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
index 285a84a..052b957 100644
--- a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
+++ b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
@@ -3,6 +3,7 @@ package com.biutag.supervision.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,12 +12,9 @@ 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.AppConstants;
-import com.biutag.supervision.mapper.RpcApplyPersonMapper;
 import com.biutag.supervision.mapper.RpcApplySuperviseMapper;
-import com.biutag.supervision.mapper.RpcInfringerResultMapper;
 import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.model.UserAuth;
-import com.biutag.supervision.pojo.param.RpcApplyQueryParam;
 import com.biutag.supervision.pojo.param.RpcApplySupervisionQueryParam;
 import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import com.biutag.supervision.pojo.vo.RpcSuperviseVo;
@@ -27,8 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @Service
@@ -61,8 +57,6 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
                 log.info("'user-data--------'"+user.getDepartId());
                 orgIds.addAll(departService.getAllNodeIds(user.getAuthDepartIds()));
             }
-            queryWrapper.in("a.handle_depart_id", orgIds);
-
         }
         //待处理维权
         if("1".equals(queryParam.getActiveName())){
@@ -119,20 +113,10 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
         }
     }
 
-    //修改数据
+    //修改数据 todo 有业务问题，需优化调整
     @Transactional(rollbackFor = Exception.class)
     public void upSuperviseData(RpcSuperviseVo rpcSuperviseVo){
-        //1、修改案件信箱
-        if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcApplyVo())){
-            //案件信息
-            //案发环节 incidentLinkName、案发警种 policeJob、
-            // 案件类别 infringerHandle、案件报送情况 caseSubmission、变更强制措施报送情况 changeMandate
-            baseMapper.upSuperviseData(rpcSuperviseVo.getRpcApplyVo());
-            RpcApplySupervise supervise = baseMapper.selectById(rpcSuperviseVo.getRpcApplyVo().getRpcId());
-            RpcApply rpcApply= new RpcApply();
-            BeanUtil.copyProperties(supervise,rpcApply);
-            rpcApplyService.saveOrUpdate(rpcApply);
-        }
+
         //2、修改侵权人
         if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcInfringerResults())){
             rpcInfringerResultService.updateBatchById(rpcSuperviseVo.getRpcInfringerResults());
@@ -140,8 +124,26 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
         //3、修改被侵权人
         if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcApplyPeoples())){
             rpcSuperviseVo.getRpcApplyPeoples().forEach(rpcApplyPersonService::upRpcApplyPersonSupervise);
-
         }
 
+        //1、修改案件信箱
+        if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcApplyVo())){
+            //案件信息
+            //案发环节 incidentLinkName、案发警种 policeJob、
+            // 案件类别 infringerHandle、案件报送情况 caseSubmission、变更强制措施报送情况 changeMandate
+            baseMapper.upSuperviseData(rpcSuperviseVo.getRpcApplyVo());
+            RpcApplySupervise supervise = baseMapper.selectById(rpcSuperviseVo.getRpcApplyVo().getRpcId());
+
+            rpcSuperviseVo.getRpcApplyPeoples().forEach(s->{
+                RpcApply rpcApply= new RpcApply();
+                BeanUtil.copyProperties(supervise,rpcApply);
+                rpcApply.setApplicantEmpName(s.getEmpName());
+                rpcApply.setApplicantEmpNo(s.getEmpNo());
+                rpcApply.setRpcId(IdUtil.fastSimpleUUID());
+                s.setRpcId(rpcApply.getRpcId());
+                rpcApplyPersonService.upRpcApplyPersonSupervise(s);
+                rpcApplyService.saveOrUpdate(rpcApply);
+            });
+        }
     }
 }
diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyWorkService.java b/src/main/java/com/biutag/supervision/service/RpcApplyWorkService.java
index 7fbf04c..f055059 100644
--- a/src/main/java/com/biutag/supervision/service/RpcApplyWorkService.java
+++ b/src/main/java/com/biutag/supervision/service/RpcApplyWorkService.java
@@ -2,7 +2,6 @@ package com.biutag.supervision.service;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.common.UserContextHolder;
@@ -18,7 +17,6 @@ import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/biutag/supervision/service/RpcPacksComfortService.java b/src/main/java/com/biutag/supervision/service/RpcPacksComfortService.java
index f8eb425..cde6bc8 100644
--- a/src/main/java/com/biutag/supervision/service/RpcPacksComfortService.java
+++ b/src/main/java/com/biutag/supervision/service/RpcPacksComfortService.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.mapper.RpcPacksComfortMapper;
 import com.biutag.supervision.pojo.entity.RpcApply;
 import com.biutag.supervision.pojo.entity.RpcPacksComfort;
-import com.biutag.supervision.pojo.vo.RpcApplyVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/com/biutag/supervision/service/SampliingService.java b/src/main/java/com/biutag/supervision/service/SampliingService.java
deleted file mode 100644
index f3194eb..0000000
--- a/src/main/java/com/biutag/supervision/service/SampliingService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.biutag.supervision.service;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.lang.intern.InternUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.util.IntUtils;
-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;
-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.AppConstants;
-import com.biutag.supervision.constants.enums.RoleCodeEnum;
-import com.biutag.supervision.mapper.SamplingMapper;
-import com.biutag.supervision.mapper.SamplingPoliceMapper;
-import com.biutag.supervision.pojo.entity.Confinement;
-import com.biutag.supervision.pojo.entity.Sampling;
-import com.biutag.supervision.pojo.entity.SamplingPolice;
-import com.biutag.supervision.pojo.model.UserAuth;
-import com.biutag.supervision.pojo.param.SamplingQueryParam;
-import com.biutag.supervision.pojo.vo.ConfinementVo;
-import com.biutag.supervision.pojo.vo.SamplingVo;
-import lombok.RequiredArgsConstructor;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Service
-public class SampliingService  extends ServiceImpl<SamplingMapper, Sampling> {
-
-    //抽检警察人员表
-    private final SamplingPoliceMapper samplingPoliceMapper;
-
-    private final SupDepartService departService;
-    //添加或者修改
-    public boolean addOrUpdata(SamplingVo vo){
-        Sampling sampling =new Sampling();
-        BeanUtil.copyProperties(vo,sampling);
-        UserAuth user = UserContextHolder.getCurrentUser();
-        sampling.setCrtTime(LocalDateTime.now());
-        sampling.setCrtName(user.getUserName());
-        if (StrUtil.isNotEmpty(vo.getId())){
-            //判断有无警员列表
-           samplingPoliceMapper.delete(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,sampling.getId()));
-        }
-        if(ArrayUtil.isNotEmpty(vo.getSamplingPolices())){
-            samplingPoliceMapper.insert(vo.getSamplingPolices());
-        }
-        return baseMapper.insertOrUpdate(sampling);
-    }
-    //分页查询
-    public Page<SamplingVo> page(SamplingQueryParam queryParam){
-        QueryWrapper<Sampling> queryWrapper = new QueryWrapper<>();
-        UserAuth user = UserContextHolder.getCurrentUser();
-        // 权限
-        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
-            if (user.getAuthDepartIds().isEmpty() || user.getRoleCodes().isEmpty()) {
-                return new Page<SamplingVo>().setTotal(0).setRecords(new ArrayList<>());
-            }
-            List<String> orgIds = departService.getAllNodeIds(user.getAuthDepartIds());
-            queryWrapper.in("c1.org_id", orgIds);
-        }
-        //查询条件
-        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getSamplingName()),"sampling_name",queryParam.getSamplingName())
-                .eq(StrUtil.isNotBlank(queryParam.getInspectorType()),"inspector_type",queryParam.getInspectorType())
-                .eq(StrUtil.isNotBlank(queryParam.getGender()),"gender",queryParam.getGender())
-                .eq(StrUtil.isNotBlank(queryParam.getPersonnelType()),"personnel_type",queryParam.getPersonnelType())
-                .eq(StrUtil.isNotBlank(queryParam.getDrinkAlcohol()),"drink_alcohol",queryParam.getDrinkAlcohol())
-                .eq(StrUtil.isNotBlank(queryParam.getBeDuty()),"be_duty",queryParam.getBeDuty());
-        //抽检领导次数
-        if(queryParam.getLeadersNumber() != 0 ){
-            queryWrapper.eq("leaders_number",queryParam.getLeadersNumber());
-        }
-        //年龄范围
-        if (queryParam.getAgeMax()!= 0){
-            queryWrapper.ge("age_min",queryParam.getAgeMin());
-            queryWrapper.le("age_max",queryParam.getAgeMax());
-        }
-        //警员比率
-        if (queryParam.getPoliceRatio() != 0){
-            queryWrapper.eq("police_ratio",queryParam.getPoliceRatio());
-        }
-        //辅警比率
-        if(queryParam.getAssistRatio() != 0){
-            queryWrapper.eq("assist_ratio",queryParam.getAssistRatio());
-        }
-        //数据查询
-        if(CollectionUtils.isEmpty(queryParam.getSamplingTime())){
-            queryWrapper.ge("start_time",queryParam.getSamplingTime().get(0));
-            queryWrapper.le("end_time",queryParam.getSamplingTime().get(1));
-        }
-
-
-        Page<Sampling> page= baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
-       List<SamplingVo> listData = new ArrayList<>();
-        page.getRecords().forEach(s->{
-            SamplingVo samplingVo =new SamplingVo();
-            BeanUtil.copyProperties(s,samplingVo);
-            samplingVo.setSamplingPolices(samplingPoliceMapper.selectList(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,s.getId())));
-            listData.add(samplingVo);
-        });
-        Page<SamplingVo> voPage = new Page<>(page.getCurrent(),page.getSize(),page.getTotal());
-        voPage.setRecords(listData);
-        return voPage;
-    }
-    //删除数据
-    public boolean delDataById(SamplingQueryParam queryParam){
-        List<SamplingPolice> list = samplingPoliceMapper.selectList(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,queryParam.getId()));
-        if(CollectionUtil.isNotEmpty(list)){
-            samplingPoliceMapper.deleteByIds(list.stream().map(SamplingPolice::getId).toList());
-        }
-
-      return   baseMapper.deleteById(queryParam.getId()) > 0;
-    }
-
-
-
-}
diff --git a/src/main/java/com/biutag/supervision/service/SamplingService.java b/src/main/java/com/biutag/supervision/service/SamplingService.java
new file mode 100644
index 0000000..7b97553
--- /dev/null
+++ b/src/main/java/com/biutag/supervision/service/SamplingService.java
@@ -0,0 +1,237 @@
+package com.biutag.supervision.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.AppConstants;
+import com.biutag.supervision.constants.enums.RoleCodeEnum;
+import com.biutag.supervision.mapper.SamplingMapper;
+import com.biutag.supervision.mapper.SamplingPoliceMapper;
+import com.biutag.supervision.pojo.dto.SamplingPoliceDto;
+import com.biutag.supervision.pojo.entity.Confinement;
+import com.biutag.supervision.pojo.entity.Sampling;
+import com.biutag.supervision.pojo.entity.SamplingPolice;
+import com.biutag.supervision.pojo.model.UserAuth;
+import com.biutag.supervision.pojo.param.SamplingQueryParam;
+import com.biutag.supervision.pojo.vo.DataPetitionComplaintExportGabxfVo;
+import com.biutag.supervision.pojo.vo.PoliceVo;
+import com.biutag.supervision.pojo.vo.SamplingVo;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@RequiredArgsConstructor
+@Service
+public class SamplingService extends ServiceImpl<SamplingMapper, Sampling> {
+
+    //抽检警察人员表
+    private final SamplingPoliceMapper samplingPoliceMapper;
+
+    private final SupDepartService departService;
+    //添加或者修改
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addOrUpdata(SamplingVo vo){
+        Sampling sampling =new Sampling();
+        BeanUtil.copyProperties(vo,sampling);
+        UserAuth user = UserContextHolder.getCurrentUser();
+        sampling.setCrtTime(LocalDateTime.now());
+        sampling.setCrtName(user.getUserName());
+        if(CollectionUtil.isNotEmpty(vo.getPersonnelTypeArray())){
+            sampling.setPersonnelType(String.join(",",vo.getPersonnelTypeArray()));
+        }
+
+        if(CollectionUtil.isNotEmpty(vo.getSamplingTime())){
+            sampling.setStartTime(vo.getSamplingTime().get(0));
+            sampling.setEndTime(vo.getSamplingTime().get(1));
+        }
+        if (StrUtil.isNotEmpty(vo.getId())){
+            //判断有无警员列表
+           samplingPoliceMapper.delete(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,sampling.getId()));
+        }
+        JSONObject jsonObject= new JSONObject().fluentPut("data", vo.getSamplingObjectList());
+
+        sampling.setSamplingObj(jsonObject.toJSONString());
+        baseMapper.insertOrUpdate(sampling);
+        if(ArrayUtil.isNotEmpty(vo.getSamplingPolices())){
+            vo.getSamplingPolices().forEach(s->{
+                s.setSamplingId(sampling.getId());
+                s.setCrtTime(LocalDateTime.now());
+            });
+
+            samplingPoliceMapper.insert(vo.getSamplingPolices());
+        }
+        return true;
+    }
+    /**
+     * 获取详情
+     * */
+    public SamplingVo getDetail(String id){
+        Sampling sampling = baseMapper.selectById(id);
+        SamplingVo vo =new SamplingVo();
+        BeanUtil.copyProperties(sampling,vo);
+        if(StrUtil.isNotBlank(vo.getPersonnelType())){
+            vo.setPersonnelTypeArray(List.of(vo.getPersonnelType().split(",")));
+        }
+        vo.setSamplingObjectList(JSON.parseArray(sampling.getSamplingObj(), SamplingVo.SamplingObject.class));
+        vo.setSamplingPolices(
+                samplingPoliceMapper.selectList(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,id))
+        );
+        return vo;
+    }
+    /**
+     * 分页查询
+     * */
+    public Page<SamplingVo> page(SamplingQueryParam queryParam){
+        QueryWrapper<Sampling> queryWrapper = new QueryWrapper<>();
+        UserAuth user = UserContextHolder.getCurrentUser();
+        // 权限
+        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
+            if (user.getAuthDepartIds().isEmpty() || user.getRoleCodes().isEmpty()) {
+                return new Page<SamplingVo>().setTotal(0).setRecords(new ArrayList<>());
+            }
+            List<String> orgIds = departService.getAllNodeIds(user.getAuthDepartIds());
+            queryWrapper.in("c1.org_id", orgIds);
+        }
+        //查询条件
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getSamplingName()),"sampling_name",queryParam.getSamplingName())
+                .eq(StrUtil.isNotBlank(queryParam.getInspectorType()),"inspector_type",queryParam.getInspectorType())
+                .eq(StrUtil.isNotBlank(queryParam.getGender()),"gender",queryParam.getGender())
+                .like(StrUtil.isNotEmpty(queryParam.getPersonnelType()),"personnel_type", queryParam.getPersonnelType())
+                .eq(StrUtil.isNotBlank(queryParam.getDrinkAlcohol()),"drink_alcohol",queryParam.getDrinkAlcohol())
+                .eq(StrUtil.isNotBlank(queryParam.getBeDuty()),"be_duty",queryParam.getBeDuty());
+        //抽检领导次数
+        if(queryParam.getLeadersNumber() != 0 ){
+            queryWrapper.eq("leaders_number",queryParam.getLeadersNumber());
+        }
+        //年龄范围
+        if (queryParam.getAgeMax()!= 0){
+            queryWrapper.ge("age_min",queryParam.getAgeMin());
+            queryWrapper.le("age_max",queryParam.getAgeMax());
+        }
+        //警员比率
+        if (queryParam.getPoliceRatio() != 0){
+            queryWrapper.eq("police_ratio",queryParam.getPoliceRatio());
+        }
+        //辅警比率
+        if(queryParam.getAssistRatio() != 0){
+            queryWrapper.eq("assist_ratio",queryParam.getAssistRatio());
+        }
+        //数据查询
+        if(!CollectionUtils.isEmpty(queryParam.getSamplingTime())){
+            queryWrapper.ge("start_time",queryParam.getSamplingTime().get(0));
+            queryWrapper.le("end_time",queryParam.getSamplingTime().get(1));
+        }
+
+
+        Page<Sampling> page= baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
+       List<SamplingVo> listData = new ArrayList<>();
+        page.getRecords().forEach(s->{
+            SamplingVo samplingVo =new SamplingVo();
+            BeanUtil.copyProperties(s,samplingVo);
+            samplingVo.setSamplingPolices(samplingPoliceMapper.selectList(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,s.getId())));
+            listData.add(samplingVo);
+        });
+        Page<SamplingVo> voPage = new Page<>(page.getCurrent(),page.getSize(),page.getTotal());
+        listData.forEach(s->{
+            if(StrUtil.isNotBlank(s.getPersonnelType())){
+                s.setPersonnelTypeArray(List.of(s.getPersonnelType().split(",")));
+            }
+            if(StrUtil.isNotBlank(s.getSamplingObj())){
+
+                s.setSamplingObjectList((List<SamplingVo.SamplingObject>) JSONObject.parseObject(s.getSamplingObj()).get("data"));
+            }
+        });
+        voPage.setRecords(listData);
+        return voPage;
+    }
+    /**
+     * 删除数据
+     * */
+    public boolean delDataById(String id){
+        List<SamplingPolice> list = samplingPoliceMapper.selectList(new LambdaQueryWrapper<SamplingPolice>().eq(SamplingPolice::getSamplingId,id));
+        if(CollectionUtil.isNotEmpty(list)){
+            samplingPoliceMapper.deleteByIds(list.stream().map(SamplingPolice::getId).toList());
+        }
+
+      return   baseMapper.deleteById(id) > 0;
+    }
+    /**
+     * 根据规则获取抽检人员
+     * */
+    public List<PoliceVo> getSamplingPolice(SamplingVo samplingVo){
+        List<PoliceVo> list =new ArrayList<>();
+        List<String> orgIds = new ArrayList<>();
+
+        if(CollectionUtil.isNotEmpty(samplingVo.getSamplingObjectList()) && CollectionUtil.isEmpty(samplingVo.getOrgIds())){
+            samplingVo.getSamplingObjectList().forEach(s->{
+                orgIds.add(s.getDeptId());
+                orgIds.addAll(departService.getAllNodeIds(s.getDeptId()));
+            });
+            samplingVo.setOrgIds(orgIds);
+        }
+
+
+//        抽检对象
+        //todo 缺少“是否值班人员”判断
+        if("2".equals(samplingVo.getDrinkAlcohol())){
+            samplingVo.setDrinkAlcohol(null);
+        }
+        //普通警员的抽检人数
+        List<PoliceVo> policeVos = baseMapper.selectPoliceData(samplingVo);
+        //辅警数 = （抽检人数 ） * 辅警比例
+        int fjNum = (int) ((samplingVo.getSamplingNum()  ) * ((double)samplingVo.getAssistRatio() / 100));
+        //普通民警抽查数 = （抽检人数 - 辅警数 - 领导人数）
+        int mjNum =samplingVo.getSamplingNum() -  fjNum - samplingVo.getLeadersNumber();
+        //领导的抽检人数
+        List<PoliceVo> leadPoliceVos = baseMapper.selectPoliceDataLead(samplingVo);
+        //时间范围内的抽检次数
+
+        if(  samplingVo.getSamplingNum() > 0 ){
+            policeVos = policeVos.stream().filter(s->s.getCjnum() == samplingVo.getSamplingNumber()).toList();
+            leadPoliceVos=leadPoliceVos.stream().filter(s->s.getCjnum()== samplingVo.getSamplingNumber()).toList();
+        }
+
+        //距离最后一次抽检的时间
+        if (samplingVo.getDistanceDay() > 0){
+            policeVos = policeVos.stream().filter(s->s.getDaysDifference() == samplingVo.getDistanceDay()).toList();
+            leadPoliceVos=leadPoliceVos.stream().filter(s->s.getDaysDifference() == samplingVo.getDistanceDay()).toList();
+        }
+        //普通民警
+        List<PoliceVo>  mjArray = policeVos.stream().filter(s->"1".equals(s.getPersonnelType())).limit(mjNum).toList();
+        if(CollectionUtil.isNotEmpty(mjArray)){
+            list.addAll(mjArray);
+        }
+        //辅警
+        List<PoliceVo> fjArray = policeVos.stream().filter(s->"3".equals(s.getPersonnelType())).limit(fjNum).toList();
+        if(CollectionUtil.isNotEmpty(fjArray)){
+            list.addAll(fjArray);
+        }
+        //领导
+        List<PoliceVo> leadArray = leadPoliceVos.stream().limit(samplingVo.getLeadersNumber()).toList();
+        if(CollectionUtil.isNotEmpty(leadArray)){
+            list.addAll(leadArray);
+        }
+        return list;
+    }
+
+
+}
diff --git a/src/main/java/com/biutag/supervision/service/SubOneService.java b/src/main/java/com/biutag/supervision/service/SubOneService.java
index d0dcf26..ccc6caf 100644
--- a/src/main/java/com/biutag/supervision/service/SubOneService.java
+++ b/src/main/java/com/biutag/supervision/service/SubOneService.java
@@ -1,16 +1,10 @@
 package com.biutag.supervision.service;
 
 import com.biutag.supervision.mapper.NegativeMapper;
-import com.biutag.supervision.pojo.vo.EchartsVo;
-import com.biutag.supervision.pojo.vo.RankVo;
-import com.biutag.supervision.pojo.vo.SubOneOverViewVo;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @Auther: sh
  * @Date: 2024/12/12 15:59
diff --git a/src/main/java/com/biutag/supervision/service/SubOneSupervisionNotifyService.java b/src/main/java/com/biutag/supervision/service/SubOneSupervisionNotifyService.java
index eb48831..9b3156a 100644
--- a/src/main/java/com/biutag/supervision/service/SubOneSupervisionNotifyService.java
+++ b/src/main/java/com/biutag/supervision/service/SubOneSupervisionNotifyService.java
@@ -1,7 +1,6 @@
 package com.biutag.supervision.service;
 
 import com.biutag.supervision.mapper.NegativeMapper;
-import com.biutag.supervision.pojo.vo.DayTimeSuperviseVo;
 import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.pojo.vo.RankVo;
 import com.biutag.supervision.pojo.vo.SupervisionNotifyOverView;
diff --git a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java
index a3d3478..26248c9 100644
--- a/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java
+++ b/src/main/java/com/biutag/supervision/service/SubOneVideoSuperviseService.java
@@ -7,7 +7,6 @@ import com.biutag.supervision.pojo.vo.VideoSuperviseCountVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
diff --git a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholService.java b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholService.java
index 9560136..01d8e94 100644
--- a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholService.java
+++ b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholService.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.constants.enums.TaskStatusEnum;
 import com.biutag.supervision.constants.enums.TaskTypeEnum;
-import com.biutag.supervision.constants.enums.TestingAlcoholStateEnum;
 import com.biutag.supervision.mapper.SupTaskTestingAlcoholMapper;
 import com.biutag.supervision.pojo.dto.TaskTestingAlcoholDto;
 import com.biutag.supervision.pojo.entity.SupDepart;
diff --git a/src/main/java/com/biutag/supervision/service/VideoSuperviseService.java b/src/main/java/com/biutag/supervision/service/VideoSuperviseService.java
index 9bd6ad6..ceefc2c 100644
--- a/src/main/java/com/biutag/supervision/service/VideoSuperviseService.java
+++ b/src/main/java/com/biutag/supervision/service/VideoSuperviseService.java
@@ -1,26 +1,12 @@
 package com.biutag.supervision.service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.biutag.supervision.constants.enums.InspectCaseEnum;
 import com.biutag.supervision.mapper.NegativeMapper;
-import com.biutag.supervision.mapper.NegativeProblemRelationMapper;
-import com.biutag.supervision.mapper.SupDepartMapper;
-import com.biutag.supervision.pojo.Result;
-import com.biutag.supervision.pojo.entity.Negative;
-import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.vo.*;
-import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * 视频督察服务层
diff --git a/src/main/java/com/biutag/supervision/util/IDCardInfoExtractor.java b/src/main/java/com/biutag/supervision/util/IDCardInfoExtractor.java
new file mode 100644
index 0000000..acdc13c
--- /dev/null
+++ b/src/main/java/com/biutag/supervision/util/IDCardInfoExtractor.java
@@ -0,0 +1,45 @@
+package com.biutag.supervision.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+public class IDCardInfoExtractor {
+    // 根据身份证号码获取性别，1表示男性，2表示女性，0表示无法确定
+    public static int getGender(String idCard) {
+        if (idCard == null || idCard.length() < 17) {
+            return 0; // 身份证号码无效
+        }
+        char genderChar = idCard.charAt(16); // 第17位代表性别
+        int gender = genderChar % 2 == 0 ? 2 : 1; // 偶数表示女性，奇数表示男性
+        return gender;
+    }
+
+    // 根据身份证号码获取年龄
+    public static int getAge(String idCard) throws ParseException {
+        if (idCard == null || idCard.length() < 14) {
+            return -1; // 身份证号码无效
+        }
+        String birthStr = idCard.substring(6, 14); // 提取出生日期部分，格式为YYYYMMDD
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        Date birthDate = sdf.parse(birthStr);
+        GregorianCalendar calendar = new GregorianCalendar();
+        calendar.setTime(new Date());
+        int currentYear = calendar.get(GregorianCalendar.YEAR);
+        int currentMonth = calendar.get(GregorianCalendar.MONTH) + 1; // 月份从0开始，需要加1
+        int currentDay = calendar.get(GregorianCalendar.DAY_OF_MONTH);
+
+        calendar.setTime(birthDate);
+        int birthYear = calendar.get(GregorianCalendar.YEAR);
+        int birthMonth = calendar.get(GregorianCalendar.MONTH) + 1; // 月份从0开始，需要加1
+        int birthDay = calendar.get(GregorianCalendar.DAY_OF_MONTH);
+
+        int age = currentYear - birthYear;
+        if (currentMonth < birthMonth || (currentMonth == birthMonth && currentDay < birthDay)) {
+            age--; // 如果还没到生日，则年龄减1
+        }
+        return age;
+    }
+
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4cad660..90910e1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -42,6 +42,12 @@ spring:
           url: jdbc:mysql://172.31.217.20:31868/wvp2?serverTimezone=GMT%2B8
           username: root
           password: ip12341234
+        zb:
+          type: com.alibaba.druid.pool.DruidDataSource
+          driver-class-name: dm.jdbc.driver.DmDriver
+          url: jdbc:dm://65.47.22.243:5236?SCHEMA=JSDZ_4GDB
+          username: DCZD
+          password: DCZD@2024
   data:
     redis:
       host: 172.31.217.20
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 0251846..8cd7d93 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -2,8 +2,8 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <contextName>logs</contextName>
     <!--  日志位置  -->
-<!--    <property name="log.path" value="/Users/weipeng/dome/chuankei/supervision/supervision-boot/work/log"/>-->
-    <property name="log.path" value="/work/log"/>
+    <property name="log.path" value="/Users/weipeng/dome/chuankei/supervision/supervision-boot/work/log"/>
+<!--    <property name="log.path" value="/work/log"/>-->
     <!--  日志保留时长  -->
     <property name="log.maxHistory" value="7"/>
     <!--  控制台格式化及颜色  -->
diff --git a/src/main/resources/mapper/RpcApplyMapper.xml b/src/main/resources/mapper/RpcApplyMapper.xml
index 513face..1e1a0f5 100644
--- a/src/main/resources/mapper/RpcApplyMapper.xml
+++ b/src/main/resources/mapper/RpcApplyMapper.xml
@@ -14,4 +14,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ${ew.getCustomSqlSegment}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/RpcApplyWorkMapper.xml b/src/main/resources/mapper/RpcApplyWorkMapper.xml
index edcfe35..e5d73c8 100644
--- a/src/main/resources/mapper/RpcApplyWorkMapper.xml
+++ b/src/main/resources/mapper/RpcApplyWorkMapper.xml
@@ -14,4 +14,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/SamplingMapper.xml b/src/main/resources/mapper/SamplingMapper.xml
index 27fd295..d09f0e2 100644
--- a/src/main/resources/mapper/SamplingMapper.xml
+++ b/src/main/resources/mapper/SamplingMapper.xml
@@ -11,4 +11,134 @@
             sampling a
             ${ew.getCustomSqlSegment}
     </select>
+
+    <select id="selectPoliceData" resultType="com.biutag.supervision.pojo.vo.PoliceVo" parameterType="com.biutag.supervision.pojo.vo.SamplingVo">
+        SELECT
+        sup.name,
+        sdp.short_name as shortName,
+        sup.emp_no as empNo,
+        stp.isdrink,
+        sup.person_type as personnelType,
+        sap.time as crtTime,
+        sup.org_id as deptId,
+        IFNULL(scp.cjnum,0) as cjnum,
+        CASE WHEN sup.position IS NOT NULL THEN 1 ELSE 0 END AS isLeader,
+        DATEDIFF(CURDATE(), sap.time) AS daysDifference,
+        YEAR(CURDATE()) - YEAR(STR_TO_DATE(SUBSTRING(sup.id_code, 7, 8), '%Y%m%d')) -
+        CASE
+        WHEN DATE_FORMAT(CURDATE(), '%m%d') &lt; DATE_FORMAT(STR_TO_DATE(SUBSTRING(id_code, 7, 8), '%Y%m%d'), '%m%d') THEN 1
+        ELSE 0
+        END AS age,
+        CASE
+        WHEN CAST(SUBSTRING(sup.id_code, 17, 1) AS UNSIGNED) % 2 = 0 THEN '2'
+        ELSE '1'
+        END AS gender
+        from sup_police  sup
+        LEFT JOIN
+        (SELECT emp_no,max(crt_time) as time from sampling_police) sap  on sup.emp_no = sap.emp_no
+        LEFT JOIN
+        (
+        SELECT emp_no, COUNT(emp_no) as cjnum FROM sampling_police
+        <where>
+            <if test="startTime != null and startTime != '' and endtime != null and endtime != ''">
+                and crt_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY emp_no
+        ) scp ON sup.emp_no = scp.emp_no
+        LEFT JOIN sup_depart sdp on sdp.id = sup.org_id
+        LEFT JOIN (SELECT emp_no, MAX(case when drink_result = "饮酒" THEN 1 ELSE 0 end) as isdrink from sup_task_testing_alcohol_people GROUP BY emp_no) stp on sup.emp_no = stp.emp_no
+        <where>
+            sup.position is  null
+            and sup.del = 0
+            <if test="personnelTypeArray != null and personnelTypeArray != '' and personnelTypeArray.size() > 0">
+                and sup.person_type in
+                <foreach collection="personnelTypeArray" item="data" open="(" close=")" separator=",">
+                    #{data}
+                </foreach>
+            </if>
+            <if test="orgIds != null and orgIds !='' and orgIds.size() > 0">
+                AND sup.org_id IN
+                <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="drinkAlcohol != null and  drinkAlcohol != ''  ">
+                and stp.isdrink = #{drinkAlcohol}
+            </if>
+        </where>
+        HAVING (age is not null and age > 0)
+        <if test="gender != null and gender !='' ">
+            and gender = #{gender}
+        </if>
+        <if test=" ageMax != null  and ageMax != 0 ">
+            and (age &lt; #{ageMax} and age &gt; #{ageMin})
+        </if>
+        order by RAND()
+    </select>
+
+    <select id="selectPoliceDataLead" resultType="com.biutag.supervision.pojo.vo.PoliceVo" parameterType="com.biutag.supervision.pojo.vo.SamplingVo">
+        SELECT
+        sup.`name`,
+        sup.emp_no as empNo,
+        sdp.short_name as shortName,
+        sup.person_type as personnelType,
+        sap.time as crtTime,
+        stp.isdrink,
+        sup.org_id as deptId,
+        CASE WHEN sup.position IS NOT NULL THEN 1 ELSE 0 END AS isLeader,
+        IFNULL(scp.cjnum,0) as cjnum,
+        DATEDIFF(CURDATE(), sap.time) AS daysDifference,
+        YEAR(CURDATE()) - YEAR(STR_TO_DATE(SUBSTRING(sup.id_code, 7, 8), '%Y%m%d')) -
+        CASE
+        WHEN DATE_FORMAT(CURDATE(), '%m%d') &lt; DATE_FORMAT(STR_TO_DATE(SUBSTRING(id_code, 7, 8), '%Y%m%d'), '%m%d') THEN 1
+        ELSE 0
+        END AS age,
+        CASE
+        WHEN CAST(SUBSTRING(sup.id_code, 17, 1) AS UNSIGNED) % 2 = 0 THEN '2'
+        ELSE '1'
+        END AS gender
+        from sup_police  sup
+        LEFT JOIN
+        (SELECT emp_no,max(crt_time) as time from sampling_police) sap  on sup.emp_no = sap.emp_no
+        LEFT JOIN
+        (
+        SELECT emp_no, COUNT(emp_no) as cjnum FROM sampling_police
+        <where>
+            <if test="startTime != null and startTime !='' and endtime != null and endTime !=''">
+                WHERE crt_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+        GROUP BY emp_no
+        ) scp ON sup.emp_no = scp.emp_no
+        LEFT JOIN sup_depart sdp on sdp.id = sup.org_id
+        LEFT JOIN (SELECT emp_no, MAX(case when drink_result = "饮酒" THEN 1 ELSE 0 end) as isdrink from sup_task_testing_alcohol_people GROUP BY emp_no) stp on sup.emp_no = stp.emp_no
+        <where>
+            sup.position is not null
+            and sup.del = 0
+            <if test="orgIds != null and orgIds != ''  and orgIds.size() > 0">
+                AND sup.org_id IN
+                <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="personnelTypeArray != null and personnelTypeArray != '' and personnelTypeArray.size() > 0">
+                and sup.person_type in
+                <foreach collection="personnelTypeArray" item="data" open="(" close=")" separator=",">
+                    #{data}
+                </foreach>
+            </if>
+            <if test="drinkAlcohol != null and  drinkAlcohol != ''  ">
+                and stp.isdrink = #{drinkAlcohol}
+            </if>
+        </where>
+        having (age is not null and age > 0)
+        <if test=" gender != null and gender !='' ">
+            and gender = #{gender}
+        </if>
+        <if test=" ageMax != null  and ageMax != 0 ">
+            and (age &lt; #{ageMax} and age &gt; #{ageMin})
+        </if>
+        order by RAND()
+    </select>
 </mapper>
diff --git a/src/main/resources/mapper/SupTaskProblemMapper.xml b/src/main/resources/mapper/SupTaskProblemMapper.xml
index 3baf2ee..2ecd7db 100644
--- a/src/main/resources/mapper/SupTaskProblemMapper.xml
+++ b/src/main/resources/mapper/SupTaskProblemMapper.xml
@@ -48,7 +48,7 @@
         AND YEAR(ng.crtTime) = #{year}
         AND ng.problemSourcesCode IN
         <foreach item="item" index="index" collection="args" open="(" separator="," close=")">#{item}</foreach>
-        AND ng.second_involve_depart_id=#{departId}
+        AND ng.handle_second_depart_id=#{departId}
         GROUP BY m.month_name
         ORDER BY m.`month` ASC;
     </select>
@@ -75,7 +75,7 @@
                  LEFT JOIN negative ng ON DATE_FORMAT(ng.crtTime, '%m') = m.`month`
             AND YEAR(ng.crtTime) = #{year}
             AND ng.problemSourcesCode IN (17, 18, 19, 20)
-            AND ng.second_involve_depart_id = #{departId}
+            AND ng.handle_second_depart_id = #{departId}
         GROUP BY m.month_name
         ORDER BY m.`month` ASC;
     </select>
diff --git a/src/main/resources/mapper/SupTaskSelfexaminationMapper.xml b/src/main/resources/mapper/SupTaskSelfexaminationMapper.xml
index e80f847..7db5927 100644
--- a/src/main/resources/mapper/SupTaskSelfexaminationMapper.xml
+++ b/src/main/resources/mapper/SupTaskSelfexaminationMapper.xml
@@ -11,4 +11,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/SupTaskTestingAlcoholMapper.xml b/src/main/resources/mapper/SupTaskTestingAlcoholMapper.xml
index 5f08140..6e83cbb 100644
--- a/src/main/resources/mapper/SupTaskTestingAlcoholMapper.xml
+++ b/src/main/resources/mapper/SupTaskTestingAlcoholMapper.xml
@@ -47,4 +47,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml b/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
index 8d12946..c583214 100644
--- a/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
+++ b/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
@@ -31,4 +31,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/test/java/com/biutag/supervision/StrUtil.java b/src/test/java/com/biutag/supervision/StrUtil.java
index 3f29711..3b191d9 100644
--- a/src/test/java/com/biutag/supervision/StrUtil.java
+++ b/src/test/java/com/biutag/supervision/StrUtil.java
@@ -1,11 +1,7 @@
 package com.biutag.supervision;
 
-import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileTypeUtil;
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.biutag.supervision.pojo.vo.RpcApplyVo;
@@ -15,7 +11,6 @@ import freemarker.template.TemplateException;
 import freemarker.template.Version;
 import org.assertj.core.util.Arrays;
 import org.junit.jupiter.api.Test;
-import org.springframework.security.crypto.bcrypt.BCrypt;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.io.*;
diff --git a/src/test/java/com/biutag/supervision/TestCase.java b/src/test/java/com/biutag/supervision/TestCase.java
index 2f23d17..e594583 100644
--- a/src/test/java/com/biutag/supervision/TestCase.java
+++ b/src/test/java/com/biutag/supervision/TestCase.java
@@ -1,17 +1,13 @@
 package com.biutag.supervision;
 
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileNameUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.biutag.supervision.pojo.vo.NegativeAuditExportVo;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
diff --git a/src/test/java/com/biutag/supervision/service/DataMailServiceTest.java b/src/test/java/com/biutag/supervision/service/DataMailServiceTest.java
index c8d4b9c..8458439 100644
--- a/src/test/java/com/biutag/supervision/service/DataMailServiceTest.java
+++ b/src/test/java/com/biutag/supervision/service/DataMailServiceTest.java
@@ -6,15 +6,11 @@ import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.xml.crypto.Data;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 @SpringBootTest
 class DataMailServiceTest {
 
@@ -40,4 +36,4 @@ class DataMailServiceTest {
         System.out.println(subOneAllMailCount.toString());
 
     }
-}
\ No newline at end of file
+}