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
38a6a60b
Commit
38a6a60b
authored
Nov 04, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
690960df
d67b0572
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
18 deletions
+38
-18
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+35
-15
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
application-prd.yml
...al/yifu-social-biz/src/main/resources/application-prd.yml
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
38a6a60b
...
...
@@ -151,7 +151,12 @@ public class FascUtil {
// 超过1页的循环查询
if
(
listPageCount
>
1
)
{
for
(
int
i
=
2
;
i
<=
listPageCount
;
i
++)
{
getSignTemplateListReq
=
new
GetSignTemplateListReq
();
getSignTemplateListReq
.
setOwnerId
(
ownerId
);
getSignTemplateListReq
.
setListFilter
(
signTemplateListFilterInfo
);
getSignTemplateListReq
.
setAccessToken
(
accessToken
);
getSignTemplateListReq
.
setListPageNo
(
i
);
getSignTemplateListReq
.
setListPageSize
(
100
);
pushLog
=
new
TFascPushLog
();
pushLog
.
setTransReferenceId
(
company
.
getOpenId
());
...
...
@@ -168,7 +173,8 @@ public class FascUtil {
pushLog
.
setTaskStatus
(
res
.
isSuccess
()
?
CommonConstants
.
ONE_STRING
:
CommonConstants
.
TWO_STRING
);
tFascPushLogService
.
updateById
(
pushLog
);
if
(
res
.
getData
().
getSignTemplates
()
!=
null
&&
!
res
.
getData
().
getSignTemplates
().
isEmpty
())
{
if
(
res
.
isSuccess
()
&&
res
.
getData
()
!=
null
&&
res
.
getData
().
getSignTemplates
()
!=
null
&&
!
res
.
getData
().
getSignTemplates
().
isEmpty
())
{
list
.
addAll
(
res
.
getData
().
getSignTemplates
());
}
}
...
...
@@ -253,6 +259,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
;
...
...
@@ -261,15 +270,24 @@ public class FascUtil {
if
(
Common
.
isEmpty
(
companyActorId
)
&&
actor
.
getActorInfo
()
!=
null
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorType
())
&&
"corp"
.
equals
(
actor
.
getActorInfo
().
getActorType
())
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorId
()))
{
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorId
())
&&
actor
.
getActorInfo
().
getPermissions
()
!=
null
&&
actor
.
getActorInfo
().
getPermissions
().
contains
(
"sign"
))
{
companyActorId
=
actor
.
getActorInfo
().
getActorId
();
}
if
(
Common
.
isEmpty
(
personActorId
)
&&
actor
.
getActorInfo
()
!=
null
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorType
())
&&
"person"
.
equals
(
actor
.
getActorInfo
().
getActorType
())
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorId
()))
{
&&
Common
.
isNotNull
(
actor
.
getActorInfo
().
getActorId
())
&&
actor
.
getActorInfo
().
getPermissions
()
!=
null
&&
actor
.
getActorInfo
().
getPermissions
().
contains
(
"sign"
))
{
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 +306,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
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
38a6a60b
...
...
@@ -300,7 +300,7 @@
<include
refid=
"tEmployeeContractPre_where"
/>
</where>
order by a.create_time desc
limit 0,
5
limit 0,
2000
</select>
<!--tEmployeeContractPre导出查询-->
...
...
yifu-social/yifu-social-biz/src/main/resources/application-prd.yml
View file @
38a6a60b
...
...
@@ -74,5 +74,5 @@ wx:
corpid
:
wwbcb090af0dfe50e5
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid
:
1000010
authUrl
:
https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName
:
https://test-wx.worfu.com
\ No newline at end of file
authUrl
:
https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName
:
https://wx.worfu.com
\ No newline at end of file
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