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
0a7e35b9
Commit
0a7e35b9
authored
Nov 03, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
2cfeb7ad
cfdb5b70
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
16 deletions
+49
-16
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+5
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+3
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+1
-0
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+22
-12
pom.xml
yifu-ekp/yifu-ekp-api/pom.xml
+18
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
0a7e35b9
...
...
@@ -137,13 +137,17 @@ public class TEmployeeContractPreController {
YifuUser
user
=
SecurityUtils
.
getUser
();
//如果是电子签发起线下签先更新为线下签
if
(
null
!=
signType
&&
null
!=
idList
)
{
TEmployeeContractPre
tEmployeeContractPre
;
// 2025-11-3 14:54:57 测试(龙弟)说发起线下签署,如果是电子签,将撤销原因,是否撤销还原到初始的
for
(
String
id
:
idList
)
{
TEmployeeContractPre
tEmployeeContractPre
=
tEmployeeContractPreService
.
getById
(
id
);
tEmployeeContractPre
=
tEmployeeContractPreService
.
getById
(
id
);
if
(
tEmployeeContractPre
!=
null
&&
"0"
.
equals
(
tEmployeeContractPre
.
getSignType
()))
{
tEmployeeContractPre
.
setSignType
(
"1"
);
tEmployeeContractPre
.
setChangeTypeReason
(
"手动派单转为线下签"
);
tEmployeeContractPre
.
setChangeTypeUser
(
user
.
getNickname
());
tEmployeeContractPre
.
setChangeTypeTime
(
DateUtil
.
getCurrentDateTime
());
tEmployeeContractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
tEmployeeContractPre
.
setRevokeReason
(
""
);
tEmployeeContractPreService
.
updateById
(
tEmployeeContractPre
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
0a7e35b9
...
...
@@ -561,6 +561,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorTime
(
null
);
contractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPre
.
setRevokeReason
(
""
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
0a7e35b9
...
...
@@ -616,6 +616,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
NINE_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FOUR_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TEN_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
EIGHT_STRING
));
if
(
Common
.
isEmpty
(
contractPreList
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
0a7e35b9
...
...
@@ -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
)
{
...
...
yifu-ekp/yifu-ekp-api/pom.xml
View file @
0a7e35b9
...
...
@@ -21,6 +21,17 @@
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-common-core
</artifactId>
<exclusions>
<exclusion>
<groupId>
cn.hutool
</groupId>
<artifactId>
hutool-all
</artifactId>
</exclusion>
<exclusion>
<groupId>
cn.hutool
</groupId>
<artifactId>
hutool-crypto
</artifactId>
</exclusion>
<!-- 排除所有可能的 hutool 模块 -->
</exclusions>
</dependency>
<!--swagger 注解-->
<dependency>
...
...
@@ -90,11 +101,15 @@
<version>
1.2.0
</version>
</dependency>
<!-- 交行jar引入 -->
<dependency>
<
!--<
dependency>
<groupId>com.ipct.safety</groupId>
<artifactId>ipct_safety</artifactId>
<version>
2.1.
0
</version>
<version>2.1.
1
</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.5.8</version>
</dependency>-->
</dependencies>
</project>
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