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

feat(REQ-3282): 岗位接口出参调整

See merge request universal/infrastructure/backend/orgmanax!31

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

@@ -9,6 +9,7 @@ import cn.axzo.orgmanax.dto.job.enums.VisibilityEnum;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Sets;
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -16,17 +17,17 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrgJobDTO {
+public class OrgJobDTO implements Serializable {
 
     /**
      * 主键

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

@@ -2,11 +2,12 @@ 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;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @description 岗位分组表
@@ -15,10 +16,10 @@ import lombok.NoArgsConstructor;
  * @date 2024/9/9
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrgJobGroupDTO {
+public class OrgJobGroupDTO implements Serializable {
 
     /**
      * 主键

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobGroupRelationDTO.java

@@ -1,11 +1,12 @@
 package cn.axzo.orgmanax.dto.job.dto;
 
 import com.alibaba.fastjson.JSON;
+import java.io.Serializable;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @description 岗位与分组的关系表
@@ -14,10 +15,10 @@ import lombok.NoArgsConstructor;
  * @date 2024/9/9
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrgJobGroupRelationDTO {
+public class OrgJobGroupRelationDTO implements Serializable {
 
     /**
      * 主键

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobGroupRelationHistoryDTO.java

@@ -1,24 +1,25 @@
 package cn.axzo.orgmanax.dto.job.dto;
 
 import com.alibaba.fastjson.JSON;
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
- * @description 岗位与分组的关系历史表
  * @author luofu
  * @version 1.0
+ * @description 岗位与分组的关系历史表
  * @date 2024/9/9
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrgJobGroupRelationHistoryDTO {
+public class OrgJobGroupRelationHistoryDTO implements Serializable {
 
     /**
      * 主键

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobHistoryDTO.java

@@ -3,23 +3,24 @@ package cn.axzo.orgmanax.dto.job.dto;
 import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import java.io.Serializable;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
- * @description 岗位变更历史表
  * @author luofu
  * @version 1.0
+ * @description 岗位变更历史表
  * @date 2024/9/9
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrgJobHistoryDTO {
+public class OrgJobHistoryDTO implements Serializable {
 
     /**
      * 主键ID

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/RoleDTO.java

@@ -1,16 +1,17 @@
 package cn.axzo.orgmanax.dto.job.dto;
 
+import java.io.Serializable;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RoleDTO {
+public class RoleDTO implements Serializable {
 
     /**
      * 角色id
@@ -34,6 +35,7 @@ public class RoleDTO {
 
     /**
      * 角色类型：common 普通角色 super_admin超级管理员(禁止删除) admin子管理员(禁止删除) init初始化内置角色
+     *
      * @see RoleTypeEnum
      */
     private String roleType;
@@ -51,6 +53,7 @@ public class RoleDTO {
     /**
      * 协同关系类型
      * 1:总包 2:建设单位 3:监理单位 4:劳务分包 5:专业分包 6:OMS通用 7:企业通用 8:企业内班组 9:项目内班组
+     *
      * @see cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum
      */
     private Integer cooperateShipType;