32b0209f by xiaojie

【数据资产】

1、加工单加工明细新增、修改参数
1 parent b742fc86
......@@ -559,14 +559,11 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
}
// 判断最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据
MfEnterpriseChangeApprove mfEnterpriseChangeApprove = approveList.get(0);
if ("B".equals(mfEnterpriseChangeApprove.getBizApproveState())) {
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);
}
} else if (ApprovalStateEnum.CHECKING.getValue().equals(mfEnterpriseChangeApprove.getBizApproveState())) {
enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class);
}
// 只显示审批通过的变更历史
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!