fix():岗位信息bug修复-已完成

boot3.0
21407 2025-02-24 11:52:23 +08:00
parent ee7b1a53f4
commit 0720b476c5
11 changed files with 134 additions and 29 deletions

View File

@ -14,7 +14,9 @@ import com.muyu.system.domain.model.*;
import com.muyu.system.domain.rep.SysPostEditReq; import com.muyu.system.domain.rep.SysPostEditReq;
import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.domain.rep.SysPostListReq;
import com.muyu.system.domain.rep.SysPostSaveReq; import com.muyu.system.domain.rep.SysPostSaveReq;
import com.muyu.system.domain.resp.SysPostListResp;import com.muyu.system.service.SysPostService; import com.muyu.system.domain.resp.SysPostListResp;
import com.muyu.system.domain.resp.SysPostMyInfoResp;
import com.muyu.system.service.SysPostService;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -58,8 +60,8 @@ public class SysPostController extends BaseController {
*/ */
@RequiresPermissions("system:post:query") @RequiresPermissions("system:post:query")
@GetMapping(value = "/{postId}") @GetMapping(value = "/{postId}")
public Result<SysPostMyInfoModel> getInfo (@PathVariable("postId") Long postId) { public Result<SysPostMyInfoResp> getInfo (@PathVariable("postId") Long postId) {
return success(postService.selectPostById(postId)); return success(SysPostMyInfoResp.messageBuild(postService.selectPostById(postId)));
} }
/** /**

View File

@ -13,7 +13,7 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.*; import lombok.*;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;import java.util.Date;
/** /**
* sys_post * sys_post
@ -92,6 +92,8 @@ public class SysPost extends BaseEntity {
.status(sysPostSaveModel.getStatus()) .status(sysPostSaveModel.getStatus())
.flag(sysPostSaveModel.isFlag()) .flag(sysPostSaveModel.isFlag())
.createBy(sysPostSaveModel.getCreateBy()) .createBy(sysPostSaveModel.getCreateBy())
.createTime(new Date())
.remark(sysPostSaveModel.getRemark())
.build(); .build();
} }
public static SysPost editBuild(SysPostEditModel sysPostEditModel) { public static SysPost editBuild(SysPostEditModel sysPostEditModel) {
@ -102,7 +104,9 @@ public class SysPost extends BaseEntity {
.postSort(sysPostEditModel.getPostSort()) .postSort(sysPostEditModel.getPostSort())
.status(sysPostEditModel.getStatus()) .status(sysPostEditModel.getStatus())
.flag(sysPostEditModel.isFlag()) .flag(sysPostEditModel.isFlag())
.createBy(sysPostEditModel.getUpdateBy()) .updateBy(sysPostEditModel.getUpdateBy())
.updateTime(new Date())
.remark(sysPostEditModel.getRemark())
.build(); .build();
} }
} }

View File

@ -59,6 +59,11 @@ public class SysPostEditModel {
*/ */
private String updateBy; private String updateBy;
/**
*
*/
private String remark;
public static SysPostEditModel editBuild(SysPostEditReq sysPostEditReq) { public static SysPostEditModel editBuild(SysPostEditReq sysPostEditReq) {
return SysPostEditModel.builder() return SysPostEditModel.builder()
.postId(sysPostEditReq.getPostId()) .postId(sysPostEditReq.getPostId())
@ -68,6 +73,7 @@ public class SysPostEditModel {
.status(sysPostEditReq.getStatus()) .status(sysPostEditReq.getStatus())
.flag(sysPostEditReq.isFlag()) .flag(sysPostEditReq.isFlag())
.updateBy(sysPostEditReq.getUpdateBy()) .updateBy(sysPostEditReq.getUpdateBy())
.remark(sysPostEditReq.getRemark())
.build(); .build();
} }
} }

View File

