From 3940e5ebf6a2fecca5fc75c9e5d8a325c5842681 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 14:00:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
index 6929e90..5efe554 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
@@ -2,19 +2,41 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.mapper.ElseAccessoryMapper;
import com.dg.core.db.gen.mapper.GuideEvolveMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IGuideEvolveService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
@Service
public class GuideEvolveImpl extends ServiceImpl<GuideEvolveMapper, GuideEvolveEntity> implements IGuideEvolveService
{
+
+ @Resource
+ private ElseAccessoryMapper elseAccessoryMapper;
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
@Override
public List<GuideEvolveEntity> selectConfigList(String guideId) {
- return baseMapper.selectConfigList(guideId);
+ List<GuideEvolveEntity> guideEvolveEntities = baseMapper.selectConfigList(guideId);
+ for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
+ String[] split;
+ if (guideEvolveEntity.getAccessoryId()!=null){
+ split = guideEvolveEntity.getAccessoryId().split(",");
+ guideEvolveEntity.setElseAccessoryEntities( elseAccessoryMapper.selectListByIds(split));
+ }
+ if (guideEvolveEntity.getTransactionId()!=null){
+ split=guideEvolveEntity.getTransactionId().split(",");
+ guideEvolveEntity.setTransactionEvents(transactionEventMapper.selectListByIds(split));
+ }
+ }
+ return guideEvolveEntities;
}
@Override
--
Gitblit v1.7.1