From bb996e12e22c9b8254325406451d8e1a99699d35 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 14:39:58 +0800
Subject: [PATCH] 提交忽略文件
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 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 aaf1e1b..1011ee6 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
@@ -1,32 +1,34 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CasesMapper;
import com.doumee.dao.business.CategoryMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.model.Cases;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Member;
-import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Multifile;
import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
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;
@@ -117,11 +119,8 @@
Utils.MP.blankToNull(pageWrap.getModel());
Member model = pageWrap.getModel();
queryWrapper.selectAll(Member.class)
- .select(" c1.NAME ", Member::getPromotionName)
- .select(" c2.NAME ", Member::getLevelName)
- .select(" TIMESTAMPDIFF(YEAR, CONCAT(t.JOB_YEAR , '-01-01'), now()) ",Member::getWorkYears)
- .leftJoin(" category c1 on t.POSITON = c1.id ")
- .leftJoin(" category c2 on t.LEVEL_ID = c2.id ")
+ .selectAs(Category::getName, Member::getLevelName)
+ .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())
@@ -149,28 +148,53 @@
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);
+ dealMemberCategoryList(member,categoryList);
}
member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(path + member.getImgurl()):"");
if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
|| !roleConfig.contains(model.getQueryUserRole())){
member.setFee(null);
}
+ if(member.getJobYear()!=null){
+ member.setWorkYears(DateUtil.getCurrentYear( ) - member.getJobYear()+1);
+ }
}
}
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);
+ }
+ }
}
@@ -213,12 +237,12 @@
for (Cases cases:casesList) {
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,cases.getId())
- .eq(Multifile::getObjType,Constants.OBJECT_TYPE_CASES)
+ .eq(Multifile::getObjType,Constants.ONE)
.eq(Multifile::getIsdeleted,Constants.ZERO)
.orderByDesc(Multifile::getId)
);
multifileList.forEach(multifile -> {
- multifile.setFileurlFull(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath + casePath + multifile.getFileurl()):"");
+ multifile.setUrl(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath + casePath + multifile.getFileurl()):"");
});
}
member.setCasesList(casesList);
@@ -252,4 +276,6 @@
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectCount(wrapper);
}
+
+
}
--
Gitblit v1.9.3