From aa7edf82e7198b36342e354a2fd7fc39fae270d7 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Mon, 8 Sep 2025 16:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=9A=81-=E6=97=A5=E5=BF=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/hsz/controller/ByLogController.java | 2 --
 .../com/gunshi/project/hsz/mapper/ByLogDetailMapper.java   | 4 ++--
 .../java/com/gunshi/project/hsz/model/ByLogDetail.java     | 7 +------
 .../java/com/gunshi/project/hsz/service/ByLogService.java  | 4 +---
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java b/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java
index 01fd9dd..18e6f6f 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java
@@ -44,8 +44,6 @@ public class ByLogController extends AbstractCommonFileController {
     @Autowired
     private FileAssociationsService fileService;
 
-    @Autowired
-    private SysUserServiceImpl sysUserService;
 
     @Operation(summary = "新增")
     @PostMapping("/insert")
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java
index 437638c..2760f32 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java
@@ -15,7 +15,7 @@ public interface ByLogDetailMapper extends BaseMapper<ByLogDetail> {
 
     @Select("""
             <script>
-        select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,t1.pre_person_name,
+        select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,
         t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
         from by_log_detail t1
         join pre_place_detail t2
@@ -31,7 +31,7 @@ public interface ByLogDetailMapper extends BaseMapper<ByLogDetail> {
     List<ByLogDetail> selectDetail(@Param("logId") Long id,@Param("dto") ByLogPageSo pageSo);
 
     @Select("""
-        select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,t1.pre_person_name,
+        select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,
         t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
         from by_log_detail t1
         join pre_place_detail t2
diff --git a/src/main/java/com/gunshi/project/hsz/model/ByLogDetail.java b/src/main/java/com/gunshi/project/hsz/model/ByLogDetail.java
index 41fe46d..a3a21c5 100644
--- a/src/main/java/com/gunshi/project/hsz/model/ByLogDetail.java
+++ b/src/main/java/com/gunshi/project/hsz/model/ByLogDetail.java
@@ -51,14 +51,9 @@ public class ByLogDetail {
     private String ppn;
 
     @TableField(value = "pre_person")
-    @Schema(description = "防治人员id")
+    @Schema(description = "防治人员")
     private String prePerson;
 
-
-    @TableField(value = "pre_person_name")
-    @Schema(description = "防治人员名称")
-    private String prePersonName;
-
     @TableField(value = "pre_method")
     @Schema(description = "防治方法")
     private String preMethod;
diff --git a/src/main/java/com/gunshi/project/hsz/service/ByLogService.java b/src/main/java/com/gunshi/project/hsz/service/ByLogService.java
index e9882ad..51eace2 100644
--- a/src/main/java/com/gunshi/project/hsz/service/ByLogService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/ByLogService.java
@@ -38,8 +38,6 @@ public class ByLogService  extends ServiceImpl<ByLogMapper, ByLog> {
     @Autowired
     private ByLogDetailMapper byLogDetailMapper;
 
-    @Autowired
-    private SysUserMapper sysUserMapper;
 
     public boolean update(ByLog dto) {
         ByLog byId = getById(dto.getId());
@@ -301,7 +299,7 @@ public class ByLogService  extends ServiceImpl<ByLogMapper, ByLog> {
         private void fillDetailInfo(Row row, ByLogDetail detail, CellStyle style) {
             createCell(row, 6, detail.getPpdn(), style);    // 防治部位
             createCell(row, 7, detail.getPpn(), style);     // 防治点
-            createCell(row, 8, detail.getPrePersonName(), style); // 防治人员
+            createCell(row, 8, detail.getPrePerson(), style); // 防治人员
             createCell(row, 9, detail.getPreMethod(), style); // 防治方法
             createCell(row, 10, detail.getPreEffect(), style); // 防治效果
         }