@ -1,9 +1,12 @@
package com.muyu.system.domain.model; package com.muyu.system.domain.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel;
import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysPost;
import lombok.*; import lombok.*;
import lombok.experimental.SuperBuilder; /** import lombok.experimental.SuperBuilder;
import java.util.Date; /**
* *
* @author: AoCi Tian * @author: AoCi Tian
* @create: 2025-02-23 19:31 * @create: 2025-02-23 19:31
@ -51,6 +54,12 @@ public class SysPostListModel {
@Builder.Default @Builder.Default
private boolean flag = false; private boolean flag = false;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
public static SysPostListModel listBuild(SysPost sysPost) { public static SysPostListModel listBuild(SysPost sysPost) {
return SysPostListModel.builder() return SysPostListModel.builder()
.postId(sysPost.getPostId()) .postId(sysPost.getPostId())
@ -59,6 +68,7 @@ public class SysPostListModel {
.postSort(sysPost.getPostSort()) .postSort(sysPost.getPostSort())
.status(sysPost.getStatus()) .status(sysPost.getStatus())
.flag(sysPost.isFlag()) .flag(sysPost.isFlag())
.createTime(sysPost.getCreateTime())
.build(); .build();
} }
} }

View File

@ -53,6 +53,12 @@ public class SysPostMyInfoModel {
@Builder.Default @Builder.Default
private boolean flag = false; private boolean flag = false;
/**
*
*/
@Excel(name = "备注")
private String remark;
public static SysPostMyInfoModel build(SysPost sysPost) { public static SysPostMyInfoModel build(SysPost sysPost) {
return SysPostMyInfoModel.builder() return SysPostMyInfoModel.builder()
.postId(sysPost.getPostId()) .postId(sysPost.getPostId())
@ -60,6 +66,7 @@ public class SysPostMyInfoModel {
.postName(sysPost.getPostName()) .postName(sysPost.getPostName())
.postSort(sysPost.getPostSort()) .postSort(sysPost.getPostSort())
.status(sysPost.getStatus()) .status(sysPost.getStatus())
.remark(sysPost.getRemark())
.flag(sysPost.isFlag()) .flag(sysPost.isFlag())
.build(); .build();
} }

View File

@ -59,6 +59,11 @@ public class SysPostSaveModel {
*/ */
private String createBy; private String createBy;
/**
*
*/
private String remark;
public static SysPostSaveModel saveBuild(SysPostSaveReq sysPostSaveReq) { public static SysPostSaveModel saveBuild(SysPostSaveReq sysPostSaveReq) {
return SysPostSaveModel.builder() return SysPostSaveModel.builder()
.postId(sysPostSaveReq.getPostId()) .postId(sysPostSaveReq.getPostId())
@ -68,6 +73,7 @@ public class SysPostSaveModel {
.status(sysPostSaveReq.getStatus()) .status(sysPostSaveReq.getStatus())
.flag(sysPostSaveReq.isFlag()) .flag(sysPostSaveReq.isFlag())
.createBy(sysPostSaveReq.getCreateBy()) .createBy(sysPostSaveReq.getCreateBy())
.remark(sysPostSaveReq.getRemark())
.build(); .build();
} }
} }

View File

@ -58,15 +58,9 @@ public class SysPostEditReq {
*/ */
private String updateBy; private String updateBy;
public static SysPostEditReq editBuild(SysPost sysPost) { /**
return SysPostEditReq.builder() *
.postId(sysPost.getPostId()) */
.postCode(sysPost.getPostCode()) private String remark;
.postName(sysPost.getPostName())
.postSort(sysPost.getPostSort())
.status(sysPost.getStatus())
.flag(sysPost.isFlag())
.updateBy(sysPost.getUpdateBy())
.build();
}
} }

View File

@ -61,15 +61,9 @@ public class SysPostSaveReq {
*/ */
private String createBy; private String createBy;
public static SysPostSaveReq saveBuild(SysPost sysPost) { /**
return SysPostSaveReq.builder() *
.postId(sysPost.getPostId()) */
.postCode(sysPost.getPostCode()) private String remark;
.postName(sysPost.getPostName())
.postSort(sysPost.getPostSort())
.status(sysPost.getStatus())
.flag(sysPost.isFlag())
.createBy(sysPost.getCreateBy())
.build();
}
} }

View File

@ -1,5 +1,6 @@
package com.muyu.system.domain.resp; package com.muyu.system.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.core.web.page.PageQueryModel;
import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysPost;
@ -9,6 +10,7 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List; /** import java.util.List; /**
* *
@ -58,6 +60,12 @@ public class SysPostListResp {
@Builder.Default @Builder.Default
private boolean flag = false; private boolean flag = false;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
public static SysPostListResp listBuild(SysPostListModel sysPostListModel) { public static SysPostListResp listBuild(SysPostListModel sysPostListModel) {
return SysPostListResp.builder() return SysPostListResp.builder()
.postId(sysPostListModel.getPostId()) .postId(sysPostListModel.getPostId())
@ -66,6 +74,7 @@ public class SysPostListResp {
.postSort(sysPostListModel.getPostSort()) .postSort(sysPostListModel.getPostSort())
.status(sysPostListModel.getStatus()) .status(sysPostListModel.getStatus())
.flag(sysPostListModel.isFlag()) .flag(sysPostListModel.isFlag())
.createTime(sysPostListModel.getCreateTime())
.build(); .build();
} }
} }

View File

@ -0,0 +1,73 @@
package com.muyu.system.domain.resp;
import com.muyu.common.core.annotation.Excel;
import com.muyu.system.domain.model.SysPostMyInfoModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor; /**
*
* @author: AoCi Tian
* @create: 2025-02-23 20:52
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SysPostMyInfoResp {
private static final long serialVersionUID = 1L;
/**
*
*/
@Excel(name = "岗位序号", cellType = Excel.ColumnType.NUMERIC)
private Long postId;
/**
*
*/
@Excel(name = "岗位编码")
private String postCode;
/**
*
*/
@Excel(name = "岗位名称")
private String postName;
/**
*
*/
@Excel(name = "岗位排序")
private Integer postSort;
/**
* 0 1
*/
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
/**
*
*/
@Builder.Default
private boolean flag = false;
/**
*
*/
@Excel(name = "备注")
private String remark;
public static SysPostMyInfoResp messageBuild(SysPostMyInfoModel sysPostMyInfoModel) {
return SysPostMyInfoResp.builder()
.postId(sysPostMyInfoModel.getPostId())
.postCode(sysPostMyInfoModel.getPostCode())
.postName(sysPostMyInfoModel.getPostName())
.postSort(sysPostMyInfoModel.getPostSort())
.status(sysPostMyInfoModel.getStatus())
.remark(sysPostMyInfoModel.getRemark())
.flag(sysPostMyInfoModel.isFlag())
.build();
}
}

View File

@ -160,7 +160,7 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
@Override @Override
public void deletePostByIds (List<Long> postIds) { public void deletePostByIds (List<Long> postIds) {
for (Long postId : postIds) { for (Long postId : postIds) {
SysPost post = selectPostById(postId); SysPostMyInfoModel post = selectPostById (postId);
if (countUserPostById(postId) > 0) { if (countUserPostById(postId) > 0) {
throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName()));
} }