From c1447510c0c08ab8b2ecf4abeaa2bf40399e7a0d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 23 Aug 2024 10:31:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=85=E9=83=A8=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E7=9B=B8=E5=85=B3=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsWorkingGroupUserController.java | 34 ++++++++++--------- .../sys/entity/LawsWorkingGroupUser.java | 24 +++++++------ .../impl/LawsWorkingGroupUserServiceImpl.java | 17 ++++++---- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index 92f14922..35272f59 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; @@ -12,7 +13,6 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.IntekeyUtils; import com.jero.common.util.MessageUtils; -import com.jero.common.api.vo.ResultCommon; import com.jero.modules.sys.entity.LawsWorkingGroupUser; import com.jero.modules.sys.entity.LawsWorkingGroupUserImport; import com.jero.modules.sys.service.ILawsWorkingGroupUserService; @@ -29,7 +29,6 @@ import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -61,7 +60,6 @@ public class LawsWorkingGroupUserController extends JeroController msg = importExcelCheck(all,workingGroupId); + List msg = importExcelCheck(all, workingGroupId); if (!CollectionUtils.isEmpty(msg)) { - return Result.error(MessageUtils.getMessage(ResultCommon.ERROR),msg); + return Result.error(MessageUtils.getMessage(ResultCommon.ERROR), msg); } for (LawsWorkingGroupUser groupUser : all) { String username = groupUser.getUsername(); @@ -249,21 +247,25 @@ public class LawsWorkingGroupUserController extends JeroController importExcelCheck(List all,String workingGroupId) { - return validateWorkNo(all,workingGroupId); + public List importExcelCheck(List all, String workingGroupId) { + return validateWorkNo(all, workingGroupId); } - private List validateWorkNo(List all,String workingGroupId) { + private List validateWorkNo(List all, String workingGroupId) { List listSysUser = sysUserService.list(); LambdaQueryWrapper queryLawsWorkingGroupUser = new LambdaQueryWrapper<>(); - queryLawsWorkingGroupUser.eq(LawsWorkingGroupUser::getWorkingGroupId,workingGroupId); + queryLawsWorkingGroupUser.eq(LawsWorkingGroupUser::getWorkingGroupId, workingGroupId); Set existingWorkNos = lawsWorkingGroupUserService.list(queryLawsWorkingGroupUser).stream().map(LawsWorkingGroupUser::getUserId).collect(Collectors.toSet()); return IntStream.range(0, all.size()) .mapToObj(i -> { @@ -276,14 +278,14 @@ public class LawsWorkingGroupUserController extends JeroController op = listSysUser.stream().filter(o->Objects.equals(o.getUsername(), finalUsername)).findFirst(); - if(!op.isPresent()){ + Optional op = listSysUser.stream().filter(o -> Objects.equals(o.getUsername(), finalUsername)).findFirst(); + if (!op.isPresent()) { return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT, (i + 2)); } username = op.get().getId(); - if(!Objects.equals(op.get().getRealname(),realname)){ + if (!Objects.equals(op.get().getRealname(), realname)) { return MessageUtils.getMessage(ResultCommon.THE_REAL_NAME_AND_JOB_NUMBER_MISMATCH_EXPORT, (i + 2)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java index ddbe8bdc..9f9d8c5b 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java @@ -1,18 +1,18 @@ package com.jero.modules.sys.entity; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - /** * @Description: 内部工作组人员关联表 @@ -90,6 +90,10 @@ public class LawsWorkingGroupUser implements Serializable { @Excel(name = "岗位",width = 15) private String userPostName; + @TableField(exist = false) + @ApiModelProperty(value = "1领导 2成员") + private String searchType; + @TableField(exist = false) @ApiModelProperty(value = "姓名工号通用查询字段") private String realnameOrUsername; diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java index 09caa337..6f9bd4ed 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java @@ -75,7 +75,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl wrapper = getWrapper(realname, userName, userRoleName, userPostName, workingGroupId); + QueryWrapper wrapper = getWrapper(realname, userName, userRoleName, userPostName, workingGroupId, lawsWorkingGroupUser.getSearchType()); if (StringUtils.isNotBlank(lawsWorkingGroupUser.getRealnameOrUsername())) { QueryWrapper userWrapper = new QueryWrapper<>(); userWrapper.like("realname", lawsWorkingGroupUser.getRealnameOrUsername()) @@ -91,13 +91,18 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl getWrapper(String realname, String userName, String userRoleName, String userPostName, String workingGroupId) { - List workingGroupIds = getWorkingGroupIds(workingGroupId); + private QueryWrapper getWrapper(String realname, String userName, String userRoleName, String userPostName, String workingGroupId, String searchType) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("user_id","max(working_group_id) as working_group_id","max(id) as id"); - if(!CollectionUtils.isEmpty(workingGroupIds)){ - wrapper.in("working_group_id", workingGroupIds); + if (searchType == null || searchType.equals("2")) { + List workingGroupIds = getWorkingGroupIds(workingGroupId); + if(!CollectionUtils.isEmpty(workingGroupIds)){ + wrapper.in("working_group_id", workingGroupIds); + } + } else { + wrapper.eq("working_group_id", workingGroupId); } + if (!StringUtils.isAllBlank(realname, userName, userRoleName, userPostName)){ List ids = lawsWorkingGroupUserSearch(realname, userName, userRoleName, userPostName); if (CollectionUtils.isEmpty(ids)){ @@ -204,7 +209,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl dos; - QueryWrapper wrapper = getWrapper(realname, userName, userRoleName, userPostName, workingGroupId); + QueryWrapper wrapper = getWrapper(realname, userName, userRoleName, userPostName, workingGroupId, null); //获取选中数据 String selections = request.getParameter("selections");