canrd-outside / order-erp · Commits

Commit a4c3047ddf8de4695fa4d776dbc64251b6557ccd

Authored by qdlgxiemaosheng
1 parent 03e68566
build: skipped

feat:基础信息权限审批

Inline Side-by-side
Showing 3 changed files with 12 additions and 5 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
  View file @a4c3047
1 1 package com.order.erp.common.utils;
2 2  
3 3 import com.alibaba.fastjson.JSONObject;
  4 +import com.order.erp.common.constant.Constant;
4 5 import com.order.erp.domain.ApplyStatusEnum;
5 6 import com.order.erp.domain.ApplyTypeEnum;
6 7 import com.order.erp.domain.OrderLockFieldEnum;
... ... @@ -54,7 +55,7 @@ public class OrderFieldUtils {
54 55 lockFieldVO.setReportFields(initReportField(OrderLockFieldEnum.LOCKED));
55 56 lockFieldVO.setTrackStageFields(initTrackStageField(OrderLockFieldEnum.LOCKED));
56 57 applyDO.setFields(JSONObject.toJSONString(lockFieldVO));
57   - applyDO.setAuditRoleCodes(RoleEnum.BUSINESS_USER.getCode());
  58 + applyDO.setAuditRoleCodes(RoleEnum.BUSINESS_USER.getCode() + Constant.COMMA_CHARACTER + RoleEnum.ADMIN.getCode());
58 59 return applyDO;
59 60 } else {
60 61 return null;
... ...
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
  View file @a4c3047
... ... @@ -78,5 +78,10 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
78 78 */
79 79 private List<String> productionDepartment;
80 80  
  81 + /**
  82 + * 业务员
  83 + */
  84 + private String businessPerson;
  85 +
81 86 }
82 87  
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @a4c3047
... ... @@ -299,13 +299,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
299 299 */
300 300 private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) {
301 301 RoleEnum roleEnum = dataScope.getRole();
302   - if (dataScope.isAdmin().getIsAdmin()) {
303   - roleEnum = null;
  302 + if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
  303 + queryVO.setBusinessPerson(dataScope.getLoginUserName());
304 304 }
305 305 Set<Long> orderIds = new HashSet<>();
306   - if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
  306 + if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
307 307 || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
308 308 List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
  309 + .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
309 310 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
310 311 .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
311 312 .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
... ... @@ -422,7 +423,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
422 423 recordField.setInspectionStageFields(applyField.getInspectionStageFields());
423 424 recordDO.setFields(JSONObject.toJSONString(recordField));
424 425 }
425   - }else {
  426 + } else {
426 427 recordDO.setFields(applyDO.getFields());
427 428 }
428 429  
... ...