e7b1ebbd by xiaojie

【数据资产】

1、加工单加工明细新增、修改参数
1 parent 32b0209f
......@@ -557,12 +557,15 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
if(CollectionUtils.isEmpty(approveList)){
return enterpriseRSVO;
}
System.out.println("=========approveList," + JSON.toJSONString(approveList));
// 判断最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据
if ("B".equals(enterpriseRSVO.getBizApproveState())) {
Optional<MfEnterpriseChangeApprove> changeApproveOptFirst = approveList.stream().filter(item -> "2".equals(item.getDataType())).findFirst();
if (changeApproveOptFirst.isPresent()) {
enterpriseRSVO = csbrBeanUtil.convert(changeApproveOptFirst.get(), EnterpriseRSVO.class);
System.out.println("=========enterpriseRSVO," + JSON.toJSONString(enterpriseRSVO));
}
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!