From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014
---
flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
index 36e0d66..b7a568e 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -3,25 +3,51 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.ReplyTemplateEntity;
+import com.dg.core.db.gen.mapper.ElseAccessoryMapper;
import com.dg.core.db.gen.mapper.ReplyTemplateMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IReplyTemplateService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
@Service
public class ReplyTemplateImpl extends ServiceImpl<ReplyTemplateMapper, ReplyTemplateEntity> implements IReplyTemplateService
{
+ @Resource
+ private ElseAccessoryMapper elseAccessoryMapper;
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
@Override
- public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,String Name) {
- return baseMapper.selectConfigList(page,state,Name);
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
+ Integer state,String Name,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,Name,ids);
}
@Override
public ReplyTemplateEntity selectConfigData(String Id) {
- return baseMapper.selectConfigData(Id);
+ ReplyTemplateEntity replyTemplateEntity = baseMapper.selectConfigData(Id);
+ if (replyTemplateEntity!=null)
+ { String[] split;
+ if (replyTemplateEntity.getAccessoryId()!=null){
+ split = replyTemplateEntity.getAccessoryId().split(",");
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
+ if (replyTemplateEntity.getGuidance()!=null){
+ split=replyTemplateEntity.getGuidance().split(",");
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+ return replyTemplateEntity;
+ }
+ else {
+ return null;
+ }
}
@Override
@@ -40,7 +66,7 @@
}
@Override
- public int countNum(String Name) {
- return baseMapper.countNum(Name);
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
}
}
--
Gitblit v1.7.1