From 6f38864d63fac1044175711e1de4d32e5644d710 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 15:01:02 +0800
Subject: [PATCH] 提交忽略文件
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 1733407..254bdeb 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -20,6 +20,7 @@
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.MemberService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -27,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -118,20 +120,22 @@
Utils.MP.blankToNull(pageWrap.getModel());
Member model = pageWrap.getModel();
queryWrapper.selectAll(Member.class)
- .select(" c1.NAME ", Member::getPromotionName)
- .select(" c2.NAME ", Member::getLevelName)
- .leftJoin(" category c1 on t.POSITON = c1.id ")
- .leftJoin(" category c2 on t.LEVEL_ID = c2.id ")
+ .selectAs(Category::getName, Member::getLevelName)
+ .selectAs(SystemUser::getRealname, Member::getUpdateUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Member::getUpdateUser)
+ .leftJoin(Category.class,Category::getId,Member::getLevelId)
.apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
.like(StringUtils.isNotBlank(model.getName()),Member::getName, model.getName())
.eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
- .orderByAsc(Objects.isNull(model.getOrderByType()),"c2.DETAIL")
.orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ZERO),Member::getFee)
.orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ONE),Member::getFee)
- .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),"c2.DETAIL")
- .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),"c2.DETAIL")
+ .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),Category::getDetail)
+ .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),Category::getDetail)
.orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.FOUR),Member::getServeNum)
;
+ if(Constants.equalsInteger(pageWrap.getModel().getQueryFlag(),Constants.ONE)){
+ queryWrapper.select("(select count(c.id) from cases c where c.deleted=0 and c.member_id=t.id)",Member::getCaseNum);
+ }
if(StringUtils.isNotBlank(model.getFieldIds())){
String [] fieldIds = model.getFieldIds().split(",");
for (String s:fieldIds) {
@@ -149,19 +153,22 @@
queryWrapper.apply(" find_in_set( '["+zhanqu.getId()+"]', t.ZHANQU_IDS ) ");
}
}
- IPage<Member> memberIPage = memberMapper.selectJoinPage(page, Member.class, new MPJLambdaWrapper<>());
+ IPage<Member> memberIPage = memberMapper.selectJoinPage(page, Member.class, queryWrapper);
if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getDeleted, Constants.ZERO)
- .eq(Category::getType,Constants.TWO)
+// .eq(Category::getType,Constants.TWO)
.orderByAsc(Category::getSortnum)
);
String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CATEGORY_FILES).getCode();
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER_FILES).getCode();
String roleConfig = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ROLE_CONFIG).getCode();
for (Member member:memberIPage.getRecords()) {
if(CollectionUtils.isNotEmpty(categoryList)){
dealMemberField(member,categoryList);
+ if(Constants.equalsInteger(pageWrap.getModel().getQueryFlag(),Constants.ONE)) {
+ dealMemberCategoryList(member, categoryList);
+ }
}
member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(path + member.getImgurl()):"");
if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
@@ -176,6 +183,27 @@
return PageData.from(memberIPage);
}
+ private void dealMemberCategoryList(Member member, List<Category> categoryList) {
+ member.setFieldList(new ArrayList<>());
+ member.setTypeList(new ArrayList<>());
+ member.setZqList(new ArrayList<>());
+ for(Category c:categoryList){
+// 0=鎴樺尯;1=鍟嗕笟鍖�;2=鎿呴暱棰嗗煙;
+ if(Constants.equalsInteger(c.getType(),Constants.ZERO)&& StringUtils.contains(member.getZhanquIds(),"["+c.getId()+"]")){
+ //鎴樺尯
+ member.getZqList().add(c);
+ }
+ if(Constants.equalsInteger(c.getType(),Constants.ONE)&& StringUtils.contains(member.getBustypeIds(),"["+c.getId()+"]")){
+ //鍟嗕笟鍖�
+ member.getTypeList().add(c);
+ }
+ if(Constants.equalsInteger(c.getType(),Constants.TWO) && StringUtils.contains(member.getFieldIds(),"["+c.getId()+"]")){
+ //鎿呴暱棰嗗煙
+ member.getFieldList().add(c);
+ }
+ }
+ }
+
@Override
public Member findDetailById(Integer id,String queryUserRole) {
--
Gitblit v1.9.3