From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010
---
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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..5dfb290 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,42 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.SysUser;
+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
@@ -36,4 +59,16 @@
public int countNum() {
return baseMapper.countNum();
}
+
+ @Override
+ public int updateGuid() {
+ return baseMapper.updateGuid();
+ }
+
+ @Override
+ public int countStatisticsNum(String state, String isTimeout) {
+ return baseMapper.countStatisticsNum(state,isTimeout);
+ }
+
+
}
--
Gitblit v1.7.1