Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
csbr-daop
/
ms-data-circulation-portal-service
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
32b0209f
authored
2025-03-14 17:47:33 +0800
by
xiaojie
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
【数据资产】
1、加工单加工明细新增、修改参数
1 parent
b742fc86
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
4 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
View file @
32b0209
...
...
@@ -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
);
}
// 只显示审批通过的变更历史
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment