From c1d1c4dd78ea55a4a364b761826470212f79bdb0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 08 十二月 2022 09:37:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 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..a2d416b 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,47 @@
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);
+ public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
+ List<GuideEvolveEntity> guideEvolveEntities;
+ if ((sysUser.getUserType().equals("3")&&sysUser.getIsDivisionHead().equals("2"))||(sysUser.getUserType().equals("4"))){
+ guideEvolveEntities=baseMapper.selectHideList(guideId);
+ }else {
+ 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 +64,12 @@
public int countNum() {
return baseMapper.countNum();
}
+
+ @Override
+ public int updateGuid() {
+ return baseMapper.updateGuid();
+ }
+
+
+
}
--
Gitblit v1.7.1