From ff00f902f38008967013e6bc981345537dc7a590 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 四月 2025 12:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 15 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
index 6d4430c..5e57bfb 100644
--- a/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java
@@ -1,19 +1,31 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ManagersMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Managers;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ManagersService;
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.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
+import org.apache.shiro.SecurityUtils;
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;
/**
@@ -26,16 +38,42 @@
@Autowired
private ManagersMapper managersMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Override
public Integer create(Managers managers) {
+ Member member =memberMapper.selectById(managers.getMemberId());
+ if(member == null || Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヨ礋璐ｄ汉淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ Managers model =managersMapper.selectOne(new LambdaQueryWrapper<Managers>().eq(Managers::getMemberId,managers.getMemberId())
+ .eq(Managers::getType,managers.getType())
+ .eq(Managers::getIsdeleted,Constants.ZERO)
+ );
+ if(model !=null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇ヤ汉鍛樹俊鎭凡璁剧疆锛屾棤闇�閲嶆柊娣诲姞");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ managers.setCreator(user.getId());
+ managers.setCreateDate(new Date());
+ managers.setIsdeleted(Constants.ZERO);
+ managers.setEditor(managers.getCreator());
+ managers.setEditDate(managers.getCreateDate());
+ managers.setStatus(Constants.ZERO);
managersMapper.insert(managers);
return managers.getId();
}
@Override
public void deleteById(Integer id) {
- managersMapper.deleteById(id);
+ Managers managers = new Managers();
+ managers.setId(id);
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ managers.setEditor(user.getId());
+ managers.setEditDate(new Date());
+ managers.setIsdeleted(Constants.ONE);
+ managersMapper.updateById(managers);
}
@Override
@@ -49,11 +87,16 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- managersMapper.deleteBatchIds(ids);
+ for(Integer id :ids){
+ deleteById(id);
+ }
}
@Override
public void updateById(Managers managers) {
+ LoginUserInfo user = new LoginUserInfo();
+ managers.setEditor(user.getId());
+ managers.setEditDate(new Date());
managersMapper.updateById(managers);
}
@@ -79,17 +122,55 @@
}
@Override
- public List<Managers> findList(Managers managers) {
- QueryWrapper<Managers> wrapper = new QueryWrapper<>(managers);
- return managersMapper.selectList(wrapper);
+ public List<Managers> findList(Managers pageWrap) {
+ MPJLambdaWrapper<Managers> queryWrapper = new MPJLambdaWrapper<>();
+ pageWrap.setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(Managers.class )
+ .selectAs(Member::getPhone,Managers::getMemberPhone)
+ .selectAs(Member::getName,Managers::getMemberName)
+ .selectAs(Member::getEmail,Managers::getMemberEmail)
+ .selectAs(Member::getCompanyName,Managers::getCompanyName)
+ .selectAs(SystemUser::getUsername,Managers::getEditorName)
+ .leftJoin(Member.class,Member::getId,Managers::getMemberId)
+ .leftJoin(SystemUser.class,SystemUser::getId,Managers::getEditor)
+ .eq(pageWrap.getId() != null, Managers::getId, pageWrap.getId())
+ .eq(pageWrap.getCreator() != null, Managers::getCreator, pageWrap.getCreator())
+ .ge(pageWrap.getCreateDate() != null, Managers::getCreateDate, Utils.Date.getStart(pageWrap.getCreateDate()))
+ .le(pageWrap.getCreateDate() != null, Managers::getCreateDate, Utils.Date.getEnd(pageWrap.getCreateDate()))
+ .eq(pageWrap.getEditor() != null, Managers::getEditor, pageWrap.getEditor())
+ .ge(pageWrap.getEditDate() != null, Managers::getEditDate, Utils.Date.getStart(pageWrap.getEditDate()))
+ .le(pageWrap.getEditDate() != null, Managers::getEditDate, Utils.Date.getEnd(pageWrap.getEditDate()))
+ .eq(pageWrap.getIsdeleted() != null, Managers::getIsdeleted, pageWrap.getIsdeleted())
+ .eq(pageWrap.getCategoryId() != null, Managers::getCategoryId, pageWrap.getCategoryId())
+ .eq(pageWrap.getRemark() != null, Managers::getRemark, pageWrap.getRemark())
+ .eq(pageWrap.getStatus() != null, Managers::getStatus, pageWrap.getStatus())
+ .eq(pageWrap.getSortnum() != null, Managers::getSortnum, pageWrap.getSortnum())
+ .eq(pageWrap.getType() != null, Managers::getType, pageWrap.getType())
+ .eq(pageWrap.getMemberId() != null, Managers::getMemberId, pageWrap.getMemberId())
+ .like(pageWrap.getMemberName() != null, Member::getName, pageWrap.getMemberName());
+ if (pageWrap.getKeyword() != null) {
+ queryWrapper.and( ms->ms.like(Member::getName,pageWrap.getKeyword())
+ .or().like(Member::getPhone,pageWrap.getKeyword())
+ .or().like(Member::getCompanyName,pageWrap .getKeyword()));
+ }
+ queryWrapper.orderByDesc(Managers::getCreateDate);
+ return managersMapper.selectJoinList( Managers.class, queryWrapper);
}
@Override
public PageData<Managers> findPage(PageWrap<Managers> pageWrap) {
IPage<Managers> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Managers> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Managers> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(Managers.class )
+ .selectAs(Member::getPhone,Managers::getMemberPhone)
+ .selectAs(Member::getName,Managers::getMemberName)
+ .selectAs(Member::getEmail,Managers::getMemberEmail)
+ .selectAs(Member::getCompanyName,Managers::getCompanyName)
+ .selectAs(SystemUser::getUsername,Managers::getEditorName)
+ .leftJoin(Member.class,Member::getId,Managers::getMemberId)
+ .leftJoin(SystemUser.class,SystemUser::getId,Managers::getEditor)
.eq(pageWrap.getModel().getId() != null, Managers::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, Managers::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, Managers::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -104,15 +185,14 @@
.eq(pageWrap.getModel().getSortnum() != null, Managers::getSortnum, pageWrap.getModel().getSortnum())
.eq(pageWrap.getModel().getType() != null, Managers::getType, pageWrap.getModel().getType())
.eq(pageWrap.getModel().getMemberId() != null, Managers::getMemberId, pageWrap.getModel().getMemberId())
- ;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
+ .like(pageWrap.getModel().getMemberName() != null, Member::getName, pageWrap.getModel().getMemberName());
+ if (pageWrap.getModel().getKeyword() != null) {
+ queryWrapper.and( ms->ms.like(Member::getName,pageWrap.getModel().getKeyword())
+ .or().like(Member::getPhone,pageWrap.getModel().getKeyword())
+ .or().like(Member::getCompanyName,pageWrap.getModel().getKeyword()));
}
- return PageData.from(managersMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(Managers::getCreateDate);
+ return PageData.from(managersMapper.selectJoinPage(page,Managers.class, queryWrapper));
}
@Override
--
Gitblit v1.9.3