diff --git a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java index 713fd84a..47a62f1e 100644 --- a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java +++ b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java @@ -24,4 +24,9 @@ public class CompanyDeptInfo { * 部门名称 */ private String deptName; + + private String companyCode; + + private String deptCode; + } \ No newline at end of file diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java index 411e9ad7..0e61d221 100644 --- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java +++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java @@ -4,6 +4,7 @@ import com.zt.plat.framework.common.core.ArrayValuable; import com.zt.plat.framework.common.util.object.ObjectUtils; import lombok.AllArgsConstructor; import lombok.Getter; +import org.apache.commons.lang3.StringUtils; import java.util.Arrays; @@ -47,4 +48,33 @@ public enum BpmProcessInstanceStatusEnum implements ArrayValuable { APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus()); } + /** + * 通过流程的状态返回对应的枚举 + * @param status 流程状态 + * @return + */ + public static BpmProcessInstanceStatusEnum getEnumByStatus(Integer status){ + for (BpmProcessInstanceStatusEnum e : BpmProcessInstanceStatusEnum.values()) { + if (e.getStatus().equals(status)) { + return e; + } + } + return NOT_START; + } + + /** + * 通过枚举描述返回对应的枚举 + * @param desc 描述 + * @return + */ + public static BpmProcessInstanceStatusEnum getEnumByDesc(String desc){ + if (StringUtils.isEmpty(desc)) return NOT_START; + for (BpmProcessInstanceStatusEnum e : BpmProcessInstanceStatusEnum.values()) { + if (desc.equals(e.getDesc())) { + return e; + } + } + return NOT_START; + } + } diff --git a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java index 51ca7af5..42ac7df6 100644 --- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java +++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/enums/task/BpmTaskStatusEnum.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjUtil; import com.zt.plat.framework.common.util.object.ObjectUtils; import lombok.AllArgsConstructor; import lombok.Getter; +import org.apache.commons.lang3.StringUtils; /** * 流程任务 Task 的状态枚举 @@ -67,4 +68,33 @@ public enum BpmTaskStatusEnum { return ObjUtil.equal(status, CANCEL.getStatus()); } + + /** + * 通过流程的状态返回对应的枚举 + * @param status 流程状态 + * @return + */ + public static BpmTaskStatusEnum getEnumByStatus(Integer status){ + for (BpmTaskStatusEnum e : BpmTaskStatusEnum.values()) { + if (e.getStatus().equals(status)) { + return e; + } + } + return NOT_START; + } + + /** + * 通过枚举描述返回对应的枚举 + * @param name 描述 + * @return + */ + public static BpmTaskStatusEnum getEnumByName(String name){ + if (StringUtils.isEmpty(name)) return NOT_START; + for (BpmTaskStatusEnum e : BpmTaskStatusEnum.values()) { + if (name.equals(e.getName())) { + return e; + } + } + return NOT_START; + } } diff --git a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java index 4044a6ae..d78dc98f 100644 --- a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java +++ b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java @@ -18,10 +18,16 @@ public class CompanyDeptInfoRespDTO { @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码") private String companyName; + @Schema(description = "公司编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "xxxx") + private String companyCode; + @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long deptId; @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部") private String deptName; + @Schema(description = "部门编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "xxxxx") + private String deptCode; + } \ No newline at end of file diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java index 1c0d9341..148dc3e1 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java @@ -383,8 +383,10 @@ public class DeptServiceImpl implements DeptService { CompanyDeptInfo info = new CompanyDeptInfo(); info.setCompanyId(company.getId()); info.setCompanyName(company.getName()); + info.setCompanyCode(company.getCode()); info.setDeptId(dept.getId()); info.setDeptName(dept.getName()); + info.setDeptCode(dept.getCode()); result.add(info); } return result;