Commit 51919433544845e0a45be862bf5db5b416ce7b3e

Authored by yeqianyong
1 parent 8a077232

楚江erp:补货单详情接口逻辑调整

... ... @@ -130,6 +130,24 @@ public class GetReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
130 130 private String statusName;
131 131
132 132 /**
  133 + * 是否展示审核按钮(非持久化字段)
  134 + */
  135 + @ApiModelProperty("是否展示审核按钮(非持久化字段)")
  136 + private Boolean showExamine;
  137 +
  138 + /**
  139 + * 是否为拥有人(非持久化字段)
  140 + */
  141 + @ApiModelProperty("是否为拥有人(非持久化字段)")
  142 + private Boolean isOwner;
  143 +
  144 + /**
  145 + * 补货单是否已完成
  146 + */
  147 + @ApiModelProperty("补货单是否已完成")
  148 + private Boolean completed;
  149 +
  150 + /**
133 151 * 补货单物料行
134 152 */
135 153 @ApiModelProperty("补货单物料行")
... ...
... ... @@ -87,11 +87,17 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
87 87 return getBaseMapper().query(vo);
88 88 }
89 89
90   - @Cacheable(value = ReplenishmentOrder.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
91 90 @Override
92 91 public ReplenishmentOrder findById(String id) {
93   -
94   - return getBaseMapper().selectById(id);
  92 + ReplenishmentOrder replenishmentOrder = getBaseMapper().selectById(id);
  93 + // 是否为拥有人
  94 + replenishmentOrder.setIsOwner(replenishmentOrder.getCreateById().equals(SecurityUtil.getCurrentUser().getId()));
  95 + // 获取当前人员的待办任务数据
  96 + List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
  97 + List<String> businessIds = CollectionUtils.emptyIfNull(flowTaskList).stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
  98 + replenishmentOrder.setShowExamine(businessIds.contains(replenishmentOrder.getId()));
  99 +
  100 + return replenishmentOrder;
95 101 }
96 102
97 103 @OpLog(type = OtherOpLogType.class, name = "新增补货单,ID:{}", params = {"#id"})
... ...