zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main
huangyuxuan 2025-11-06 09:01:23 +08:00
parent 8d8defa78f e43128d16f
commit 169d64bc1d
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java
View File

@ -37,9 +37,13 @@ public class DepartmentAddExe {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean execute(DepartmentAddCmd cmd) { public boolean execute(DepartmentAddCmd cmd) {
DepartmentE examTypeE = new DepartmentE(); DepartmentE examTypeE = new DepartmentE();
/* if(examTypeE.getParentId()==null){ //TODO 父id的值待定
examTypeE.setParentId(AuthContext.getTenantId()); // if(examTypeE.getParentId()==null){
}*/ // examTypeE.setParentId(AuthContext.getTenantId());
// }
if(cmd.getCorpinfoId() == null){
cmd.setCorpinfoId(AuthContext.getTenantId());
}
BeanUtils.copyProperties(cmd, examTypeE); BeanUtils.copyProperties(cmd, examTypeE);
Long id = null; Long id = null;
try { try {

39
web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
View File

@ -34,24 +34,35 @@ public class PostUpdateExe {
boolean res = postGateway.update(postE); boolean res = postGateway.update(postE);
// 岗位关联部门 // 岗位关联部门
if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){ // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据
postDepartmentGateway.deletedPostDepartment(postE.getId()); if(res){
List<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds()); if (postUpdateCmd.getSupervisionFlag() == null || postUpdateCmd.getSupervisionFlag() == 0){
if(CollUtil.isNotEmpty(postDepartmentEList)){
res = postDepartmentGateway.addList(postDepartmentEList);
}
}else {
// 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据
if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 0){
postDepartmentGateway.deletedPostDepartment(postE.getId()); postDepartmentGateway.deletedPostDepartment(postE.getId());
} }else if(postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){
if(res && postUpdateCmd.getSupervisionFlag() == null){ // 是监管单位
postDepartmentGateway.deletedPostDepartment(postE.getId()); postDepartmentGateway.deletedPostDepartment(postE.getId());
List<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds());
if(CollUtil.isNotEmpty(postDepartmentEList)){
res = postDepartmentGateway.addList(postDepartmentEList);
}
} }
} }
/**
* // if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){
*/ // postDepartmentGateway.deletedPostDepartment(postE.getId());
// List<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds());
// if(CollUtil.isNotEmpty(postDepartmentEList)){
// res = postDepartmentGateway.addList(postDepartmentEList);
// }
// }else {
// // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据
// if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 0){
// postDepartmentGateway.deletedPostDepartment(postE.getId());
// }
// if(res && postUpdateCmd.getSupervisionFlag() == null){
// postDepartmentGateway.deletedPostDepartment(postE.getId());
// }
// }
if (!res) { if (!res) {
throw new BizException("修改失败"); throw new BizException("修改失败");

1
web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
View File

@ -60,6 +60,7 @@ public class DepartmentQueryExe {
return Collections.emptyList(); return Collections.emptyList();
} }
List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse);
//GBS部门第一次是1
return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList"); return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList");
} }

2
web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java
View File

@ -29,7 +29,7 @@ public class DepartmentAddCmd extends Command {
@NotEmpty(message = "名称不能为空") @NotEmpty(message = "名称不能为空")
private String name; private String name;
@ApiModelProperty(value = "父部门id", name = "parentId", required = true) @ApiModelProperty(value = "父部门id", name = "parentId", required = true)
@NotNull(message = "父部门id不能为空") // @NotNull(message = "父部门id不能为空")
private Long parentId; private Long parentId;
@ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true)