Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
5a164f4e
Commit
5a164f4e
authored
Nov 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop'
parents
6544f82c
cfdb5b70
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
12 deletions
+22
-12
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+22
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
5a164f4e
...
...
@@ -253,6 +253,9 @@ public class FascUtil {
pushLog
.
setTaskStatus
(
res
.
isSuccess
()
?
CommonConstants
.
ONE_STRING
:
CommonConstants
.
TWO_STRING
);
tFascPushLogService
.
updateById
(
pushLog
);
// 参与方控件,要排除掉
// key是docID+控件ID
Map
<
String
,
Integer
>
fillMap
=
new
HashMap
<>();
if
(
res
.
isSuccess
()
&&
res
.
getData
()
!=
null
&&
res
.
getData
().
getActors
()
!=
null
&&
!
res
.
getData
().
getActors
().
isEmpty
())
{
String
companyActorId
=
null
;
...
...
@@ -270,6 +273,11 @@ public class FascUtil {
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorId
()))
{
personActorId
=
actor
.
getActorInfo
().
getActorId
();
}
if
(
actor
.
getFillFields
()
!=
null
&&
!
actor
.
getFillFields
().
isEmpty
())
{
for
(
FillActorFieldInfo
a
:
actor
.
getFillFields
())
{
fillMap
.
put
(
a
.
getFieldDocId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
a
.
getFieldId
(),
CommonConstants
.
ONE_INT
);
}
}
}
template
.
setCompanyActorId
(
companyActorId
);
template
.
setPersonActorId
(
personActorId
);
...
...
@@ -288,19 +296,21 @@ public class FascUtil {
fieldType
=
fields
.
getFieldType
();
if
(
Common
.
isNotNull
(
fieldType
))
{
if
(
FascConstants
.
FIELD_TEXT_TYPE
.
contains
(
fieldType
))
{
// 文本数字等控件
detail
=
new
TFascTemplateDetail
();
detail
.
setSignTemplateId
(
signTemplateId
);
detail
.
setFascDocId
(
docId
);
detail
.
setFascField
(
fields
.
getFieldName
());
detail
.
setFascFieldId
(
fields
.
getFieldId
());
isMust
=
CommonConstants
.
ONE_STRING
;
if
(
this
.
isFieldNotRequired
(
fields
,
fieldType
))
{
isMust
=
CommonConstants
.
ZERO_STRING
;
if
(
fillMap
.
get
(
docId
+
CommonConstants
.
DOWN_LINE_STRING
+
fields
.
getFieldId
())
==
null
)
{
// 文本数字等控件
detail
=
new
TFascTemplateDetail
();
detail
.
setSignTemplateId
(
signTemplateId
);
detail
.
setFascDocId
(
docId
);
detail
.
setFascField
(
fields
.
getFieldName
());
detail
.
setFascFieldId
(
fields
.
getFieldId
());
isMust
=
CommonConstants
.
ONE_STRING
;
if
(
this
.
isFieldNotRequired
(
fields
,
fieldType
))
{
isMust
=
CommonConstants
.
ZERO_STRING
;
}
detail
.
setIsMust
(
isMust
);
detail
.
setDeleteFlag
(
CommonConstants
.
NOT_DELETE_FLAG
);
detailList
.
add
(
detail
);
}
detail
.
setIsMust
(
isMust
);
detail
.
setDeleteFlag
(
CommonConstants
.
NOT_DELETE_FLAG
);
detailList
.
add
(
detail
);
}
else
if
(
FascConstants
.
FIELD_ZHANG_TYPE
.
contains
(
fieldType
))
{
// 章控件
if
(
zhangName
.
length
()
>
0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment