feat:基础信息权限审批

qdlgxiemaosheng
1 parent a4c3047d
Showing 3 changed files with 26 additions and 6 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -68,10 +68,10 @@ public class OrderFieldUtils {
      * @return
      */
     public static OrderFieldLockApplyDO generatorOtherInfoFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId) {
-        if (checkInspectionStageField4apply(fieldVO.getInspectionStageFields()) ||
-                checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()) ||
-                checkReportField4apply(fieldVO.getReportFields()) ||
-                checkTrackStageField4apply(fieldVO.getTrackStageFields())) {
+        if ((Objects.nonNull(fieldVO.getInspectionStageFields()) && checkInspectionStageField4apply(fieldVO.getInspectionStageFields()))
+                || (Objects.nonNull(fieldVO.getProfitAnalysisFields()) && checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()))
+                || (Objects.nonNull(fieldVO.getReportFields()) && checkReportField4apply(fieldVO.getReportFields()))
+                || (Objects.nonNull(fieldVO.getTrackStageFields()) && checkTrackStageField4apply(fieldVO.getTrackStageFields()))) {
             OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
             fieldVO.setBaseFields(initOrderBaseField(OrderLockFieldEnum.LOCKED));
             BeanUtils.copyProperties(fieldVO, lockFieldVO);
@@ -83,5 +83,10 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
      */
     private String businessPerson;
+    /**
+     * 0 管理员，1：业务员
+     */
+    private Integer auditType;
+
 }
@@ -299,9 +299,18 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
      */
     private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) {
         RoleEnum roleEnum = dataScope.getRole();
+        RoleEnum roleSelect = null;
         if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
             queryVO.setBusinessPerson(dataScope.getLoginUserName());
         }
+        if (RoleEnum.ADMIN.getCode().equals(roleEnum.getCode())) {
+            if (Objects.nonNull(queryVO.getAuditType()) && 1 == queryVO.getAuditType()) {
+                roleEnum = RoleEnum.BUSINESS_USER;
+            }
+            if (Objects.nonNull(queryVO.getAuditType()) && 0 == queryVO.getAuditType()) {
+                roleSelect = RoleEnum.ADMIN;
+            }
+        }
         Set<Long> orderIds = new HashSet<>();
         if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
                 || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
@@ -318,14 +327,20 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 orderIds.add(-1L);
             }
         }
-        return new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+        LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId())
-                .like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode())
                 .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
                 .eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType())
                 .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
+        if (Objects.isNull(roleSelect)) {
+            queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
+        }else {
+            queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
+
+        }
+        return queryWrapper;
     }
     /**