canrd-outside / order-erp · Commits

Commit 8143bdf5ee0071cd05f3233daeb4a3efbb73ba29

Authored by qdlgxiemaosheng
1 parent a4c3047d
build: skipped

feat:基础信息权限审批

Inline Side-by-side
Showing 3 changed files with 26 additions and 6 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
  View file @8143bdf
... ... @@ -68,10 +68,10 @@ public class OrderFieldUtils {
68 68 * @return
69 69 */
70 70 public static OrderFieldLockApplyDO generatorOtherInfoFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId) {
71   - if (checkInspectionStageField4apply(fieldVO.getInspectionStageFields()) ||
72   - checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()) ||
73   - checkReportField4apply(fieldVO.getReportFields()) ||
74   - checkTrackStageField4apply(fieldVO.getTrackStageFields())) {
  71 + if ((Objects.nonNull(fieldVO.getInspectionStageFields()) && checkInspectionStageField4apply(fieldVO.getInspectionStageFields()))
  72 + || (Objects.nonNull(fieldVO.getProfitAnalysisFields()) && checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()))
  73 + || (Objects.nonNull(fieldVO.getReportFields()) && checkReportField4apply(fieldVO.getReportFields()))
  74 + || (Objects.nonNull(fieldVO.getTrackStageFields()) && checkTrackStageField4apply(fieldVO.getTrackStageFields()))) {
75 75 OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
76 76 fieldVO.setBaseFields(initOrderBaseField(OrderLockFieldEnum.LOCKED));
77 77 BeanUtils.copyProperties(fieldVO, lockFieldVO);
... ...
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
  View file @8143bdf
... ... @@ -83,5 +83,10 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
83 83 */
84 84 private String businessPerson;
85 85  
  86 + /**
  87 + * 0 管理员，1：业务员
  88 + */
  89 + private Integer auditType;
  90 +
86 91 }
87 92  
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @8143bdf
... ... @@ -299,9 +299,18 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp
299 299 */
300 300 private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) {
301 301 RoleEnum roleEnum = dataScope.getRole();
  302 + RoleEnum roleSelect = null;
302 303 if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
303 304 queryVO.setBusinessPerson(dataScope.getLoginUserName());
304 305 }
  306 + if (RoleEnum.ADMIN.getCode().equals(roleEnum.getCode())) {
  307 + if (Objects.nonNull(queryVO.getAuditType()) && 1 == queryVO.getAuditType()) {
  308 + roleEnum = RoleEnum.BUSINESS_USER;
  309 + }
  310 + if (Objects.nonNull(queryVO.getAuditType()) && 0 == queryVO.getAuditType()) {
  311 + roleSelect = RoleEnum.ADMIN;
  312 + }
  313 + }
305 314 Set<Long> orderIds = new HashSet<>();
306 315 if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
307 316 || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
... ... @@ -318,14 +327,20 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
318 327 orderIds.add(-1L);
319 328 }
320 329 }
321   - return new LambdaQueryWrapper<OrderFieldLockApplyDO>()
  330 + LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = new LambdaQueryWrapper<OrderFieldLockApplyDO>()
322 331 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
323 332 .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId())
324   - .like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode())
325 333 .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
326 334 .eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType())
327 335 .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
328 336 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
  337 + if (Objects.isNull(roleSelect)) {
  338 + queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
  339 + }else {
  340 + queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
  341 +
  342 + }
  343 + return queryWrapper;
329 344 }
330 345  
331 346 /**
... ...