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
d11d7495
Commit
d11d7495
authored
Nov 03, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
e655a8bd
8f453234
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
7 deletions
+35
-7
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
+3
-2
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+5
-0
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+6
-2
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+12
-1
TFascTemplateDetailMapper.xml
...z/src/main/resources/mapper/TFascTemplateDetailMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
d11d7495
...
@@ -137,13 +137,17 @@ public class TEmployeeContractPreController {
...
@@ -137,13 +137,17 @@ public class TEmployeeContractPreController {
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
//如果是电子签发起线下签先更新为线下签
//如果是电子签发起线下签先更新为线下签
if
(
null
!=
signType
&&
null
!=
idList
)
{
if
(
null
!=
signType
&&
null
!=
idList
)
{
TEmployeeContractPre
tEmployeeContractPre
;
// 2025-11-3 14:54:57 测试(龙弟)说发起线下签署,如果是电子签,将撤销原因,是否撤销还原到初始的
for
(
String
id
:
idList
)
{
for
(
String
id
:
idList
)
{
TEmployeeContractPre
tEmployeeContractPre
=
tEmployeeContractPreService
.
getById
(
id
);
tEmployeeContractPre
=
tEmployeeContractPreService
.
getById
(
id
);
if
(
tEmployeeContractPre
!=
null
&&
"0"
.
equals
(
tEmployeeContractPre
.
getSignType
()))
{
if
(
tEmployeeContractPre
!=
null
&&
"0"
.
equals
(
tEmployeeContractPre
.
getSignType
()))
{
tEmployeeContractPre
.
setSignType
(
"1"
);
tEmployeeContractPre
.
setSignType
(
"1"
);
tEmployeeContractPre
.
setChangeTypeReason
(
"手动派单转为线下签"
);
tEmployeeContractPre
.
setChangeTypeReason
(
"手动派单转为线下签"
);
tEmployeeContractPre
.
setChangeTypeUser
(
user
.
getNickname
());
tEmployeeContractPre
.
setChangeTypeUser
(
user
.
getNickname
());
tEmployeeContractPre
.
setChangeTypeTime
(
DateUtil
.
getCurrentDateTime
());
tEmployeeContractPre
.
setChangeTypeTime
(
DateUtil
.
getCurrentDateTime
());
tEmployeeContractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
tEmployeeContractPre
.
setRevokeReason
(
""
);
tEmployeeContractPreService
.
updateById
(
tEmployeeContractPre
);
tEmployeeContractPreService
.
updateById
(
tEmployeeContractPre
);
}
}
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
d11d7495
...
@@ -561,6 +561,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -561,6 +561,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorTime
(
null
);
contractPre
.
setErrorTime
(
null
);
contractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPre
.
setRevokeReason
(
""
);
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
d11d7495
...
@@ -616,6 +616,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -616,6 +616,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
NINE_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
NINE_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FOUR_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FOUR_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TEN_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TEN_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
EIGHT_STRING
));
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
EIGHT_STRING
));
if
(
Common
.
isEmpty
(
contractPreList
))
{
if
(
Common
.
isEmpty
(
contractPreList
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
...
@@ -948,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -948,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List
<
TEmployeeContractPre
>
revokedContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
List
<
TEmployeeContractPre
>
revokedContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
()
.
lambda
()
.
in
(
TEmployeeContractPre:
:
getContractId
,
contractIds
)
.
in
(
TEmployeeContractPre:
:
getContractId
,
contractIds
)
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
)
// 待发起
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
// 撤销签署-系统自动撤销
.
eq
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
eq
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
eq
(
TEmployeeContractPre:
:
get
Revok
eReason
,
"超时未签署自行变更为线下签"
)
.
eq
(
TEmployeeContractPre:
:
get
ChangeTyp
eReason
,
"超时未签署自行变更为线下签"
)
);
);
if
(
Common
.
isEmpty
(
revokedContracts
))
{
if
(
Common
.
isEmpty
(
revokedContracts
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
d11d7495
...
@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
simNew
.
put
(
"socialIsBuy"
,
isSocailBuyNew
);
simNew
.
put
(
"socialIsBuy"
,
isSocailBuyNew
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceSocialKey
,
logId
,
detailSocialLog
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceSocialKey
,
logId
,
detailSocialLog
);
detailList
.
add
(
detailSocialLog
);
detailList
.
add
(
detailSocialLog
);
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、社保信息"
;
}
else
{
diffTitle
=
"社保信息"
;
}
}
}
//查询老的社保明细
//查询老的社保明细
R
<
EmployeePreSocialListVo
>
socialSdr
=
socialDaprUtils
.
getSocialPreInfoList
(
empPreId
);
R
<
EmployeePreSocialListVo
>
socialSdr
=
socialDaprUtils
.
getSocialPreInfoList
(
empPreId
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
d11d7495
...
@@ -130,7 +130,9 @@ public class DoFascTask {
...
@@ -130,7 +130,9 @@ public class DoFascTask {
// 加日志
// 加日志
this
.
saveAuditLogFail
(
pre
,
"撤销签署成功"
,
terminationNote
);
this
.
saveAuditLogFail
(
pre
,
"撤销签署成功"
,
terminationNote
);
}
}
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
if
(!
CommonConstants
.
ELEVEN_STRING
.
equals
(
pre
.
getProcessStatus
()))
{
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
}
pre
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
pre
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
pre
.
setRevokeReason
(
terminationNote
);
pre
.
setRevokeReason
(
terminationNote
);
tEmployeeContractPreService
.
updateById
(
pre
);
tEmployeeContractPreService
.
updateById
(
pre
);
...
@@ -202,7 +204,9 @@ public class DoFascTask {
...
@@ -202,7 +204,9 @@ public class DoFascTask {
// 加日志
// 加日志
this
.
saveAuditLogFail
(
preHistory
,
"撤销签署成功"
,
terminationNote
);
this
.
saveAuditLogFail
(
preHistory
,
"撤销签署成功"
,
terminationNote
);
}
}
preHistory
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
if
(!
CommonConstants
.
ELEVEN_STRING
.
equals
(
preHistory
.
getProcessStatus
()))
{
preHistory
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
}
preHistory
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
preHistory
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
preHistory
.
setRevokeReason
(
terminationNote
);
preHistory
.
setRevokeReason
(
terminationNote
);
tEmployeeContractPreHistoryService
.
updateById
(
preHistory
);
tEmployeeContractPreHistoryService
.
updateById
(
preHistory
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
d11d7495
...
@@ -60,6 +60,8 @@ public class FascUtil {
...
@@ -60,6 +60,8 @@ public class FascUtil {
private
static
final
String
DATA_COVER
=
"dataCover"
;
private
static
final
String
DATA_COVER
=
"dataCover"
;
private
static
final
String
DATE_FORMAT
=
"dateFormat"
;
private
static
final
String
DATE_FORMAT
=
"dateFormat"
;
private
static
final
String
YEAR_STR
=
"年"
;
private
static
final
String
MONTH_STR
=
"个月"
;
private
static
final
SerializerFeature
[]
features
=
new
SerializerFeature
[]{
private
static
final
SerializerFeature
[]
features
=
new
SerializerFeature
[]{
WriteMapNullValue
,
WriteNullNumberAsZero
,
WriteNullListAsEmpty
,
WriteMapNullValue
,
WriteNullNumberAsZero
,
WriteNullListAsEmpty
,
...
@@ -459,7 +461,16 @@ public class FascUtil {
...
@@ -459,7 +461,16 @@ public class FascUtil {
fieldName
=
detail
.
getHrFieldId
();
fieldName
=
detail
.
getHrFieldId
();
fieldNameChinese
=
detail
.
getHrField
();
fieldNameChinese
=
detail
.
getHrField
();
if
(
FascConstants
.
CONTRACT_DURATION
.
equals
(
fieldName
))
{
if
(
FascConstants
.
CONTRACT_DURATION
.
equals
(
fieldName
))
{
fieldValue
=
contract
.
getContractDurationYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getContractDurationMonth
();
if
(
Common
.
isNotNull
(
contract
.
getContractDurationYear
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
contract
.
getContractDurationYear
()))
{
fieldValue
=
contract
.
getContractDurationYear
()
+
YEAR_STR
;
}
if
(
Common
.
isNotNull
(
contract
.
getContractDurationMonth
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
contract
.
getContractDurationMonth
()))
{
if
(
Common
.
isNotNull
(
fieldValue
))
{
fieldValue
+=
contract
.
getContractDurationMonth
()
+
MONTH_STR
;
}
else
{
fieldValue
=
contract
.
getContractDurationMonth
()
+
MONTH_STR
;
}
}
}
else
if
(
FascConstants
.
DISPATCH_PERIOD
.
equals
(
fieldName
))
{
}
else
if
(
FascConstants
.
DISPATCH_PERIOD
.
equals
(
fieldName
))
{
fieldValue
=
contract
.
getDispatchPeriodYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getDispatchPeriodMonth
();
fieldValue
=
contract
.
getDispatchPeriodYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getDispatchPeriodMonth
();
}
else
if
(
FascConstants
.
EMP_SEX
.
equals
(
fieldName
))
{
}
else
if
(
FascConstants
.
EMP_SEX
.
equals
(
fieldName
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateDetailMapper.xml
View file @
d11d7495
...
@@ -175,7 +175,7 @@
...
@@ -175,7 +175,7 @@
FROM t_fasc_template_detail a
FROM t_fasc_template_detail a
left join t_fasc_template b on a.sign_template_id = b.sign_template_id
left join t_fasc_template b on a.sign_template_id = b.sign_template_id
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field
where b.delete_Flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
where b.delete_Flag = '0' and a.
delete_flag = '0' and a.
hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
</select>
</select>
<!--tFascTemplateDetail简单分页查询-->
<!--tFascTemplateDetail简单分页查询-->
...
...
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