wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'

Browse Source 
feat(REQ-3282): JobDTO 返回值调整

See merge request universal/infrastructure/backend/orgmanax!51
This commit is contained in:
宋远伦 2024-12-26 11:27:43 +00:00
commit 3ac583690b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobDTO.java
View File

@ -3,9 +3,6 @@ package cn.axzo.orgmanax.dto.job.dto;
import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.CODE_KEY;
import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.OLD_CONFIG;
import cn.axzo.orgmanax.dto.job.enums.OrgJobFlagEnum;
import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum;
import cn.axzo.orgmanax.dto.job.enums.VisibilityEnum;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Sets;
@ -51,8 +48,9 @@ public class OrgJobDTO implements Serializable {
/**
* 可见性: SHOW-可见,HIDE-隐藏
* @see cn.axzo.orgmanax.dto.job.enums.VisibilityEnum
*/
private VisibilityEnum visible;
private String visible;
/**
* 是否为默认岗的标识: 0-非默认,1-默认
@ -66,12 +64,14 @@ public class OrgJobDTO implements Serializable {
/**
* 岗位类型：SYSTEM - 系统，CUSTOM - 自定义
* @see cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum
*/
private OrgJobTypeEnum type;
private String type;
/**
* 岗位标签：SYSTEM - 系统岗，BUSINESS - 业务岗
* @see cn.axzo.orgmanax.dto.job.enums.OrgJobFlagEnum
*/
private OrgJobFlagEnum flag;
private String flag;
/**
* 单位id,自定义类型时该值才有意义

4
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobGroupDTO.java
View File

@ -1,6 +1,5 @@
package cn.axzo.orgmanax.dto.job.dto;
import cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum;
import com.alibaba.fastjson.JSON;
import java.io.Serializable;
import java.util.Date;
@ -59,8 +58,9 @@ public class OrgJobGroupDTO implements Serializable {
private Integer priority;
/**
* 分组标识，其与工作台类型及参建类型在后端进行映射
* @see cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum
*/
private OrgJobGroupFlagEnum flag;
private String flag;
/**
* 变更人的自然人id
*/