Compare commits
No commits in common. "7034fecc0b44b56207d85f99475ad34728929837" and "ac23b19b0a622a58275c7e12f87a0cfb48a85d65" have entirely different histories.
7034fecc0b
...
ac23b19b0a
|
@ -31,10 +31,6 @@ public class PostEntity extends AuditableEntity implements Serializable {
|
||||||
@TableId(value = "post_id", type = IdType.ASSIGN_UUID)
|
@TableId(value = "post_id", type = IdType.ASSIGN_UUID)
|
||||||
private String postId;
|
private String postId;
|
||||||
|
|
||||||
@ApiModelProperty("部门id")
|
|
||||||
@TableField("dept_id")
|
|
||||||
private String deptId;
|
|
||||||
|
|
||||||
@ApiModelProperty("岗位名称")
|
@ApiModelProperty("岗位名称")
|
||||||
@TableField("post_name")
|
@TableField("post_name")
|
||||||
private String postName;
|
private String postName;
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
package com.dite.znpt.domain.vo;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Bear.G
|
|
||||||
* @date 2025/8/6/周三 14:37
|
|
||||||
* @description
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
@ApiModel("项目预算信息列表请求实体")
|
|
||||||
public class PostListReq implements Serializable {
|
|
||||||
@Serial
|
|
||||||
private static final long serialVersionUID = -3911963210474319099L;
|
|
||||||
|
|
||||||
@ApiModelProperty("岗位名称")
|
|
||||||
private String postName;
|
|
||||||
|
|
||||||
@ApiModelProperty("部门id")
|
|
||||||
private String deptId;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否包含部门子节点")
|
|
||||||
private Boolean includeDeptChildren;
|
|
||||||
}
|
|
|
@ -21,10 +21,6 @@ public class PostReq implements Serializable {
|
||||||
@Serial
|
@Serial
|
||||||
private static final long serialVersionUID = -149328762675637911L;
|
private static final long serialVersionUID = -149328762675637911L;
|
||||||
|
|
||||||
@ApiModelProperty("部门id")
|
|
||||||
@NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "部门id不能为空")
|
|
||||||
private String deptId;
|
|
||||||
|
|
||||||
@NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "岗位名称不能为空")
|
@NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "岗位名称不能为空")
|
||||||
@Size(max = 30, groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "岗位名称长度不能超过30个字符")
|
@Size(max = 30, groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "岗位名称长度不能超过30个字符")
|
||||||
@ApiModelProperty("岗位名称")
|
@ApiModelProperty("岗位名称")
|
||||||
|
|
|
@ -22,12 +22,6 @@ public class PostResp implements Serializable {
|
||||||
@ApiModelProperty("岗位id")
|
@ApiModelProperty("岗位id")
|
||||||
private String postId;
|
private String postId;
|
||||||
|
|
||||||
@ApiModelProperty("部门id")
|
|
||||||
private String deptId;
|
|
||||||
|
|
||||||
@ApiModelProperty("部门名称")
|
|
||||||
private String deptName;
|
|
||||||
|
|
||||||
@ApiModelProperty("岗位名称")
|
@ApiModelProperty("岗位名称")
|
||||||
private String postName;
|
private String postName;
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,6 @@ package com.dite.znpt.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.dite.znpt.domain.entity.PostEntity;
|
import com.dite.znpt.domain.entity.PostEntity;
|
||||||
import com.dite.znpt.domain.vo.PostListReq;
|
|
||||||
import com.dite.znpt.domain.vo.PostResp;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Bear.G
|
* @author Bear.G
|
||||||
|
@ -13,6 +9,4 @@ import java.util.List;
|
||||||
* @description
|
* @description
|
||||||
*/
|
*/
|
||||||
public interface PostMapper extends BaseMapper<PostEntity> {
|
public interface PostMapper extends BaseMapper<PostEntity> {
|
||||||
|
|
||||||
List<PostResp> selectPostResp(PostListReq req);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,6 @@ package com.dite.znpt.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.dite.znpt.domain.entity.PostEntity;
|
import com.dite.znpt.domain.entity.PostEntity;
|
||||||
import com.dite.znpt.domain.vo.PostListReq;
|
|
||||||
import com.dite.znpt.domain.vo.PostReq;
|
import com.dite.znpt.domain.vo.PostReq;
|
||||||
import com.dite.znpt.domain.vo.PostResp;
|
import com.dite.znpt.domain.vo.PostResp;
|
||||||
|
|
||||||
|
@ -15,9 +14,9 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public interface PostService extends IService<PostEntity> {
|
public interface PostService extends IService<PostEntity> {
|
||||||
|
|
||||||
List<PostResp> page(PostListReq req);
|
List<PostResp> page(String postName);
|
||||||
|
|
||||||
List<PostResp> list(PostListReq req);
|
List<PostResp> list(String postName);
|
||||||
|
|
||||||
PostResp detail(String postId);
|
PostResp detail(String postId);
|
||||||
|
|
||||||
|
|
|
@ -5,20 +5,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.dite.znpt.constant.Message;
|
import com.dite.znpt.constant.Message;
|
||||||
import com.dite.znpt.converts.Converts;
|
import com.dite.znpt.converts.Converts;
|
||||||
import com.dite.znpt.domain.entity.DeptEntity;
|
|
||||||
import com.dite.znpt.domain.entity.PostEntity;
|
import com.dite.znpt.domain.entity.PostEntity;
|
||||||
import com.dite.znpt.domain.vo.PostListReq;
|
|
||||||
import com.dite.znpt.domain.vo.PostReq;
|
import com.dite.znpt.domain.vo.PostReq;
|
||||||
import com.dite.znpt.domain.vo.PostResp;
|
import com.dite.znpt.domain.vo.PostResp;
|
||||||
import com.dite.znpt.exception.ServiceException;
|
import com.dite.znpt.exception.ServiceException;
|
||||||
import com.dite.znpt.mapper.DeptMapper;
|
|
||||||
import com.dite.znpt.mapper.PostMapper;
|
import com.dite.znpt.mapper.PostMapper;
|
||||||
import com.dite.znpt.service.PostService;
|
import com.dite.znpt.service.PostService;
|
||||||
import com.dite.znpt.util.PageUtil;
|
import com.dite.znpt.util.PageUtil;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -29,18 +25,15 @@ import java.util.List;
|
||||||
@Service
|
@Service
|
||||||
public class PostServiceImpl extends ServiceImpl<PostMapper, PostEntity> implements PostService {
|
public class PostServiceImpl extends ServiceImpl<PostMapper, PostEntity> implements PostService {
|
||||||
|
|
||||||
@Resource
|
|
||||||
private DeptMapper deptMapper;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<PostResp> page(PostListReq req) {
|
public List<PostResp> page(String postName) {
|
||||||
PageUtil.startPage();
|
PageUtil.startPage();
|
||||||
return this.list(req);
|
return this.list(postName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<PostResp> list(PostListReq req) {
|
public List<PostResp> list(String postName) {
|
||||||
return this.baseMapper.selectPostResp(req);
|
return Converts.INSTANCE.toPostResp(this.list(Wrappers.lambdaQuery(PostEntity.class).like(StrUtil.isNotBlank(postName), PostEntity::getPostName, postName)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -2,30 +2,4 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.dite.znpt.mapper.PostMapper">
|
<mapper namespace="com.dite.znpt.mapper.PostMapper">
|
||||||
|
|
||||||
<select id="selectPostResp" resultType="com.dite.znpt.domain.vo.PostResp">
|
|
||||||
SELECT p.*, d.dept_name FROM post p
|
|
||||||
LEFT JOIN dept d ON p.dept_id = d.dept_id
|
|
||||||
<where>
|
|
||||||
<if test="postName != null and postName != ''">
|
|
||||||
AND p.post_name LIKE concat('%',#{postName}, '%')
|
|
||||||
</if>
|
|
||||||
<if test="deptId != null and deptId != ''">
|
|
||||||
<choose >
|
|
||||||
<when test="includeDeptChildren">
|
|
||||||
AND p.dept_id IN (
|
|
||||||
WITH RECURSIVE SubDepts AS (
|
|
||||||
SELECT * FROM dept WHERE del_flag = '0' AND dept_id = #{deptId}
|
|
||||||
UNION ALL
|
|
||||||
SELECT d.* FROM dept d INNER JOIN SubDepts sd ON d.parent_id = sd.dept_id WHERE d.del_flag = '0'
|
|
||||||
) SELECT dept_id FROM SubDepts
|
|
||||||
)
|
|
||||||
</when>
|
|
||||||
<otherwise>
|
|
||||||
AND p.dept_id = #{deptId}
|
|
||||||
</otherwise>
|
|
||||||
</choose>
|
|
||||||
AND d.del_flag = '0'
|
|
||||||
</if>
|
|
||||||
</where>
|
|
||||||
</select>
|
|
||||||
</mapper>
|
</mapper>
|
|
@ -2,7 +2,6 @@ package com.dite.znpt.web.controller;
|
||||||
|
|
||||||
import com.dite.znpt.domain.PageResult;
|
import com.dite.znpt.domain.PageResult;
|
||||||
import com.dite.znpt.domain.Result;
|
import com.dite.znpt.domain.Result;
|
||||||
import com.dite.znpt.domain.vo.PostListReq;
|
|
||||||
import com.dite.znpt.domain.vo.PostReq;
|
import com.dite.znpt.domain.vo.PostReq;
|
||||||
import com.dite.znpt.domain.vo.PostResp;
|
import com.dite.znpt.domain.vo.PostResp;
|
||||||
import com.dite.znpt.service.PostService;
|
import com.dite.znpt.service.PostService;
|
||||||
|
@ -29,14 +28,14 @@ public class PostController {
|
||||||
|
|
||||||
@ApiOperation(value = "分页查询岗位信息列表", httpMethod = "GET")
|
@ApiOperation(value = "分页查询岗位信息列表", httpMethod = "GET")
|
||||||
@GetMapping("/page")
|
@GetMapping("/page")
|
||||||
public PageResult<PostResp> page(PostListReq req){
|
public PageResult<PostResp> page(@RequestParam(value = "postName", required = false) String postName){
|
||||||
return PageResult.ok(postService.page(req));
|
return PageResult.ok(postService.page(postName));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "查询岗位信息列表", httpMethod = "GET")
|
@ApiOperation(value = "查询岗位信息列表", httpMethod = "GET")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public Result<List<PostResp>> list(PostListReq req){
|
public Result<List<PostResp>> list(@RequestParam(value = "postName", required = false) String postName){
|
||||||
return Result.ok(postService.list(req));
|
return Result.ok(postService.list(postName));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "查询岗位信息详情", httpMethod = "GET")
|
@ApiOperation(value = "查询岗位信息详情", httpMethod = "GET")
|
||||||
|
|
|
@ -14,7 +14,7 @@ spring:
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driverClassName: com.mysql.cj.jdbc.Driver
|
driverClassName: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://39.99.201.243:3306/znpt_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
url: jdbc:mysql://39.99.201.243:3306/test01?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||||
username: root
|
username: root
|
||||||
password: BUw8YW6%@^8q
|
password: BUw8YW6%@^8q
|
||||||
druid:
|
druid:
|
||||||
|
|
Loading…
Reference in New Issue