fix: 审批管理/待审批/已审批列表查询接口

谢茂盛
1 parent 580848c0
Showing 7 changed files with 109 additions and 4 deletions
src/main/java/com/order/erp/controller/AuditController.java
src/main/java/com/order/erp/domain/AuditStatusEnum.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserResultVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserVO.java
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -2,6 +2,7 @@ package com.order.erp.controller;
 import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.AuditStatusEnum;
 import com.order.erp.domain.vo.order.AuditVO;
 import com.order.erp.domain.vo.order.OrderFieldLockApplyQueryVO;
 import com.order.erp.service.order.OrderFieldLockApplyService;
@@ -41,6 +42,32 @@ public class AuditController {
     }
     /**
+     * 待审批列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/wait_audit_list")
+    @AnonymousAccess
+    public ServerResult waitAuditList(@RequestBody @Validated OrderFieldLockApplyQueryVO queryVO) {
+        queryVO.setStatus(AuditStatusEnum.WAIT_AUDIT.getStatus());
+        return applyService.listByPage(queryVO);
+    }
+
+    /**
+     * 已审批列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/audit_list")
+    @AnonymousAccess
+    public ServerResult auditList(@RequestBody @Validated OrderFieldLockApplyQueryVO queryVO) {
+        queryVO.setStatusList(AuditStatusEnum.auditList);
+        return applyService.listByPage(queryVO);
+    }
+
+    /**
      * 审核
      *
      * @param auditVO 查询条件
+package com.order.erp.domain;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/9/13 18:05
+ * @version: 1.0
+ */
+@Getter
+@AllArgsConstructor
+public enum AuditStatusEnum {
+
+    WAIT_AUDIT(0, "待审批"),
+
+    AUDIT_PASS(10, "已通过"),
+
+    AUDIT_REFUSE(20, "已驳回"),
+    ;
+    private Integer status;
+
+    private String desc;
+
+    public static List<Integer> auditList = CollUtil.newArrayList(AUDIT_PASS.status, AUDIT_REFUSE.status);
+
+    public static List<Integer> waitAuditList = CollUtil.newArrayList(WAIT_AUDIT.status);
+}
@@ -77,5 +77,19 @@ public class AdminUserResultVO implements Serializable {
      */
     private LocalDateTime pwdResetTime;
+    /**
+     * 角色id
+     */
+    private Long roleId;
+
+    /**
+     * 角色code
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
 }
@@ -79,4 +79,8 @@ public class AdminUserVO implements Serializable {
     private LocalDateTime pwdResetTime;
+    /**
+     * 角色id
+     */
+    private Long roleId;
 }
@@ -43,10 +43,15 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
      */
     private String fields;
     /**
-     * 状态：0 待审批，1 通过，2 拒绝
+     * 状态：0 待审批，10 通过，20 拒绝
      */
     private Integer status;
+    /**
+     *
+     */
+    private List<Integer> statusList;
+
 }
@@ -9,13 +9,14 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ImgCaptchaUtils;
 import com.order.erp.common.utils.RedisUtil;
 import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.domain.RoleEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.*;
 import com.order.erp.domain.vo.UserVO;
@@ -38,6 +39,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 /**
@@ -124,10 +126,24 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         Page<AdminUserResultVO> webVOPage = new Page<>();
         List<AdminUserDO> adminDeptDOS = iPage.getRecords();
+        Map<Long, AdminUserRoleDO> userRoleDOMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(adminDeptDOS)) {
+            Set<Long> userIds = adminDeptDOS.stream().map(AdminUserDO::getId).collect(Collectors.toSet());
+            List<AdminUserRoleDO> userRoleDOList = userRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                    .in(AdminUserRoleDO::getUserId, userIds));
+            if (CollectionUtils.isNotEmpty(userRoleDOList)) {
+                userRoleDOMap = userRoleDOList.stream().collect(Collectors.toMap(AdminUserRoleDO::getUserId, Function.identity()));
+            }
+            Map<Long, AdminUserRoleDO> finalUserRoleDOMap = userRoleDOMap;
             List<AdminUserResultVO> queryVos = adminDeptDOS.stream().map(x -> {
                 AdminUserResultVO resultVO = new AdminUserResultVO();
                 BeanUtils.copyProperties(x, resultVO);
+                if (finalUserRoleDOMap.containsKey(x.getId())) {
+                    AdminUserRoleDO userRoleDO = finalUserRoleDOMap.get(x.getId());
+                    resultVO.setRoleId(userRoleDO.getRoleId());
+                    resultVO.setRoleCode(RoleEnum.getCodeById(userRoleDO.getRoleId()));
+                    resultVO.setRoleName(RoleEnum.getNameById(userRoleDO.getRoleId()));
+                }
                 return resultVO;
             }).collect(Collectors.toList());
             webVOPage.setRecords(queryVos);
@@ -164,9 +180,15 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (Objects.isNull(adminUserDo.getDeptId())) {
             adminUserDo.setDeptId(1L);
         }
+        adminUserDo.setIsAdmin(false);
         adminUserDo.setPassword(passwordEncoder.encode("123456"));
         save(adminUserDo);
+        if (Objects.nonNull(adminUserVO.getRoleId())) {
+            Set<Long> roleIds = new HashSet<>();
+            roleIds.add(adminUserVO.getRoleId());
+            authRole(AdminAuthUserVO.builder().userId(adminUserDo.getId()).roleIds(roleIds).build());
+        }
         return ServerResult.success();
     }
@@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.ApplyStatusEnum;
@@ -122,7 +122,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         return new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId())
-                .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus());
+                .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
+                .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList());
     }
     /**