From a6240781e9a1c26f572558df793efc31153ad387 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Tue, 23 Jul 2024 18:24:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yxgh/sz/mapper/SzRecordMapper.java  | 12 +++++++++++-
 .../com/kms/yxgh/sz/service/SzRecordService.java     |  7 ++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
index 1a487bf8..0e250c37 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java
@@ -28,9 +28,18 @@ public interface SzRecordMapper extends BaseMapper<SzRecord> {
             "r.waga_code," +
             "r.waga_name, " +
             "r.waga_type, " +
+            "r.line_id, " +
             "r.line_name, " +
             "r.line_type, " +
+            "r.plan_id, " +
+            "r.plan_name, " +
+            "r.sub_plan_id, " +
+            "r.sub_plan_name, " +
+            "r.sub_plan_start_date, " +
+            "r.sub_plan_end_date, " +
             "r.duty_holder_type, " +
+            "plan.plan_type, " +
+            "r.scope, " +
             "r.status, " +
             "r.handle_status, " +
             "r.start_date, " +
@@ -40,7 +49,8 @@ public interface SzRecordMapper extends BaseMapper<SzRecord> {
             "r.create_uid, " +
             "r.update_uid " +
             "FROM bs_sgc_sz_xsjhjl r " +
-            "Left JOIN att_waga_base df ON r.waga_code = df.waga_code and df.expr_date is null " +
+            "LEFT JOIN att_waga_base df ON r.waga_code = df.waga_code and df.expr_date is null " +
+            "LEFT JOIN bs_sgc_sz_xsjh plan ON r.plan_id = plan.id " +
             "where 1=1" +
             "<if test='dto.wagaName != null and dto.wagaName != \"\"'> " +
             "and r.waga_name like concat('%',#{dto.wagaName},'%') " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java
index d1a304f3..ddd7d681 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java
@@ -58,11 +58,8 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
         SzRecordSearchDto searchDto = sp.getData();
         IPage<SzRecordSimpleDto> records = this.getBaseMapper().search(page, searchDto);
         records.getRecords().forEach(r -> {
-            SzRecordSimpleDto dto = BeanCopyUtils.copy(r, SzRecordSimpleDto.class);
-            if (dto != null) {
-                dto.setCreateName(userService.userName(dto.getCreateUid()));
-                dto.setOperators(planOperatorMapper.selectOperatorBySubPlanId(r.getSubPlanId()));
-            }
+            r.setCreateName(userService.userName(r.getCreateUid()));
+            r.setOperators(planOperatorMapper.selectOperatorBySubPlanId(r.getSubPlanId()));
         });
         return records;