From 5f42e58b84a051643ea8e42b5aa8818ea0036d61 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Mon, 20 Nov 2023 10:55:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=80=85=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kms/yxgh/df/service/DfPlanService.java | 9 +++++----
 .../main/java/com/kms/yxgh/sz/service/SzPlanService.java | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
index a807a30b..b472b592 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
@@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.yxgh.base.DfException;
-import com.kms.yxgh.df.dto.DfPlanDetailDto;
-import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto;
-import com.kms.yxgh.df.dto.DfPointDto;
 import com.kms.yxgh.df.domain.DfPlan;
 import com.kms.yxgh.df.domain.DfPlanOperator;
 import com.kms.yxgh.df.domain.DfPoint;
+import com.kms.yxgh.df.dto.DfPlanDetailDto;
+import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto;
+import com.kms.yxgh.df.dto.DfPointDto;
 import com.kms.yxgh.df.mapper.DfPlanMapper;
 import com.kms.yxgh.df.mapper.DfPlanOperatorMapper;
 import com.kms.yxgh.df.mapper.DfPointMapper;
@@ -44,7 +44,8 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
     if (dto != null) {
       dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig()));
       Wrapper<DfPlanOperator> wp = Wrappers.<DfPlanOperator>lambdaQuery()
-          .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid)
+          .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid,
+              DfPlanOperator::getOperatorName)
           .eq(DfPlanOperator::getPlanId, id);
       dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.selectList(wp), (o) -> {
         OperatorDto itemDto = new OperatorDto();
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java
index 9b11c4b5..09b376ca 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java
@@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.yxgh.base.SzException;
-import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto;
-import com.kms.yxgh.sz.dto.SzPlanDetailDto;
-import com.kms.yxgh.sz.dto.SzPointDto;
 import com.kms.yxgh.sz.domain.SzPlan;
 import com.kms.yxgh.sz.domain.SzPlanOperator;
 import com.kms.yxgh.sz.domain.SzPoint;
+import com.kms.yxgh.sz.dto.SzPlanDetailDto;
+import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto;
+import com.kms.yxgh.sz.dto.SzPointDto;
 import com.kms.yxgh.sz.mapper.SzPlanMapper;
 import com.kms.yxgh.sz.mapper.SzPlanOperatorMapper;
 import com.kms.yxgh.sz.mapper.SzPointMapper;
@@ -44,7 +44,8 @@ public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
     if (dto != null) {
       dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig()));
       Wrapper<SzPlanOperator> wp = Wrappers.<SzPlanOperator>lambdaQuery()
-          .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid)
+          .select(SzPlanOperator::getId, SzPlanOperator::getOperatorUid,
+              SzPlanOperator::getOperatorName)
           .eq(SzPlanOperator::getPlanId, id);
       dto.setOperators(StreamUtils.toList(SzPlanOperatorMapper.selectList(wp), (o) -> {
         OperatorDto itemDto = new OperatorDto();