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 { if (dto != null) { dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); Wrapper wp = Wrappers.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 { if (dto != null) { dto.setOtherConfig(JSON.parseObject(SzPlan.getOtherConfig())); Wrapper wp = Wrappers.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();