ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】工作组的工号字段处理改进，更换为username字段

Browse Source
This commit is contained in:
zer0Black
2023-09-29 23:11:45 +08:00
parent 65115fe31b
commit 70eb314e25
19 changed files with 48 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+7 -8
View File
@@ -192,8 +192,8 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
return Result.error(msg);
}
for (LawsWorkingGroupUser groupUser : all) {
String userWorkNo = groupUser.getUserWorkNo();
SysUser userByWorkNo = sysUserService.getUserByWorkNo(userWorkNo);
String username = groupUser.getUsername();
SysUser userByWorkNo = sysUserService.getUserByName(username);
groupUser.setUserId(userByWorkNo.getId());
groupUser.setWorkingGroupId(workingGroupId);
groupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
@@ -306,16 +306,15 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
Set<String> existingWorkNos = lawsWorkingGroupUserService.list().stream().map(LawsWorkingGroupUser::getWorkingGroupId).collect(Collectors.toSet());
return IntStream.range(0, all.size())
.mapToObj(i -> {
int index = i + 2;
LawsWorkingGroupUser lawsWorkingGroupUser = all.get(i);
String userWorkNo = lawsWorkingGroupUser.getUserWorkNo();
if (userWorkNo == null || userWorkNo.trim().isEmpty()) {
String username = lawsWorkingGroupUser.getUsername();
if (username == null || username.trim().isEmpty()) {
return MessageUtils.getMessage(ResultCommon.THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT);
}
if (!isValidWorkNo(userWorkNo)) {
if (!isValidWorkNo(username)) {
return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT);
}
if (!existingWorkNos.add(userWorkNo)) {
if (!existingWorkNos.add(username)) {
return MessageUtils.getMessage(ResultCommon.DUPLICATE_JOB_NUMBER_EXPORT);
}
return null;
@@ -326,7 +325,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
* 判断工号在用户表中是否存在
*/
private boolean isValidWorkNo(String userWorkNo) {
SysUser sysUser = sysUserService.getUserByWorkNo(userWorkNo);
SysUser sysUser = sysUserService.getUserByName(userWorkNo);
return sysUser != null;
}
laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java
+2 -2
View File
@@ -73,11 +73,11 @@ public class LawsWorkingGroupUser implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "姓名")
private String userName;
private String realname;
@TableField(exist = false)
@ApiModelProperty(value = "工号")
private String userWorkNo;
private String username;
@TableField(exist = false)
@ApiModelProperty(value = "角色")
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+8 -8
View File
@@ -50,19 +50,19 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
private ISysUserRoleService sysUserRoleService;
/**
* 分页查询
* 分页查询， TODO 改为一个联表查询不行吗？？
*/
@Override
public IPage<LawsWorkingGroupUser> queryPage(LawsWorkingGroupUser lawsWorkingGroupUser, Integer pageNo, Integer pageSize,
HttpServletRequest req) {
Page<LawsWorkingGroupUser> page = new Page<>(pageNo, pageSize);
String userName = lawsWorkingGroupUser.getUserName();
String userWorkNo = lawsWorkingGroupUser.getUserWorkNo();
String realname = lawsWorkingGroupUser.getRealname();
String userName = lawsWorkingGroupUser.getUsername();
String userRoleName = lawsWorkingGroupUser.getUserRoleName();
String userPostName = lawsWorkingGroupUser.getUserPostName();
String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId();
if (!StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
List<String> ids = sysUserService.LawsWorkingGroupUserSearch(userName, userWorkNo, userRoleName, userPostName);
if (!StringUtils.isAllBlank(realname, userName, userRoleName, userPostName)){
List<String> ids = sysUserService.LawsWorkingGroupUserSearch(realname, userName, userRoleName, userPostName);
if (ids.isEmpty()){
return new Page<>();
}
@@ -148,9 +148,9 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
for (LawsWorkingGroupUser user : list) {
SysUser sysUser = userMap.get(user.getUserId());
if (sysUser != null) {
user.setUserName(sysUser.getRealname());
user.setUserWorkNo(sysUser.getUsername());
user.setUserPostName("岗位xxx");
user.setRealname(sysUser.getRealname());
user.setUsername(sysUser.getUsername());
user.setUserPostName("岗位xxx"); // TODO 需要替换为岗位字段
}
LambdaQueryWrapper<SysUserRole> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SysUserRole::getUserId, user.getUserId());