BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 9dc7d2d197eed98b0ae5afc1cc521522af420843

Authored by YunaiV
1 parent 91c0c423

工作流的 code review

Inline Side-by-side
Showing 3 changed files with 5 additions and 10 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java
  View file @9dc7d2d
... ... @@ -15,6 +15,7 @@ public interface BpmErrorCodeConstants {
15 15  
16 16  
17 17 // ========== OA 流程模块 1-003-001-000 ==========
  18 + // TODO @jason：前缀
18 19 ErrorCode LEAVE_NOT_EXISTS = new ErrorCode(1003001001, "请假申请不存在");
19 20 ErrorCode PM_POST_NOT_EXISTS = new ErrorCode(1003001002, "项目经理岗位未设置");
20 21 ErrorCode DEPART_PM_POST_NOT_EXISTS = new ErrorCode(1003001003, "部门的项目经理不存在");
... ... @@ -23,6 +24,4 @@ public interface BpmErrorCodeConstants {
23 24 ErrorCode HR_POST_NOT_EXISTS = new ErrorCode(1003001006, "HR岗位未设置");
24 25 ErrorCode DAY_LEAVE_ERROR = new ErrorCode(1003001007, "请假天数必须>=1");
25 26  
26   -
27   -
28 27 }
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/workflow/BpmTaskService.java
  View file @9dc7d2d
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.adminserver.modules.bpm.service.workflow;
3 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.workflow.vo.*;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5  
6   -import javax.servlet.http.HttpServletResponse;
7 6 import java.util.List;
8 7  
9 8 /**
... ... @@ -17,14 +16,12 @@ public interface BpmTaskService {
17 16 */
18 17 PageResult<TodoTaskRespVO> getTodoTaskPage(TodoTaskPageReqVO pageReqVO);
19 18  
20   -
21 19 /**
22 20 * 签收任务
23 21 * @param taskId 用户任务id
24 22 */
25 23 void claimTask(String taskId);
26 24  
27   -
28 25 /**
29 26 * 工作流，完成 userTask, 完成用户任务 一般传入参数 1。是否同意（variables). 2. 评论(comment)
30 27 * variables 变量名 和 评论 由前台传入
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/user/SysUserMapper.java
  View file @9dc7d2d
1 1 package cn.iocoder.yudao.adminserver.modules.system.dal.mysql.user;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserBaseVO;
  3 +import cn.hutool.core.util.StrUtil;
  4 +import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserExportReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserPageReqVO;
4 6 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
5 7 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
6 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 9 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
8 10 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
9   -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserExportReqVO;
10   -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserPageReqVO;
11 11 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
12 12 import org.apache.ibatis.annotations.Mapper;
13   -import org.apache.logging.log4j.util.Strings;
14 13  
15 14 import java.util.Collection;
16 15 import java.util.List;
17 16 import java.util.Optional;
18   -import java.util.Set;
19 17  
20 18 @Mapper
21 19 public interface SysUserMapper extends BaseMapperX<SysUserDO> {
... ... @@ -62,6 +60,7 @@ public interface SysUserMapper extends BaseMapperX&lt;SysUserDO&gt; {
62 60 return selectList(new QueryWrapperX<SysUserDO>()
63 61 .eq("status", CommonStatusEnum.ENABLE.getStatus())
64 62 .eq("dept_id", departId)
  63 + // TODO @jason: 封装一个 StringUtils .toString 。如果空的时候，设置为 null。会更简洁
65 64 .likeIfPresent("post_ids", Optional.ofNullable(postId).map(t -> String.valueOf(postId)).orElse("")));
66 65 }
67 66  
... ...