From 1b301ac8a46baa88aa079df367ed276bbd4ca5f4 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 15 Feb 2023 22:28:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=B7=A5=E4=BD=9C=E9=80=9A=E7=9F=A5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/todocenter/manage/TodoCenterManage.java | 22 +++++++++----- .../com/ningdatech/pmapi/user/entity/UserInfo.java | 4 +++ .../pmapi/todocenter/TodoCenterTest.java | 35 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 0169d6f..095d429 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -458,17 +458,23 @@ public class TodoCenterManage { * @param param 参数 */ private void doSealPass(Task task, Long userId, ReqProcessHandlerDTO param) { + String processInstanceId = task.getProcessInstanceId(); + // 获取当前申报项目 + Project declaredProject = projectService + .getOne(Wrappers.lambdaQuery(Project.class).eq(Project::getInstCode, task.getProcessInstanceId())); + String projectName = declaredProject.getProjectName(); + Map var = new HashMap<>(16); var.put("approve_" + task.getId(), param.getAction()); - + // 保存审核意见 + if (hasComment(param.getAuditInfo())) { + // 执行自定义的保存评论的功能 + managementService.executeCommand(new SaveCommentCmd(param.getTaskId(), param.getInstanceId(), + String.valueOf(userId), JSONObject.toJSONString(param.getAuditInfo()))); + } // TODO 判断项目申报单位级别，区县单位申报有上级主管单位意见栏，市级单位没有 // TODO 市级单位：为大数据局；区县单位：为大数据中心(根据附件区分？) - // 获取当前申报项目 - Project declaredProject = projectService - .getOne(Wrappers.lambdaQuery(Project.class).eq(Project::getInstCode, task.getProcessInstanceId())); - // 更新项目状态到下一个状态 - updatePassProjectStatus(userId, declaredProject); taskService.complete(param.getTaskId(), var); } @@ -554,7 +560,7 @@ public class TodoCenterManage { // 获取浙政钉用户ID UserInfo auditUserInfo = userInfoService.getById(Long.valueOf(nextUserId)); WorkNoticeInfo sendWorkNoticeInfo = getSendWorkNoticeInfo(auditUserInfo); - String msg = String.format(PASS_MSG_TEMPLATE, null, projectName); + String msg = String.format(PASS_MSG_TEMPLATE, sendWorkNoticeInfo.getOrganizationName(), projectName); zwddClient.sendWorkNotice(sendWorkNoticeInfo.getReceiverUserId(),sendWorkNoticeInfo.getBizMsgId(),msg); } else { // 若没有，向发起人发送浙政钉工作通知：【项目名称】已通过【流程名称】，请及时开始下一步操作。 @@ -579,7 +585,7 @@ public class TodoCenterManage { * @author CMM * @since 2023/02/15 14:04 */ - private WorkNoticeInfo getSendWorkNoticeInfo(UserInfo auditUserInfo) { + public WorkNoticeInfo getSendWorkNoticeInfo(UserInfo auditUserInfo) { WorkNoticeInfo workNoticeInfo = new WorkNoticeInfo(); Long accountId = auditUserInfo.getAccountId(); if (Objects.isNull(accountId)){ diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java index 52103cb..fd602fe 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java @@ -2,8 +2,10 @@ package com.ningdatech.pmapi.user.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.time.LocalDateTime; @@ -20,6 +22,8 @@ import java.time.LocalDateTime; @Builder @Data @ApiModel(value = "NdUserInfo对象", description = "") +@AllArgsConstructor +@NoArgsConstructor public class UserInfo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java new file mode 100644 index 0000000..766d317 --- /dev/null +++ b/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java @@ -0,0 +1,35 @@ +package com.ningdatech.pmapi.todocenter; + +import com.ningdatech.pmapi.AppTests; +import com.ningdatech.pmapi.todocenter.bean.entity.WorkNoticeInfo; +import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage; +import com.ningdatech.pmapi.user.entity.UserInfo; +import com.ningdatech.zwdd.client.ZwddClient; +import lombok.extern.slf4j.Slf4j; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static com.ningdatech.pmapi.todocenter.constant.WorkNotice.PASS_MSG_TEMPLATE; + +/** + * 待办中心测试 + * + * @author CMM + * @since 2023/02/15 22:03 + */ +@Slf4j +public class TodoCenterTest extends AppTests { + + @Autowired + private TodoCenterManage todoCenterManage; + + @Autowired + private ZwddClient zwddClient; + @Test + public void sendWorkNoticeTest(){ + String msg = String.format(PASS_MSG_TEMPLATE, "发改委", "测试项目2"); + log.info("开始发送工作通知"); + zwddClient.sendWorkNotice("843622","666",msg); + log.info("发送工作通知结束"); + } +} From 2d0bd54412c0dbf96b88ce85a509e55ffbdd4390 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Thu, 16 Feb 2023 10:21:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/user/constant/UserAvailableEnum.java | 18 +++++ .../pmapi/user/controller/UserInfoController.java | 12 +-- .../com/ningdatech/pmapi/user/entity/UserInfo.java | 6 ++ .../pmapi/user/manage/UserInfoManage.java | 86 ++++++++++++++++++++-- .../pmapi/user/model/base/UserRoleInfo.java | 33 --------- .../pmapi/user/model/po/ReqUserDetailEditPO.java | 17 +++-- .../pmapi/user/model/po/ReqUserDetailPO.java | 8 +- .../user/model/po/ReqUserDisableOrEnablePO.java | 30 ++++++++ .../pmapi/user/model/po/ReqUserDisablePO.java | 29 -------- .../pmapi/user/model/po/ReqUserInfoListPO.java | 7 +- .../pmapi/user/model/vo/ResUserDetailVO.java | 7 +- .../ningdatech/pmapi/user/model/vo/UserRoleVO.java | 21 ++++++ 12 files changed, 187 insertions(+), 87 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/constant/UserAvailableEnum.java delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/model/base/UserRoleInfo.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisableOrEnablePO.java delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisablePO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/UserRoleVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/constant/UserAvailableEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/constant/UserAvailableEnum.java new file mode 100644 index 0000000..70e15c3 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/constant/UserAvailableEnum.java @@ -0,0 +1,18 @@ +package com.ningdatech.pmapi.user.constant; + +/** + * @author liuxinxin + * @date 2023/2/15 下午5:13 + */ + +public enum UserAvailableEnum { + /** + * 启用 + */ + ENABLE, + + /** + * 禁用 + */ + DISABLE +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java index 4943f54..683d334 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java @@ -4,7 +4,8 @@ package com.ningdatech.pmapi.user.controller; import com.ningdatech.basic.model.PageVo; import com.ningdatech.pmapi.user.manage.UserInfoManage; import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO; -import com.ningdatech.pmapi.user.model.po.ReqUserDisablePO; +import com.ningdatech.pmapi.user.model.po.ReqUserDetailPO; +import com.ningdatech.pmapi.user.model.po.ReqUserDisableOrEnablePO; import com.ningdatech.pmapi.user.model.po.ReqUserInfoListPO; import com.ningdatech.pmapi.user.model.vo.ResUserDetailVO; import com.ningdatech.pmapi.user.model.vo.ResUserInfoListVO; @@ -38,14 +39,14 @@ public class UserInfoController { @ApiOperation(value = "用户禁用/启用", notes = "用户禁用/启用") @PostMapping("/disable-enable") - public void disableOrEnable(@Valid @RequestBody ReqUserDisablePO reqUserDisablePO) { - userInfoManage.disableOrEnable(reqUserDisablePO); + public void disableOrEnable(@Valid @RequestBody ReqUserDisableOrEnablePO reqUserDisableOrEnablePO) { + userInfoManage.disableOrEnable(reqUserDisableOrEnablePO); } @ApiOperation(value = "用户详情", notes = "用户详情") @PostMapping("/detail") - public ResUserDetailVO userInfoDetail(@Valid @RequestBody ReqUserInfoListPO reqUserInfoListPO) { - return userInfoManage.userInfoDetail(reqUserInfoListPO); + public ResUserDetailVO userInfoDetail(@Valid @RequestBody ReqUserDetailPO reqUserDetailPO) { + return userInfoManage.userInfoDetail(reqUserDetailPO); } @ApiOperation(value = "用户详情编辑", notes = "用户详情编辑") @@ -54,5 +55,4 @@ public class UserInfoController { userInfoManage.userInfoDetailEdit(reqUserDetailEditPO); } - } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java index 52103cb..791a84f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java @@ -2,8 +2,10 @@ package com.ningdatech.pmapi.user.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.time.LocalDateTime; @@ -19,6 +21,8 @@ import java.time.LocalDateTime; @TableName("nd_user_info") @Builder @Data +@AllArgsConstructor +@NoArgsConstructor @ApiModel(value = "NdUserInfo对象", description = "") public class UserInfo implements Serializable { @@ -44,4 +48,6 @@ public class UserInfo implements Serializable { private String available; + private String employeeCode; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java index de80bb9..78cd657 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java @@ -1,23 +1,34 @@ package com.ningdatech.pmapi.user.manage; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.model.PageVo; import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService; import com.ningdatech.pmapi.organization.service.IDingOrganizationService; +import com.ningdatech.pmapi.sys.model.entity.UserRole; +import com.ningdatech.pmapi.sys.service.IUserRoleService; +import com.ningdatech.pmapi.user.constant.UserAvailableEnum; +import com.ningdatech.pmapi.user.entity.UserInfo; import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO; -import com.ningdatech.pmapi.user.model.po.ReqUserDisablePO; +import com.ningdatech.pmapi.user.model.po.ReqUserDetailPO; +import com.ningdatech.pmapi.user.model.po.ReqUserDisableOrEnablePO; import com.ningdatech.pmapi.user.model.po.ReqUserInfoListPO; import com.ningdatech.pmapi.user.model.vo.ResUserDetailVO; import com.ningdatech.pmapi.user.model.vo.ResUserInfoListVO; +import com.ningdatech.pmapi.user.model.vo.UserRoleVO; import com.ningdatech.pmapi.user.service.IUserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -31,6 +42,7 @@ public class UserInfoManage { private final IDingOrganizationService iDingOrganizationService; private final IDingEmployeeInfoService iDingEmployeeInfoService; private final IUserInfoService iUserInfoService; + private final IUserRoleService iUserRoleService; public PageVo list(ReqUserInfoListPO reqUserInfoListPO) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(DingEmployeeInfo.class) @@ -67,16 +79,78 @@ public class UserInfoManage { return pageVo; } - public void disableOrEnable(ReqUserDisablePO reqUserDisablePO) { - - + public void disableOrEnable(ReqUserDisableOrEnablePO reqUserDisableOrEnablePO) { + Long userId = generateUserId(reqUserDisableOrEnablePO.getEmployeeCode()); + UserInfo userInfo = iUserInfoService.getById(userId); + userInfo.setAvailable(reqUserDisableOrEnablePO.getOperation()); + iUserInfoService.updateById(userInfo); } - public ResUserDetailVO userInfoDetail(ReqUserInfoListPO reqUserInfoListPO) { - return null; + public ResUserDetailVO userInfoDetail(ReqUserDetailPO reqUserDetailPO) { + Long userId = generateUserId(reqUserDetailPO.getEmployeeCode()); + UserInfo userInfo = iUserInfoService.getById(userId); + if (Objects.isNull(userInfo)) { + return null; + } + ResUserDetailVO resUserDetailVO = new ResUserDetailVO(); + + resUserDetailVO.setUserId(userInfo.getId()); + resUserDetailVO.setPhoneNo(userInfo.getMobile()); + resUserDetailVO.setStatus(userInfo.getAvailable()); + resUserDetailVO.setUserRoleInfoList(new ArrayList<>()); + return resUserDetailVO; } + @Transactional(rollbackFor = Exception.class) public void userInfoDetailEdit(ReqUserDetailEditPO reqUserDetailEditPO) { + Long userId = generateUserId(reqUserDetailEditPO.getEmployeeCode()); + UserInfo userInfo = iUserInfoService.getById(userId); + if (Objects.isNull(userInfo)) { + return; + } + userInfo.setMobile(reqUserDetailEditPO.getPhoneNo()); + userInfo.setAvailable(reqUserDetailEditPO.getStatus()); + iUserInfoService.updateById(userInfo); + + List userRoleInfoList = reqUserDetailEditPO.getUserRoleInfoList(); + iUserRoleService.remove(Wrappers.lambdaQuery(UserRole.class).eq(UserRole::getUserId, userId)); + if (CollUtil.isNotEmpty(userRoleInfoList)) { + List userRoleList = userRoleInfoList.stream().map(r -> { + UserRole saveRecord = new UserRole(); + saveRecord.setRoleId(r.getId()); + saveRecord.setUserId(userId); + return saveRecord; + }).collect(Collectors.toList()); + iUserRoleService.saveBatch(userRoleList); + } + + } + + private Long generateUserId(String employeeCode) { + UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class) + .eq(UserInfo::getEmployeeCode, employeeCode)); + if (Objects.isNull(userInfo)) { + List dingEmployeeInfoList = iDingEmployeeInfoService.list(Wrappers.lambdaQuery(DingEmployeeInfo.class) + .eq(DingEmployeeInfo::getMainJob, "true")); + if (CollUtil.isEmpty(dingEmployeeInfoList)) { + throw new BizException("员工账号不存在"); + } + DingEmployeeInfo dingEmployeeInfo = dingEmployeeInfoList.get(0); + userInfo = UserInfo.builder() + .accountId(dingEmployeeInfo.getAccountId()) + .username(dingEmployeeInfo.getEmployeeName()) + .realName(dingEmployeeInfo.getEmployeeName()) + .available(UserAvailableEnum.DISABLE.name()) + .createBy(-1L) + .updateBy(-1L) + .createOn(LocalDateTime.now()) + .updateOn(LocalDateTime.now()) + .build(); + iUserInfoService.save(userInfo); + } + return userInfo.getId(); } + + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/base/UserRoleInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/base/UserRoleInfo.java deleted file mode 100644 index e5450dc..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/base/UserRoleInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.ningdatech.pmapi.user.model.base; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Size; - -import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE; - -/** - * @author liuxinxin - * @date 2022/8/22 下午4:12 - */ -@Data -@ApiModel("用户角色信息") -public class UserRoleInfo { - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "枚举code") - private String code; - - @ApiModelProperty(value = "描述") - @Size(max = 100, message = "描述长度不能超过100") - @TableField(value = "describe", condition = LIKE) - private String describe; - - @ApiModelProperty(value = "排序") - private Integer roleSort; -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailEditPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailEditPO.java index cc35679..fd3c895 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailEditPO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailEditPO.java @@ -1,10 +1,11 @@ package com.ningdatech.pmapi.user.model.po; -import com.ningdatech.pmapi.user.model.base.UserRoleInfo; +import com.ningdatech.pmapi.user.model.vo.UserRoleVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.List; /** @@ -12,18 +13,24 @@ import java.util.List; * @date 2023/2/15 上午8:43 */ @Data -@ApiModel("获取用户详情编辑请求") +@ApiModel("用户详情编辑请求") public class ReqUserDetailEditPO { @ApiModelProperty("userId") private Long userId; + @NotBlank(message = "浙政钉 用户编码 不能为空") + @ApiModelProperty("浙政钉 用户编码") + private String employeeCode; + + @NotBlank(message = "用户手机号不能为空") @ApiModelProperty("手机号") private String phoneNo; - @ApiModelProperty("状态 启用/禁用") - private Boolean status; + @NotBlank(message = "状态不能为空") + @ApiModelProperty("状态 启用 ENABLE/禁用 DISABLE") + private String status; @ApiModelProperty("用户角色信息列表") - private List userRoleInfoList; + private List userRoleInfoList; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailPO.java index c162e0b..0cb0b7e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailPO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDetailPO.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; /** * @author liuxinxin @@ -14,7 +14,11 @@ import javax.validation.constraints.NotNull; @ApiModel("获取用户详情请求") public class ReqUserDetailPO { - @NotNull(message = "用户id 不能为空") @ApiModelProperty("用户id") private Long userId; + + @NotBlank(message = "浙政钉 用户编码 不能为空") + @ApiModelProperty("浙政钉 用户编码") + private String employeeCode; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisableOrEnablePO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisableOrEnablePO.java new file mode 100644 index 0000000..fe5466a --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisableOrEnablePO.java @@ -0,0 +1,30 @@ +package com.ningdatech.pmapi.user.model.po; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author liuxinxin + * @date 2023/2/13 上午9:31 + */ + +@Data +@ApiModel("用户禁用/启用 PO") +public class ReqUserDisableOrEnablePO { + + @ApiModelProperty("用户id") + private Long userId; + + @NotBlank(message = "浙政钉 用户编码 不能为空") + @ApiModelProperty("浙政钉 用户编码") + private String employeeCode; + + @NotBlank(message = "操作 不能为空") + @ApiModelProperty("操作 启用 ENABLE/禁用 DISABLE") + private String operation; + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisablePO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisablePO.java deleted file mode 100644 index 96196fb..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisablePO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ningdatech.pmapi.user.model.po; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author liuxinxin - * @date 2023/2/13 上午9:31 - */ - -@Data -@ApiModel("用户禁用/启用 PO") -public class ReqUserDisablePO { - - @ApiModelProperty("用户id") - private Long userId; - - @NotBlank(message = "浙政钉 用户编码 不能为空") - @ApiModelProperty("浙政钉 用户编码") - private String employeeCode; - - @NotBlank(message = "浙政钉 用户编码 不能为空") - @ApiModelProperty("操作 true: 启用 / false 禁用") - private Boolean operation; - -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserInfoListPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserInfoListPO.java index 9706f1e..9b2ff6d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserInfoListPO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserInfoListPO.java @@ -1,7 +1,7 @@ package com.ningdatech.pmapi.user.model.po; import com.ningdatech.basic.model.PagePo; -import com.ningdatech.pmapi.sys.model.entity.Role; +import com.ningdatech.pmapi.user.model.vo.UserRoleVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,8 +28,11 @@ public class ReqUserInfoListPO extends PagePo { @ApiModelProperty("所属区域") private Long regionId; + @ApiModelProperty("所属区域名称") + private Long regionName; + @ApiModelProperty("用户角色") - private List userRoleList; + private List userRoleList; @ApiModelProperty("状态") private String status; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java index e040015..7b65b6a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java @@ -1,6 +1,5 @@ package com.ningdatech.pmapi.user.model.vo; -import com.ningdatech.pmapi.user.model.base.UserRoleInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,9 +20,9 @@ public class ResUserDetailVO { @ApiModelProperty("手机号") private String phoneNo; - @ApiModelProperty("状态 启用/禁用") - private Boolean status; + @ApiModelProperty("状态 启用 ENABLE/禁用 DISABLE") + private String status; @ApiModelProperty("用户角色信息列表") - private List userRoleInfoList; + private List userRoleInfoList; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/UserRoleVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/UserRoleVO.java new file mode 100644 index 0000000..50cc474 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/UserRoleVO.java @@ -0,0 +1,21 @@ +package com.ningdatech.pmapi.user.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuxinxin + * @date 2023/2/15 下午5:47 + */ + +@Data +@ApiModel("用户角色VO") +public class UserRoleVO { + + @ApiModelProperty(value = "角色id") + private Long id; + + @ApiModelProperty(value = "名称") + private String name; +} From 90800bbd9a10db2546874e5cd7f39ca1d30a5687 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 16 Feb 2023 11:23:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=B7=A5=E4=BD=9C=E9=80=9A=E7=9F=A5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TodoCenterController.java | 5 +++-- .../pmapi/todocenter/manage/TodoCenterManage.java | 25 ++++++++++++---------- .../pmapi/todocenter/TodoCenterTest.java | 6 ++++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java index 60685fc..913db14 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java @@ -66,8 +66,9 @@ public class TodoCenterController { */ @GetMapping("/progress/{instanceId}/{nodeId}") public ApiResponse getProcessDetail(@PathVariable String instanceId, - @PathVariable(required = false) String nodeId) { - return ApiResponse.ofSuccess(todoCenterManage.getProcessDetail(nodeId, instanceId)); + @PathVariable(required = false) String nodeId, + @PathVariable Long projectId) { + return ApiResponse.ofSuccess(todoCenterManage.getProcessDetail(nodeId, instanceId, projectId)); } /** diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 095d429..4688ff2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -791,6 +791,17 @@ public class TodoCenterManage { .singleResult(); // 获取前一个审核节点审核人信息 String beforeUserId = lastInstance.getAssignee(); + // 获取当前审核节点审核人信息 + String currentUserId = task.getAssignee(); + //HashSet userSet = new HashSet<>(); + //userSet.add(beforeUserId); + //userSet.add(currentUserId); + //Map userMap = userInfoService.getUserMapByIds(userSet); + //UserInfoVO beforeUserInfoVO = userMap.get(Long.valueOf(beforeUserId)); + //UserInfoVO currentUserInfoVO = userMap.get(Long.valueOf(currentUserId)); + //String beforeUserOrgCode = beforeUserInfoVO.getOrganizationCode(); + //String currentUserOrgCode = currentUserInfoVO.getOrganizationCode(); + //Boolean orgFlag = currentUserOrgCode.equals(beforeUserOrgCode) ? true : false; // TODO 判断前一个审核人的部门和当前登录用户的部门是否是同一个，如果是同一个才可以撤回，否则抛出异常 Boolean orgFlag = true; @@ -903,7 +914,7 @@ public class TodoCenterManage { * @param instanceId 流程实例ID * @return 流程进度及表单详情 */ - public ProcessProgressDetailVo getProcessDetail(String nodeId, String instanceId) { + public ProcessProgressDetailVo getProcessDetail(String nodeId, String instanceId, Long projectId) { HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(instanceId) .singleResult(); @@ -979,16 +990,8 @@ public class TodoCenterManage { .progress(taskRecords) .build(); //res.setStartUser(userInfoVO); - if (Objects.isNull(instance.getEndActivityId())) { - res.setStatus(ProcessStatusEnum.UNDER_REVIEW.name()); - } else if (HisProInsEndActId.BACK.equals(instance.getEndActivityId())) { - // TODO 被退回的审核节点状态这里只是暂时这么判断，具体怎么保存这个退回状态，后面讨论 - res.setStatus(ProcessStatusEnum.BE_BACKED.name()); - } else if (HisProInsEndActId.REJECT.equals(instance.getEndActivityId())) { - res.setStatus(ProcessStatusEnum.BE_REJECTED.name()); - } else if (HisProInsEndActId.END.equals(instance.getEndActivityId())) { - res.setStatus(ProcessStatusEnum.APPROVED.name()); - } + Project project = projectService.getById(projectId); + res.setStatus(ProcessStatusEnum.getDescByCode(project.getProcessStatus())); return res; } diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java index 766d317..9803d2e 100644 --- a/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java +++ b/pmapi/src/test/java/com/ningdatech/pmapi/todocenter/TodoCenterTest.java @@ -27,9 +27,11 @@ public class TodoCenterTest extends AppTests { private ZwddClient zwddClient; @Test public void sendWorkNoticeTest(){ - String msg = String.format(PASS_MSG_TEMPLATE, "发改委", "测试项目2"); + // String msg = String.format(PASS_MSG_TEMPLATE, "发改委", "0216-4-测试项目"); + String msg = "发改委的0216-6-测试项目需要您审核"; log.info("开始发送工作通知"); - zwddClient.sendWorkNotice("843622","666",msg); + zwddClient.sendWorkNotice("846085","0216-7",msg); + // zwddClient.sendWorkNotice("829728","0216-5",msg); log.info("发送工作通知结束"); } } From b5977211ff1b95a4d7d575857b3f21af5bbf6739 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 16 Feb 2023 11:24:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=B7=A5=E4=BD=9C=E9=80=9A=E7=9F=A5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java index 80a9ca9..791a84f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java @@ -24,8 +24,6 @@ import java.time.LocalDateTime; @AllArgsConstructor @NoArgsConstructor @ApiModel(value = "NdUserInfo对象", description = "") -@AllArgsConstructor -@NoArgsConstructor public class UserInfo implements Serializable { private static final long serialVersionUID = 1L; From 172bfdb9d33058c532c3ac93c669bdfc8871e6a3 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Thu, 16 Feb 2023 14:26:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DingEmployeeInfoController.java | 20 ----------- .../controller/DingOrganizationController.java | 27 +++++++++++++- .../controller/OrganizationProcdefController.java | 4 +-- .../organization/manage/OrganizationManage.java | 42 +++++++++++++++++++++- .../model/po/ReqOrganizationListPO.java | 31 ++++++++++++++++ .../model/vo/ResOrganizationListVO.java | 38 ++++++++++++++++++++ .../pmapi/user/controller/UserInfoController.java | 6 ++++ .../pmapi/user/manage/UserInfoManage.java | 6 +++- .../pmapi/user/model/vo/ResUserDetailVO.java | 3 ++ 9 files changed, 152 insertions(+), 25 deletions(-) delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingEmployeeInfoController.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/model/po/ReqOrganizationListPO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/ResOrganizationListVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingEmployeeInfoController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingEmployeeInfoController.java deleted file mode 100644 index 46358ef..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingEmployeeInfoController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ningdatech.pmapi.organization.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 前端控制器 - *

- * - * @author Lierbao - * @since 2023-02-11 - */ -@Controller -@RequestMapping("/pmapi.organization/ding-employee-info") -public class DingEmployeeInfoController { - -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java index 2ce1a10..f16e421 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java @@ -1,10 +1,22 @@ package com.ningdatech.pmapi.organization.controller; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.organization.manage.OrganizationManage; +import com.ningdatech.pmapi.organization.model.po.ReqOrganizationListPO; +import com.ningdatech.pmapi.organization.model.vo.ResOrganizationListVO; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; /** *

@@ -14,14 +26,27 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author Lierbao * @since 2023-02-09 */ -@Controller + +@Slf4j +@Validated +@RestController +@RequiredArgsConstructor +@Api(value = "DingOrganizationController", tags = "单位管理") @RequestMapping("/api/v1/organization") public class DingOrganizationController { + private final OrganizationManage organizationManage; + @ApiModelProperty("单位成员配置") @PostMapping("/member/config") public void organizationManage() { } + @ApiModelProperty("单位列表筛选") + @PostMapping("/list") + public PageVo organizationList(@Valid @RequestBody ReqOrganizationListPO reqOrganizationListPO) { + return organizationManage.organizationList(reqOrganizationListPO); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java index 2ed8f47..94cb5f5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java @@ -57,14 +57,14 @@ public class OrganizationProcdefController { @ApiOperation(value = "单位流程配置启用", notes = "单位流程配置启用") @PutMapping("/enable/{processDefId}") public String enableProcess(@PathVariable String processDefId) { - orgProcessModelService.enableProcess(processDefId,Boolean.FALSE); + orgProcessModelService.enableProcess(processDefId, Boolean.FALSE); return "启用成功"; } @ApiOperation(value = "单位流程配置禁用", notes = "单位流程配置禁用") @PutMapping("/disable/{processDefId}") public String disableProcess(@PathVariable String processDefId) { - orgProcessModelService.enableProcess(processDefId,Boolean.TRUE); + orgProcessModelService.enableProcess(processDefId, Boolean.TRUE); return "禁用成功"; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java index 24b7171..69e314a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java @@ -1,8 +1,21 @@ package com.ningdatech.pmapi.organization.manage; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.organization.model.entity.DingOrganization; +import com.ningdatech.pmapi.organization.model.po.ReqOrganizationListPO; +import com.ningdatech.pmapi.organization.model.vo.ResOrganizationListVO; +import com.ningdatech.pmapi.organization.service.IDingOrganizationService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** * @author liuxinxin * @date 2023/1/13 下午2:55 @@ -11,7 +24,34 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OrganizationManage { -// private final + private final IDingOrganizationService iDingOrganizationService; + + public PageVo organizationList(ReqOrganizationListPO reqOrganizationListPO) { + String orgName = reqOrganizationListPO.getOrgName(); + + Page page = iDingOrganizationService + .page(new Page<>(reqOrganizationListPO.getPageNumber(), reqOrganizationListPO.getPageSize()) + , Wrappers.lambdaQuery(DingOrganization.class) + .like(StringUtils.isNotBlank(orgName), DingOrganization::getOrganizationName, orgName)); + + long total = page.getTotal(); + List records = page.getRecords(); + + List resVOList = new ArrayList<>(); + if (CollUtil.isNotEmpty(records)) { + resVOList = records.stream().map(r -> { + ResOrganizationListVO resOrganizationListVO = new ResOrganizationListVO(); + resOrganizationListVO.setOrgCode(r.getOrganizationCode()); + resOrganizationListVO.setOrgName(r.getOrganizationName()); + // TODO 补充其他字段 + return resOrganizationListVO; + }).collect(Collectors.toList()); + } + PageVo pageVo = new PageVo<>(); + pageVo.setTotal(total); + pageVo.setRecords(resVOList); + return pageVo; + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/po/ReqOrganizationListPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/po/ReqOrganizationListPO.java new file mode 100644 index 0000000..b0a4e43 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/po/ReqOrganizationListPO.java @@ -0,0 +1,31 @@ +package com.ningdatech.pmapi.organization.model.po; + +import com.ningdatech.basic.model.PagePo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuxinxin + * @date 2023/2/16 上午11:50 + */ +@Data +@ApiModel("组织列表 请求PO") +public class ReqOrganizationListPO extends PagePo { + + @ApiModelProperty("单位名称") + private String orgName; + + @ApiModelProperty("浙政钉编码") + private String orgCode; + + @ApiModelProperty("所属区域id") + private String regionId; + + @ApiModelProperty("是否为主管单位") + private Boolean isCompetentUnit; + + @ApiModelProperty("是否为上级条线主管单位") + private Boolean isSuperiorLineCompetentUnit; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/ResOrganizationListVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/ResOrganizationListVO.java new file mode 100644 index 0000000..89007ef --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/ResOrganizationListVO.java @@ -0,0 +1,38 @@ +package com.ningdatech.pmapi.organization.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuxinxin + * @date 2023/2/16 上午11:50 + */ +@Data +@ApiModel("组织列表VO") +public class ResOrganizationListVO { + + public String id; + + @ApiModelProperty("单位名称") + private String orgName; + + @ApiModelProperty("浙政钉编码") + private String orgCode; + + @ApiModelProperty("财政编码") + private String fiscalCode; + + @ApiModelProperty("所属区域id") + private String regionId; + + @ApiModelProperty("所属区域") + private String regionName; + + @ApiModelProperty("是否为主管单位") + private Boolean isCompetentUnit; + + @ApiModelProperty("是否为上级条线主管单位") + private Boolean isSuperiorLineCompetentUnit; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java index 683d334..e12d07e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java @@ -55,4 +55,10 @@ public class UserInfoController { userInfoManage.userInfoDetailEdit(reqUserDetailEditPO); } + @ApiOperation(value = "获取当前登陆用户详情信息", notes = "用户详情") + @PostMapping("/current-user-info") + public ResUserDetailVO currentUserInfo() { + return userInfoManage.currentUserInfo(); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java index 78cd657..31caf14 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java @@ -93,7 +93,7 @@ public class UserInfoManage { return null; } ResUserDetailVO resUserDetailVO = new ResUserDetailVO(); - + resUserDetailVO.setRealName(userInfo.getRealName()); resUserDetailVO.setUserId(userInfo.getId()); resUserDetailVO.setPhoneNo(userInfo.getMobile()); resUserDetailVO.setStatus(userInfo.getAvailable()); @@ -141,6 +141,7 @@ public class UserInfoManage { .accountId(dingEmployeeInfo.getAccountId()) .username(dingEmployeeInfo.getEmployeeName()) .realName(dingEmployeeInfo.getEmployeeName()) + .employeeCode(dingEmployeeInfo.getEmployeeCode()) .available(UserAvailableEnum.DISABLE.name()) .createBy(-1L) .updateBy(-1L) @@ -153,4 +154,7 @@ public class UserInfoManage { } + public ResUserDetailVO currentUserInfo() { + return null; + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java index 7b65b6a..f5badb4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java @@ -17,6 +17,9 @@ public class ResUserDetailVO { @ApiModelProperty("userId") private Long userId; + @ApiModelProperty("用户姓名") + private String realName; + @ApiModelProperty("手机号") private String phoneNo;