From 8e98b09f723e56dc6223560145c4c81138010e98 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 3 Nov 2025 16:45:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java | 6 +++--- .../main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java | 6 +++--- .../java/com/zcloud/basic/info/dto/clientobject/PostCO.java | 4 ++-- .../main/java/com/zcloud/basic/info/domain/model/PostE.java | 2 +- .../zcloud/basic/info/persistence/dataobject/PostDO.java | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java index 3116d69..4ed2c8f 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java @@ -36,9 +36,9 @@ public class PostAddCmd extends Command { @NotEmpty(message = "岗位职责不能为空") private String postDuty; - @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) - @NotNull(message = "状态 1-启用, 2-禁用不能为空") - private Integer status; +// @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不能为空") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java index 8ae0f28..dbdbd8e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java @@ -38,9 +38,9 @@ public class PostUpdateCmd extends Command { @ApiModelProperty(value = "岗位职责", name = "postDuty", required = true) @NotEmpty(message = "岗位职责不能为空") private String postDuty; - @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) - @NotNull(message = "状态 1-启用, 2-禁用不能为空") - private Integer status; +// @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; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java index 402bb52..9b16590 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java @@ -36,8 +36,8 @@ public class PostCO extends ClientObject { @ApiModelProperty(value = "岗位职责") private String postDuty; //状态 1-启用, 2-禁用 - @ApiModelProperty(value = "状态 1-启用, 2-禁用") - private Integer status; +// @ApiModelProperty(value = "状态 1-启用, 2-禁用") +// private Integer status; //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java index 23351f4..2ffd98c 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java @@ -30,7 +30,7 @@ public class PostE extends BaseE { //岗位职责 private String postDuty; //状态 1-启用, 2-禁用 - private Integer status; +// private Integer status; //企业id private Long corpinfoId; //企业名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java index 5c6dd72..04d7080 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java @@ -34,8 +34,8 @@ public class PostDO extends BaseDO { @ApiModelProperty(value = "岗位职责") private String postDuty; //状态 1-启用, 2-禁用 - @ApiModelProperty(value = "状态 1-启用, 2-禁用") - private Integer status; +// @ApiModelProperty(value = "状态 1-启用, 2-禁用") +// private Integer status; //企业id @ApiModelProperty(value = "企业id") private Long corpinfoId; From 1ec2d9f1fb71049cf1581de9c581e2c895fd74c3 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 3 Nov 2025 16:56:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=9B=91=E7=AE=A1=E5=8D=95=E4=BD=8D=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=200-=E5=90=A6,=201-=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java | 4 ++-- .../main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java | 4 ++-- .../java/com/zcloud/basic/info/dto/clientobject/PostCO.java | 2 +- .../main/java/com/zcloud/basic/info/domain/model/PostE.java | 2 +- .../zcloud/basic/info/persistence/dataobject/PostDO.java | 2 +- .../basic/info/persistence/dataobject/PostDepartmentDO.java | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java index 4ed2c8f..bb31ed6 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java @@ -48,8 +48,8 @@ public class PostAddCmd extends Command { @NotEmpty(message = "企业名称不能为空") private String corpinfoName; - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是", name = "supervisionFlag", required = true) - @NotNull(message = "是否监管岗位 1-是, 2-不是,不能为空") + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag", required = true) + @NotNull(message = "是否监管岗位 0-否, 1-是,不能为空") private Integer supervisionFlag; @ApiModelProperty(value = "岗位 部门权限", name = "departmentIds") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java index dbdbd8e..b27aab9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java @@ -47,8 +47,8 @@ public class PostUpdateCmd extends Command { @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true) @NotEmpty(message = "企业名称不能为空") private String corpinfoName; - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是", name = "supervisionFlag", required = true) - @NotNull(message = "是否监管岗位 1-是, 2-不是,不能为空") + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag", required = true) + @NotNull(message = "是否监管岗位 0-否, 1-是,不能为空") private Integer supervisionFlag; @ApiModelProperty(value = "岗位 部门权限", name = "departmentIds") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java index 9b16590..12b12f4 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java @@ -45,7 +45,7 @@ public class PostCO extends ClientObject { @ApiModelProperty(value = "企业名称") private String corpinfoName; //是否监管岗位 1-是, 2-不是 - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是") + @ApiModelProperty(value = "是否监管岗位0-否, 1-是") private Integer supervisionFlag; @ApiModelProperty(value = "监管部门数据权限-部门列表") diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java index 2ffd98c..56e202a 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java @@ -35,7 +35,7 @@ public class PostE extends BaseE { private Long corpinfoId; //企业名称 private String corpinfoName; - //是否监管岗位 1-是, 2-不是 + //是否监管岗位 0-否, 1-是 private Integer supervisionFlag; // 添加关联部门行为 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java index 04d7080..ba507c3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java @@ -43,7 +43,7 @@ public class PostDO extends BaseDO { @ApiModelProperty(value = "企业名称") private String corpinfoName; //是否监管岗位 1-是, 2-不是 - @ApiModelProperty(value = "是否监管岗位 1-是, 2-不是") + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是") private Integer supervisionFlag; public PostDO(String postId) { diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java index 007fc71..c930277 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDepartmentDO.java @@ -19,13 +19,13 @@ import lombok.NoArgsConstructor; public class PostDepartmentDO extends BaseDO { //业务主键id @ApiModelProperty(value = "业务主键id") -private String postDepartmentId; + private String postDepartmentId; //岗位id @ApiModelProperty(value = "岗位id") -private Long postId; + private Long postId; //部门id @ApiModelProperty(value = "部门id") -private Long departmentId; + private Long departmentId; public PostDepartmentDO(String postDepartmentId) { this.postDepartmentId = postDepartmentId; From d98306236e221f2176801e18f2c08ed62621f6a0 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 3 Nov 2025 17:02:59 +0800 Subject: [PATCH 3/6] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E8=81=8C=E8=B4=A3=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java | 4 ++-- .../main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java | 4 ++-- .../java/com/zcloud/basic/info/dto/clientobject/PostCO.java | 5 +---- .../main/java/com/zcloud/basic/info/domain/model/PostE.java | 2 +- .../com/zcloud/basic/info/persistence/dataobject/PostDO.java | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java index bb31ed6..0bd62e1 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java @@ -32,9 +32,9 @@ public class PostAddCmd extends Command { @NotEmpty(message = "岗位名称不能为空") private String postName; - @ApiModelProperty(value = "岗位职责", name = "postDuty", required = true) + @ApiModelProperty(value = "岗位职责", name = "remarks", required = true) @NotEmpty(message = "岗位职责不能为空") - private String postDuty; + private String remarks; // @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) // @NotNull(message = "状态 1-启用, 2-禁用不能为空") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java index b27aab9..e9994ab 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java @@ -35,9 +35,9 @@ public class PostUpdateCmd extends Command { @ApiModelProperty(value = "岗位名称", name = "postName", required = true) @NotEmpty(message = "岗位名称不能为空") private String postName; - @ApiModelProperty(value = "岗位职责", name = "postDuty", required = true) + @ApiModelProperty(value = "岗位职责", name = "remarks", required = true) @NotEmpty(message = "岗位职责不能为空") - private String postDuty; + private String remarks; // @ApiModelProperty(value = "状态 1-启用, 2-禁用", name = "status", required = true) // @NotNull(message = "状态 1-启用, 2-禁用不能为空") // private Integer status; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java index 12b12f4..3b6700f 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java @@ -32,9 +32,6 @@ public class PostCO extends ClientObject { //岗位名称 @ApiModelProperty(value = "岗位名称") private String postName; - //岗位职责 - @ApiModelProperty(value = "岗位职责") - private String postDuty; //状态 1-启用, 2-禁用 // @ApiModelProperty(value = "状态 1-启用, 2-禁用") // private Integer status; @@ -75,7 +72,7 @@ public class PostCO extends ClientObject { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime updateTime; //描述 - @ApiModelProperty(value = "描述") + @ApiModelProperty(value = "岗位职责") private String remarks; //是否删除 @ApiModelProperty(value = "是否删除") diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java index 56e202a..9f77b9e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java @@ -28,7 +28,7 @@ public class PostE extends BaseE { //岗位名称 private String postName; //岗位职责 - private String postDuty; + private String remarks; //状态 1-启用, 2-禁用 // private Integer status; //企业id diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java index ba507c3..63cb6c2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java @@ -32,7 +32,7 @@ public class PostDO extends BaseDO { private String postName; //岗位职责 @ApiModelProperty(value = "岗位职责") - private String postDuty; + private String remarks; //状态 1-启用, 2-禁用 // @ApiModelProperty(value = "状态 1-启用, 2-禁用") // private Integer status; From 504f23ab201d710b2f5a19300e57605fa39073ae Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 3 Nov 2025 17:26:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?1.=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BF=AE=E6=94=B9=202.=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=90=8D=E7=A7=B0=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/web/PostController.java | 13 +++++++++-- .../com/zcloud/basic/info/dto/PostAddCmd.java | 16 ++++++------- .../zcloud/basic/info/dto/PostUpdateCmd.java | 23 +++++++++++-------- .../basic/info/dto/clientobject/PostCO.java | 10 +++----- .../zcloud/basic/info/domain/model/PostE.java | 2 -- .../info/persistence/dataobject/PostDO.java | 3 --- 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java index ef70688..3f7ea97 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java +++ b/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 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) { - postService.edit(postUpdateCmd); + public SingleResponse edit(@Validated @RequestBody PostUpdateCmd cmd) { + // 监管端不用校验, 企业端必填 + if(cmd.getCorpFlag() == 2 && cmd.getSupervisionFlag() == null){ + throw new BizException("是否监管岗位不能为空"); + } + postService.edit(cmd); return SingleResponse.buildSuccess(); } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java index 0bd62e1..5666f9b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostAddCmd.java +++ b/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) - @NotEmpty(message = "岗位职责不能为空") + @ApiModelProperty(value = "岗位职责", name = "remarks") 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) - @NotNull(message = "是否监管岗位 0-否, 1-是,不能为空") + @ApiModelProperty(value = "是否监管岗位 0-否, 1-是", name = "supervisionFlag") 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; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java index e9994ab..a717c20 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostUpdateCmd.java +++ b/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; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java index 3b6700f..352248e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/PostCO.java +++ b/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 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; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java index 9f77b9e..9e3330e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java +++ b/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; //岗位职责 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java index 63cb6c2..adbdb61 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/PostDO.java +++ b/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; From 329cc2f053bbfe7718b08c164f596229184ba15c Mon Sep 17 00:00:00 2001 From: SondonYong Date: Tue, 4 Nov 2025 09:19:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/command/query/PostQueryExe.java | 51 ++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java index bac2e42..bc4a966 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java @@ -2,15 +2,19 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.MultiResponse; +import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; import com.zcloud.basic.info.command.convertor.PostCoConvertor; import com.zcloud.basic.info.command.convertor.PostDepartmentCoConvertor; import com.zcloud.basic.info.dto.PostDepartmentPageQry; import com.zcloud.basic.info.dto.PostListQry; import com.zcloud.basic.info.dto.PostPageQry; +import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.PostCO; import com.zcloud.basic.info.dto.clientobject.PostDepartmentCO; +import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.dataobject.PostDepartmentDO; +import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.basic.info.persistence.repository.PostDepartmentRepository; import com.zcloud.basic.info.persistence.repository.PostRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; @@ -20,6 +24,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.beans.BeanUtils; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,6 +42,8 @@ import java.util.stream.Collectors; public class PostQueryExe { private final PostRepository postRepository; private final PostDepartmentRepository postDepartmentRepository; + private final DepartmentRepository departmentRepository; + private final DepartmentCoConvertor departmentCoConvertor; private final PostCoConvertor postCoConvertor; private final PostDepartmentCoConvertor postDepartmentCoConvertor; @@ -49,8 +56,30 @@ public class PostQueryExe { public PageResponse execute(PostPageQry postPageQry) { Map params = PageQueryHelper.toHashMap(postPageQry); PageResponse pageResponse = postRepository.listPage(params); - List examCenterCOS = postCoConvertor.converDOsToCOs(pageResponse.getData()); - return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + + Long[] departmentIds = pageResponse.getData().stream().map(PostDO::getDepartmentId).toArray(Long[]::new); + List departmentDOList = departmentRepository.listByIds(Arrays.asList(departmentIds)); + + // Map<部门id, 部门名称> + Map departmentMap = new HashMap<>(); + if(CollUtil.isNotEmpty(departmentDOList)) { + List departmentCOList = departmentCoConvertor.converDOsToCOs(departmentDOList); + departmentMap = departmentCOList.stream().collect(Collectors.toMap( + DepartmentCO::getId, + DepartmentCO::getName + )); + } + + List postCOList = postCoConvertor.converDOsToCOs(pageResponse.getData()); + if(CollUtil.isNotEmpty(postCOList)) { + for (PostCO postCO : postCOList) { + if(CollUtil.isNotEmpty(departmentMap)) { + postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); + } + } + } + + return PageResponse.of(postCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } public MultiResponse execute(PostListQry qry) { @@ -62,8 +91,10 @@ public class PostQueryExe { return new MultiResponse<>(); } Long[] postIds = postMRDO.getData().stream().map(PostDO::getId).toArray(Long[]::new); + Long[] departmentIds = postMRDO.getData().stream().map(PostDO::getDepartmentId).toArray(Long[]::new); // 岗位部门集合 List postDepartmentDOList = postDepartmentRepository.list(postIds); + List departmentDOList = departmentRepository.listByIds(Arrays.asList(departmentIds)); // Map<岗位id, List<岗位部门对象>> Map> postDepartmentMap = new HashMap<>(); @@ -71,6 +102,15 @@ public class PostQueryExe { List postDepartmentCOList = postDepartmentCoConvertor.converDOsToCOs(postDepartmentDOList); postDepartmentMap = postDepartmentCOList.stream().collect(Collectors.groupingBy(PostDepartmentCO::getPostId)); } + // Map<部门id, 部门名称> + Map departmentMap = new HashMap<>(); + if(CollUtil.isNotEmpty(departmentDOList)) { + List departmentCOList = departmentCoConvertor.converDOsToCOs(departmentDOList); + departmentMap = departmentCOList.stream().collect(Collectors.toMap( + DepartmentCO::getId, + DepartmentCO::getName + )); + } // 赋值 List postDOList = postMRDO.getData(); @@ -80,6 +120,9 @@ public class PostQueryExe { if(CollUtil.isNotEmpty(postDepartmentMap) && CollUtil.isNotEmpty(postDepartmentMap.get(postCO.getId()))) { postCO.setDepartmentList(postDepartmentMap.get(postCO.getId())); } + if(CollUtil.isNotEmpty(departmentMap)) { + postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); + } } } @@ -96,6 +139,10 @@ public class PostQueryExe { BeanUtils.copyProperties(postDO.getData(), co); postCO.setData(co); + // 查询部门名称 + DepartmentDO departmentDO = departmentRepository.getById(postDO.getData().getDepartmentId()); + postCO.getData().setDepartmentName(departmentDO.getName()); + // 岗位-部门权限关联代码 if(co.getSupervisionFlag() == 1){ PostDepartmentPageQry qry = new PostDepartmentPageQry(); From 314c4929adaedca87585f498868b5bb6c921f373 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Tue, 4 Nov 2025 09:27:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/SysUserController.java | 3 ++ .../basic/info/command/SysUserAddExe.java | 2 - .../basic/info/dto/SysCorpUserAddCmd.java | 6 +-- .../zcloud/basic/info/dto/SysUserAddCmd.java | 49 +++++++------------ 4 files changed, 23 insertions(+), 37 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java index 97d8529..6fb39f8 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java @@ -78,6 +78,9 @@ public class SysUserController { Map collect = data.stream().collect(Collectors.toMap(RoleCO::getRoleName, RoleCO::getRoleTypeEnum)); facadeUserAddCmd.setRoleTypeEnum("2".equals(cmd.getUserType()) ? collect.get("分公司主账号") : collect.get("相关方主账号")); // todo 新增用户 GBS不适配功能 + + // todo 新增二级租户 + } catch (Exception e) { // 有重复的角色名称 抛异常 联系管理员 throw new BizException("监测到角色名称重复，请联系管理员。"); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java index b24145f..d4e5042 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java @@ -50,8 +50,6 @@ public class SysUserAddExe { sysUserDO.setName(cmd.getName()); sysUserDO.setUsername(cmd.getName()); sysUserDO.setUserType(cmd.getUserType()); - sysUserDO.setCorpinfoId(cmd.getCorpinfoId()); - sysUserDO.setDepartmentId(cmd.getDepartmentId()); sysUserDO.setMainCorp(1); sysUserRepository.save(sysUserDO); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java index bc971ae..1840ca6 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java @@ -30,11 +30,9 @@ public class SysCorpUserAddCmd extends Command { @ApiModelProperty(value = "姓名", name = "name", required = true) @NotEmpty(message = "姓名不能为空") private String name; - @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) - @NotNull(message = "企业id不能为空") + // @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) private Long corpinfoId; - @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotNull(message = "部门id不能为空") + // @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private Long departmentId; @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true) @NotEmpty(message = "1监管2企业3相关方不能为空") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java index 7119d37..75f77a9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -24,21 +25,28 @@ public class SysUserAddCmd extends Command { @ApiModelProperty(value = "用户名", name = "username", required = true) @NotEmpty(message = "用户名不能为空") private String username; - @ApiModelProperty(value = "密码", name = "password", required = true) - @NotEmpty(message = "密码不能为空") - private String password; @ApiModelProperty(value = "姓名", name = "name", required = true) @NotEmpty(message = "姓名不能为空") private String name; - @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) - @NotEmpty(message = "企业不能为空") - private String corpinfoId; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) @NotEmpty(message = "部门id不能为空") private String departmentId; @ApiModelProperty(value = "角色id", name = "roleIds", required = true) @NotEmpty(message = "角色id不能为空") private String roleIds; + @ApiModelProperty(value = "岗位", name = "postId", required = true) + @NotNull(message = "岗位不能为空") + private Long postId; + @ApiModelProperty(value = "身份证号", name = "userIdCard", required = true) + @NotEmpty(message = "身份证号不能为空") + private String userIdCard; + @ApiModelProperty(value = "民族", name = "nation", required = true) + @NotEmpty(message = "民族不能为空") + private String nation; + @ApiModelProperty(value = "性别（0男1女）", name = "sex", required = true) + @NotEmpty(message = "性别（0男1女）不能为空") + private String sex; + @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true) @NotEmpty(message = "1监管2企业3相关方不能为空") private String userType; @@ -54,18 +62,11 @@ public class SysUserAddCmd extends Command { @ApiModelProperty(value = "电话", name = "phone", required = true) @NotEmpty(message = "电话不能为空") private String phone; - @ApiModelProperty(value = "性别（0男1女）", name = "sex", required = true) - @NotEmpty(message = "性别（0男1女）不能为空") - private String sex; - @ApiModelProperty(value = "民族", name = "nation", required = true) - @NotEmpty(message = "民族不能为空") - private String nation; + @ApiModelProperty(value = "政治面貌", name = "politicalOutlook", required = true) @NotEmpty(message = "政治面貌不能为空") private String politicalOutlook; - @ApiModelProperty(value = "身份证号", name = "userIdCard", required = true) - @NotEmpty(message = "身份证号不能为空") - private String userIdCard; + @ApiModelProperty(value = "出生年月", name = "dateOfBirth", required = true) @NotEmpty(message = "出生年月不能为空") private String dateOfBirth; @@ -111,24 +112,10 @@ public class SysUserAddCmd extends Command { @ApiModelProperty(value = "职称", name = "title", required = true) @NotEmpty(message = "职称不能为空") private String title; - @ApiModelProperty(value = "岗位", name = "postId", required = true) - @NotEmpty(message = "岗位不能为空") - private String postId; + @ApiModelProperty(value = "人员在部门中的排序", name = "sort", required = true) - @NotEmpty(message = "人员在部门中的排序不能为空") + @NotNull(message = "人员在部门中的排序不能为空") private Integer sort; - @ApiModelProperty(value = "所属省", name = "province", required = true) - @NotEmpty(message = "所属省不能为空") - private String province; - @ApiModelProperty(value = "所属市", name = "city", required = true) - @NotEmpty(message = "所属市不能为空") - private String city; - @ApiModelProperty(value = "所属区县", name = "country", required = true) - @NotEmpty(message = "所属区县不能为空") - private String country; - @ApiModelProperty(value = "所属乡镇", name = "village", required = true) - @NotEmpty(message = "所属乡镇不能为空") - private String village; private Long uid; }