From e4a06e0730dc0aa6ced97cbb3362d6b8ef473d39 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 15:56:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 4b2ede0..f959ee4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -2,6 +2,10 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -21,13 +25,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -40,6 +43,8 @@
@Autowired
private PlatformGroupMapper platformGroupMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private PlatformJoinMapper platformJoinMapper;
@@ -188,7 +193,54 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(platformGroupMapper.selectPage(page, queryWrapper));
+ PageData<PlatformGroup> result =PageData.from(platformGroupMapper.selectPage(page, queryWrapper));
+ if(result !=null && result.getRecords()!=null){
+ List<String > ids0 = new ArrayList<>();
+ List<SystemUser> systemUserList ;
+ for(PlatformGroup platformGroup : result.getRecords()){
+ if( StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers()) || StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers())) {
+ if( StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers()) ){
+ ids0.addAll(Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")));
+ }
+ if( StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers()) ){
+ ids0.addAll(Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")));
+ }
+ }
+ }
+ systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO).eq(SystemUser::getStatus, Constants.ZERO).isNotNull(SystemUser::getOpenid)
+ .in(SystemUser::getId,ids0) );
+ if (systemUserList!=null) {
+ for(PlatformGroup platformGroup : result.getRecords()){
+ platformGroup.setSignInNoticeUserNames(getUserNameFromList(0,platformGroup,systemUserList));
+ platformGroup.setUnFinishNoticeUserNames(getUserNameFromList(1,platformGroup,systemUserList));
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private String getUserNameFromList(int i, PlatformGroup platformGroup, List<SystemUser> systemUserList) {
+ String ids = i ==0?platformGroup.getSignInNoticeUsers():platformGroup.getSignInNoticeUsers();
+ String name = "";
+ if( StringUtils.isNotBlank(ids)) {
+ List<String > ids0 = Arrays.asList(ids.split(","));
+
+ if (systemUserList!=null) {
+ for(SystemUser user :systemUserList){
+ for(String s : ids0){
+ if(StringUtils.isNotBlank(name)){
+ name += ",";
+ }
+ if(StringUtils.equals(user.getId().toString(),s)){
+ name += StringUtils.defaultString(user.getRealname(),user.getUsername());
+ }
+ }
+ }
+ }
+ }
+ return name;
}
@Override
--
Gitblit v1.9.3