dev:岗位管理

1.必填项修改
2.部门名称删除

web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info.web;
 
 
+import com.alibaba.cola.exception.BizException;
 import com.zcloud.basic.info.api.PostServiceI;
 import com.zcloud.basic.info.dto.*;
 import com.zcloud.basic.info.dto.clientobject.PostCO;
@@ -35,6 +36,10 @@ public class PostController {
     @PostMapping("/save")
     public SingleResponse<PostCO> add(@Validated @RequestBody PostAddCmd cmd) {
         SSOUser ssoUser = AuthContext.getCurrentUser();
+        // 监管端不用校验, 企业端必填
+        if(cmd.getCorpFlag() == 2 && cmd.getSupervisionFlag() == null){
+            throw new BizException("是否监管岗位不能为空");
+        }
         return postService.add(cmd);
     }
 
@@ -74,8 +79,12 @@ public class PostController {
 
     @ApiOperation("修改")
     @PutMapping("/edit")
-    public SingleResponse edit(@Validated @RequestBody PostUpdateCmd postUpdateCmd) {
+    public SingleResponse edit(@Validated @RequestBody PostUpdateCmd cmd) {
-        postService.edit(postUpdateCmd);
+        // 监管端不用校验, 企业端必填
+        if(cmd.getCorpFlag() == 2 && cmd.getSupervisionFlag() == null){
+            throw new BizException("是否监管岗位不能为空");
+        }
+        postService.edit(cmd);
         return SingleResponse.buildSuccess();
     }
 }

web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java

@@ -24,16 +24,11 @@ public class PostAddCmd extends Command {
     @NotNull(message = "部门id不能为空")
     private Long departmentId;
 
-    @ApiModelProperty(value = "部门名称", name = "departmentName", required = true)
-    @NotEmpty(message = "部门名称不能为空")
-    private String departmentName;
-
     @ApiModelProperty(value = "岗位名称", name = "postName", required = true)
     @NotEmpty(message = "岗位名称不能为空")
     private String postName;
 
-    @ApiModelProperty(value = "岗位职责", name = "remarks", required = true)
+    @ApiModelProperty(value = "岗位职责", name = "remarks")
-    @NotEmpty(message = "岗位职责不能为空")
     private String remarks;
 
 //    @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true)
@@ -48,11 +43,14 @@ public class PostAddCmd extends Command {
     @NotEmpty(message = "企业名称不能为空")
     private String corpinfoName;
 
-    @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag", required = true)
+    @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag")
-    @NotNull(message = "是否监管岗位 0-否, 1-是,不能为空")
     private Integer supervisionFlag;
 
-    @ApiModelProperty(value = "岗位 部门权限", name = "departmentIds")
+    @ApiModelProperty(value = "岗位-部门权限", name = "departmentIds")
     private Long[] departmentIds;
+
+    @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag")
+    @NotNull(message = "监管端/企业端标识不能为空")
+    private Integer corpFlag;
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java

@@ -23,35 +23,38 @@ public class PostUpdateCmd extends Command {
     @ApiModelProperty(value = "主键", name = "id", required = true)
     @NotNull(message = "主键不能为空")
     private Long id;
-    @ApiModelProperty(value = "业务主键id", name = "postId", required = true)
+
-    @NotEmpty(message = "业务主键id不能为空")
-    private String postId;
     @ApiModelProperty(value = "部门id", name = "departmentId", required = true)
     @NotNull(message = "部门id不能为空")
     private Long departmentId;
-    @ApiModelProperty(value = "部门名称", name = "departmentName", required = true)
+
-    @NotEmpty(message = "部门名称不能为空")
-    private String departmentName;
     @ApiModelProperty(value = "岗位名称", name = "postName", required = true)
     @NotEmpty(message = "岗位名称不能为空")
     private String postName;
-    @ApiModelProperty(value = "岗位职责", name = "remarks", required = true)
+
-    @NotEmpty(message = "岗位职责不能为空")
+    @ApiModelProperty(value = "岗位职责", name = "remarks")
     private String remarks;
+
 //    @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true)
 //    @NotNull(message = "状态 1-启用, 2-禁用不能为空")
 //    private Integer status;
+
     @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
     @NotNull(message = "企业id不能为空")
     private Long corpinfoId;
+
     @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true)
     @NotEmpty(message = "企业名称不能为空")
     private String corpinfoName;
-    @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag", required = true)
+
-    @NotNull(message = "是否监管岗位 0-否, 1-是,不能为空")
+    @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag")
     private Integer supervisionFlag;
 
     @ApiModelProperty(value = "岗位 部门权限", name = "departmentIds")
     private Long[] departmentIds;
+
+    @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag")
+    @NotNull(message = "监管端/企业端标识不能为空")
+    private Integer corpFlag;
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java

@@ -20,9 +20,6 @@ public class PostCO extends ClientObject {
     //主键
     @ApiModelProperty(value = "主键")
     private Long id;
-    //业务主键id
-    @ApiModelProperty(value = "业务主键id")
-    private String postId;
     //部门id
     @ApiModelProperty(value = "部门id")
     private Long departmentId;
@@ -32,6 +29,9 @@ public class PostCO extends ClientObject {
     //岗位名称
     @ApiModelProperty(value = "岗位名称")
     private String postName;
+    // 岗位职责
+    @ApiModelProperty(value = "岗位职责")
+    private String remarks;
     //状态 1-启用, 2-禁用
 //    @ApiModelProperty(value = "状态 1-启用, 2-禁用")
 //    private Integer status;
@@ -44,7 +44,6 @@ public class PostCO extends ClientObject {
     //是否监管岗位 1-是, 2-不是
     @ApiModelProperty(value = "是否监管岗位0-否, 1-是")
     private Integer supervisionFlag;
-
     @ApiModelProperty(value = "监管部门数据权限-部门列表")
     private List<PostDepartmentCO> departmentList;
 
@@ -71,9 +70,6 @@ public class PostCO extends ClientObject {
     @ApiModelProperty(value = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime updateTime;
-    //描述
-    @ApiModelProperty(value = "岗位职责")
-    private String remarks;
     //是否删除
     @ApiModelProperty(value = "是否删除")
     private String deleteEnum;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java

@@ -23,8 +23,6 @@ public class PostE extends BaseE {
     private String postId;
     //部门id
     private Long departmentId;
-    //部门名称
-    private String departmentName;
     //岗位名称
     private String postName;
     //岗位职责

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java

@@ -24,9 +24,6 @@ public class PostDO extends BaseDO {
     //部门id
     @ApiModelProperty(value = "部门id")
     private Long departmentId;
-    //部门名称
-    @ApiModelProperty(value = "部门名称")
-    private String departmentName;
     //岗位名称
     @ApiModelProperty(value = "岗位名称")
     private String postName;