diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java index 6ac0afa..2865f32 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java @@ -102,4 +102,9 @@ public class LdTwoOutStorage implements Serializable { * 分组名称 */ private String groupName; + + /** + * 审批人员 + */ + private String approvers; } \ No newline at end of file diff --git a/src/main/java/com/nov/KgLowDurable/service/IUserService.java b/src/main/java/com/nov/KgLowDurable/service/IUserService.java index 5cbbf39..ef7ab8d 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IUserService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IUserService.java @@ -27,7 +27,7 @@ public interface IUserService extends IService { * @param formId * @return */ - boolean getApprover(String mainErDepartment, String type,Long formId); + String getApprover(String mainErDepartment, String type,Long formId); /** * 获取部门负责人 diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java index a31c302..f34fa28 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java @@ -195,9 +195,13 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl implements ILdTwoOutStorageService { @@ -112,13 +114,14 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl implements IU "}"; @Override - public boolean getApprover(String mainErDepartment, String type,Long formId) { + public String getApprover(String mainErDepartment, String type,Long formId) { // 参数校验 if (!StringUtils.hasText(type)) { throw new IllegalArgumentException("审批类型不能为空"); @@ -169,9 +169,11 @@ public class UserServiceImpl extends ServiceImpl implements IU put("Content-Type", "application/json"); }}; - Map querys = new HashMap() {{ - put("type",type); - }}; + Map querys = new HashMap(); + querys. put("type",type); + if ("1".equals(type)) { + querys.put("deptId", mainErDepartment); + } String resp = null; try { @@ -205,6 +207,8 @@ public class UserServiceImpl extends ServiceImpl implements IU // 3.保存审批人信息到数据库 List approversToSave = new ArrayList<>(); + // 构建审批人json结构 [{"level":1,"ids":"LiuXu"},{"level":2,"ids":"AnXingHe"},{"level":3,"ids":"LiuXu"}] + List approvers = new ArrayList<>(); // 遍历所有审批层级(1, 2, 3...) for (String level : result.keySet()) { @@ -219,6 +223,11 @@ public class UserServiceImpl extends ServiceImpl implements IU User user = users.get(i); LdApprove ldApprove = createLdApprove(user, level, formId, type); approversToSave.add(ldApprove); + + JSONObject approver = new JSONObject(); + approver.put("level", level); + approver.put("ids", user.getUserId()); + approvers.add(approver); } } @@ -230,7 +239,7 @@ public class UserServiceImpl extends ServiceImpl implements IU throw new RuntimeException("未找到审批人信息"); } - return saveSuccess; + return JSONObject.toJSONString(approvers); } catch (Exception e) { throw new RuntimeException("处理审批人数据失败: " + e.getMessage(), e);