e7b1ebbd by xiaojie

【数据资产】

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