From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java
index 8b2a2ec..6ae286f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java
@@ -1,10 +1,14 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.dao.TAdvertisementUserMapper;
import com.stylefeng.guns.modular.system.model.TAdvertisement;
import com.stylefeng.guns.modular.system.dao.TAdvertisementMapper;
+import com.stylefeng.guns.modular.system.model.TAdvertisementUser;
import com.stylefeng.guns.modular.system.service.ITAdvertisementService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -21,8 +25,53 @@
@Service
public class TAdvertisementServiceImpl extends ServiceImpl<TAdvertisementMapper, TAdvertisement> implements ITAdvertisementService {
+ @Autowired
+ private TAdvertisementUserMapper tAdvertisementUserMapper;
+
@Override
public List<Map<String, Object>> getAdvertisementList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer type, String name) {
return this.baseMapper.getAdvertisementList(page, beginTime, endTime, type, name);
}
+
+ @Override
+ public List<Map<String, Object>> getAdvertisementList1(Page<Map<String, Object>> page) {
+ List<Map<String, Object>> advertisementList1 = this.baseMapper.getAdvertisementList1(page);
+ for (Map<String, Object> stringObjectMap : advertisementList1) {
+ Integer id = (Integer)stringObjectMap.get("id");
+ TAdvertisementUser tAdvertisementUser = tAdvertisementUserMapper.selectTAdvertisementUser(id);
+ if("[]".equals(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getUserId())){
+ // all
+ stringObjectMap.put("sendUser",1);
+ }else if("[]".equals(tAdvertisementUser.getDriverId()) && !"[]".equals(tAdvertisementUser.getUserId())){
+ // driver
+ stringObjectMap.put("sendUser",2);
+ }else if(!"[]".equals(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getUserId())){
+ stringObjectMap.put("sendUser",3);
+ }else if(!"[]".equals(tAdvertisementUser.getDriverId()) && !"[]".equals(tAdvertisementUser.getUserId())){
+ stringObjectMap.put("sendUser",4);
+ }
+ }
+ return advertisementList1;
+ }
+
+ @Override
+ public List<Map<String, Object>> getAdvertisementList2(Page<Map<String, Object>> page) {
+ List<Map<String, Object>> advertisementList1 = this.baseMapper.getAdvertisementList2(page);
+ for (Map<String, Object> stringObjectMap : advertisementList1) {
+ Integer id = (Integer)stringObjectMap.get("id");
+ TAdvertisementUser tAdvertisementUser = tAdvertisementUserMapper.selectTAdvertisementInform(id);
+ if("[]".equals(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getUserId())){
+ // all
+ stringObjectMap.put("sendUser",1);
+ }else if("[]".equals(tAdvertisementUser.getDriverId()) && !"[]".equals(tAdvertisementUser.getUserId())){
+ // driver
+ stringObjectMap.put("sendUser",2);
+ }else if(!"[]".equals(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getUserId())){
+ stringObjectMap.put("sendUser",3);
+ }else if(!"[]".equals(tAdvertisementUser.getDriverId()) && !"[]".equals(tAdvertisementUser.getUserId())){
+ stringObjectMap.put("sendUser",4);
+ }
+ }
+ return advertisementList1;
+ }
}
--
Gitblit v1.7.1