岗位、余料查询修改

This commit is contained in:
lym
2024-10-17 10:08:47 +08:00
parent fb7f1575e2
commit bc489b1a0d
17 changed files with 128 additions and 14 deletions
@@ -26,6 +26,10 @@ public class UserPageReqVO extends PageParam {
@Size(max = 30, message = "用户昵称长度不能超过30个字符")
private String nickname;
@Schema(description = "用户账号")
@Size(max = 30, message = "用户账号长度不能超过30个字符")
private String username;
@Schema(description = "手机号码,模糊匹配", example = "chenfeng")
@Mobile
@Size(max = 11, message = "手机号码长度不能超过11个字符")
@@ -34,11 +34,21 @@ public interface PostMapper extends BaseMapperX<PostDO> {
}else{
lambdaQueryWrapperX.eqIfPresent(PostDO::getOrganId, loginUser.getOrganId());
}
return selectPage(reqVO, lambdaQueryWrapperX
// 获取分页结果
PageResult<PostDO> pageResult = selectPage(reqVO, lambdaQueryWrapperX
.likeIfPresent(PostDO::getCode, reqVO.getCode())
.likeIfPresent(PostDO::getName, reqVO.getName())
.eqIfPresent(PostDO::getStatus, reqVO.getStatus())
.orderByDesc(PostDO::getId));
// 重新设置 id 值
List<PostDO> records = pageResult.getList();
for (int i = 0; i < records.size(); i++) {
PostDO postDO = records.get(i);
postDO.setId((long) (i + 1));
}
return pageResult;
}
default PostDO selectByName(String name) {
@@ -393,6 +393,9 @@ public class AdminUserServiceImpl implements AdminUserService {
if (StringUtils.isNotBlank(reqVO.getNickname())) {
reqVO.setPyFirstChar(PinYinUtils.convertFirstChar(reqVO.getNickname()));
reqVO.setPyAll(PinYinUtils.convertToPinyin(reqVO.getNickname()).replace(" ", ""));
} else if (StringUtils.isNotBlank((reqVO.getUsername()))) {
reqVO.setPyFirstChar(PinYinUtils.convertFirstChar(reqVO.getUsername()));
reqVO.setPyAll(PinYinUtils.convertToPinyin(reqVO.getUsername()).replace(" ", ""));
} else {
// 避免name为空外部传入拼音查询字段
reqVO.setPyFirstChar(null);