From 6538a9547e15bd813df8d8c9cbf660d4f3827392 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Sat, 5 Jul 2025 15:47:49 +0800
Subject: [PATCH] =?UTF-8?q?fit:1=E3=80=81=E7=9D=A3=E5=AF=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=91=E5=B8=83=E5=90=8E=E7=AB=AFv2=EF=BC=88?=
 =?UTF-8?q?=E5=8C=85=E7=9D=A3=E5=8A=9E=E4=BA=BA=E5=91=98=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobileSupervision/TaskManagementController.java         | 4 ++++
 .../java/com/biutag/supervision/pojo/dto/SupRiskDto.java    | 3 +++
 .../java/com/biutag/supervision/pojo/vo/SamplingVo.java     | 6 +++---
 .../biutag/supervision/service/TaskManagementService.java   | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
index 8bb2c76..4a65078 100644
--- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
+++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
@@ -138,6 +138,10 @@ public class TaskManagementController {
 
                 }
 
+                if(StrUtil.isNotBlank(data.getControlEmpNo())){
+                    SupPolice supPolice= policeService.getByEmpNo(data.getControlEmpNo());
+                    data.setControlIdcode(supPolice.getIdCode());
+                }
 
                 if(ObjectUtil.isNotEmpty(data)){
                     list.add(data);
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java b/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java
index aadf3c1..2d301d2 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/SupRiskDto.java
@@ -61,4 +61,7 @@ public class SupRiskDto {
     @ExcelProperty({"责任单位Id"})
     private String responsibleDepartId;
 
+    @ExcelProperty({"包保督察人员身份证"})
+    private String controlIdcode;
+
 }
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 b26ad92..9b408be 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java
@@ -51,11 +51,11 @@ public class SamplingVo {
     //时间范围
     //开始时间
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime startTime;
     //结束时间
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime endTime;
     //被抽检次数
     private int samplingNumber;
@@ -104,7 +104,7 @@ public class SamplingVo {
             samplingInspection +="最大年龄："+vo.getAgeMax()+";";
         }
         if(vo.getAgeMin() >= 0){
-            samplingInspection +="最小年龄："+vo.getSamplingName()+";";
+            samplingInspection +="最小年龄："+vo.getAgeMin()+";";
         }
         if(StrUtil.isNotBlank(vo.getGender())){
             samplingInspection +="性别："+ ("1".equals(vo.getGender())?"男":"女")+";";
diff --git a/src/main/java/com/biutag/supervision/service/TaskManagementService.java b/src/main/java/com/biutag/supervision/service/TaskManagementService.java
index 6da1e8a..e7d2c13 100644
--- a/src/main/java/com/biutag/supervision/service/TaskManagementService.java
+++ b/src/main/java/com/biutag/supervision/service/TaskManagementService.java
@@ -152,6 +152,7 @@ public class TaskManagementService {
                     personalSup.setName(s.getControlName());
                     personalSup.setCreateTime(LocalDateTime.now());
                     personalSup.setTaskId(task.getId());
+                    personalSup.setIdCode(s.getControlIdcode());
                     taskPersonService.save(personalSup);
                     //重点人员
                     SupRiskPersonal supRiskPersonal=new SupRiskPersonal();