Commit 42855bab1882f8badb13856a417d0946cf3473bd

Authored by 杨鸣坤
1 parent 4408c9ee

楚江ERP:获取详情增加返回审核按钮权限

@@ -413,6 +413,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor @@ -413,6 +413,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
413 @ApiModelProperty(value = "合同名称(销售合同、销售订单)") 413 @ApiModelProperty(value = "合同名称(销售合同、销售订单)")
414 private String title; 414 private String title;
415 415
  416 + /**
  417 + * 是否展示正式合同审核按钮(非持久化字段)
  418 + */
  419 + @ApiModelProperty(value = "是否展示正式合同审核按钮")
  420 + private Boolean showExamine;
  421 +
  422 + /**
  423 + * 是否展示标准合同审核按钮(非持久化字段)
  424 + */
  425 + @ApiModelProperty(value = "是否展示标准合同审核按钮")
  426 + private Boolean standardShowExamine;
  427 +
416 public GetContractDistributorStandardBo() { 428 public GetContractDistributorStandardBo() {
417 429
418 } 430 }
@@ -137,7 +137,26 @@ public class ContractDistributorStandardServiceImpl extends @@ -137,7 +137,26 @@ public class ContractDistributorStandardServiceImpl extends
137 @Override 137 @Override
138 public ContractDistributorStandard findById(String id) { 138 public ContractDistributorStandard findById(String id) {
139 139
140 - return getBaseMapper().selectById(id); 140 + ContractDistributorStandard data = getBaseMapper().selectById(id);
  141 + // 获取当前人员的待办任务数据
  142 + List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
  143 + if (CollectionUtils.isEmpty(flowTaskList)) {
  144 + return data;
  145 + }
  146 +
  147 + Set<String> formalContractIds = flowTaskList.stream()
  148 + .filter(flowTaskDto -> FORMAL_FLAG.equals(flowTaskDto.getMode()))
  149 + .map(FlowTaskDto::getBusinessId)
  150 + .collect(Collectors.toSet());
  151 + Set<String> standardContractIds = flowTaskList.stream()
  152 + .filter(flowTaskDto -> STANDARD_FLAG.equals(flowTaskDto.getMode()))
  153 + .map(FlowTaskDto::getBusinessId)
  154 + .collect(Collectors.toSet());
  155 +
  156 + data.setShowExamine(formalContractIds.contains(data.getId()) || formalContractIds.contains(data.getParentId()));
  157 + data.setStandardShowExamine(standardContractIds.contains(data.getId()));
  158 +
  159 + return data;
141 } 160 }
142 161
143 @OpLog(type = OtherOpLogType.class, name = "新增合同,ID:{}", params = {"#id"}) 162 @OpLog(type = OtherOpLogType.class, name = "新增合同,ID:{}", params = {"#id"})