【数据资产】
1、企业信息-根据登陆账号查询详情
Showing
1 changed file
with
2 additions
and
1 deletions
... | @@ -557,12 +557,13 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris | ... | @@ -557,12 +557,13 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris |
557 | return enterpriseRSVO; | 557 | return enterpriseRSVO; |
558 | } | 558 | } |
559 | 559 | ||
560 | // 判断变更历史数据 最新是否驳回 | 560 | // 判断最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据 |
561 | MfEnterpriseChangeApprove mfEnterpriseChangeApprove = approveList.get(0); | 561 | MfEnterpriseChangeApprove mfEnterpriseChangeApprove = approveList.get(0); |
562 | if (ApprovalStateEnum.CHECKING.getValue().equals(mfEnterpriseChangeApprove.getBizApproveState())) { | 562 | if (ApprovalStateEnum.CHECKING.getValue().equals(mfEnterpriseChangeApprove.getBizApproveState())) { |
563 | enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class); | 563 | enterpriseRSVO = csbrBeanUtil.convert(mfEnterpriseChangeApprove, EnterpriseRSVO.class); |
564 | } | 564 | } |
565 | 565 | ||
566 | // 只显示审批通过的变更历史 | ||
566 | List<MfEnterpriseChangeApprove> passChangeApproves = approveList.stream().filter(item -> ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState())).toList(); | 567 | List<MfEnterpriseChangeApprove> passChangeApproves = approveList.stream().filter(item -> ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState())).toList(); |
567 | if (ObjectUtils.isNotEmpty(passChangeApproves)) { | 568 | if (ObjectUtils.isNotEmpty(passChangeApproves)) { |
568 | List<ChangeApproveBean> beanList = getChangeBeanList(passChangeApproves); | 569 | List<ChangeApproveBean> beanList = getChangeBeanList(passChangeApproves); | ... | ... |
-
Please register or sign in to post a comment