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
f7357ea3
Commit
f7357ea3
authored
Jun 19, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
96902a74
19988efd
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
4 deletions
+43
-4
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+36
-1
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+2
-2
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+1
-1
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+4
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
f7357ea3
...
@@ -101,6 +101,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -101,6 +101,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private
final
TEmployeeContractPreMapper
contractPreMapper
;
private
final
TEmployeeContractPreMapper
contractPreMapper
;
private
final
TGzOfferInfoMapper
gzOfferInfoMapper
;
/**
/**
* 员工合同信息表简单分页查询
* 员工合同信息表简单分页查询
*
*
...
@@ -528,6 +530,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -528,6 +530,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
}
}
//瓜子项目编码:皖A694302
if
(
CommonConstants
.
GZ_DEPT_NO
.
equals
(
tEmployeeContractInfo
.
getDeptNo
()))
{
//合同申请瓜子合同状态更新成待签署
updateGzOfferStatus
(
tEmployeeContractInfo
.
getEmpIdcard
(),
CommonConstants
.
TWELVE_STRING
,
CommonConstants
.
THIRTEEN_STRING
);
}
}
else
{
}
else
{
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
...
@@ -614,7 +621,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -614,7 +621,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
audit
.
setRootName
(
"提交申请"
);
audit
.
setRootName
(
"提交申请"
);
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreName
()))
{
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreName
()))
{
audit
.
setCreateName
(
tEmployeeContractInfo
.
getPreName
());
audit
.
setCreateName
(
tEmployeeContractInfo
.
getPreName
());
audit
.
setCreateBy
(
"1"
);
}
}
}
}
if
(
CommonConstants
.
dingleDigitIntArray
[
2
]
==
tEmployeeContractInfo
.
getAuditStatus
())
{
if
(
CommonConstants
.
dingleDigitIntArray
[
2
]
==
tEmployeeContractInfo
.
getAuditStatus
())
{
...
@@ -871,6 +877,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -871,6 +877,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
//瓜子项目编码:皖A694302
if
(
CommonConstants
.
GZ_DEPT_NO
.
equals
(
contractInfo
.
getDeptNo
()))
{
//审核通过瓜子合同状态更新合同审核通过
updateGzOfferStatus
(
contractInfo
.
getEmpIdcard
(),
CommonConstants
.
THIRTEEN_STRING
,
CommonConstants
.
EIGHT_STRING
);
}
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
//更新合同状态为3线下签审核不通过
//更新合同状态为3线下签审核不通过
...
@@ -991,6 +1002,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -991,6 +1002,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setProcessStatus
(
CommonConstants
.
NINE_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
NINE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
//瓜子项目编码:皖A694302
if
(
CommonConstants
.
GZ_DEPT_NO
.
equals
(
tEmployeeContractInfo
.
getDeptNo
()))
{
//合同归档瓜子合同状态更新已归档
updateGzOfferStatus
(
tEmployeeContractInfo
.
getEmpIdcard
(),
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
NINETY_NINE
);
}
return
R
.
ok
();
return
R
.
ok
();
}
}
return
R
.
failed
(
"参数不可为空"
);
return
R
.
failed
(
"参数不可为空"
);
...
@@ -1928,6 +1944,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1928,6 +1944,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
//瓜子项目编码:皖A694302
if
(
CommonConstants
.
GZ_DEPT_NO
.
equals
(
contract
.
getDeptNo
()))
{
//审核通过瓜子合同状态更新成合同审核通过
updateGzOfferStatus
(
contract
.
getEmpIdcard
(),
CommonConstants
.
THIRTEEN_STRING
,
CommonConstants
.
EIGHT_STRING
);
}
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
3
])
{
//更新合同状态为3线下签审核不通过
//更新合同状态为3线下签审核不通过
...
@@ -2185,4 +2206,18 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2185,4 +2206,18 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
}
//更新瓜子offer状态
public
void
updateGzOfferStatus
(
String
idCard
,
String
preStatus
,
String
updStatus
)
{
TGzOfferInfo
gzOfferInfo
=
gzOfferInfoMapper
.
selectOne
(
Wrappers
.<
TGzOfferInfo
>
query
()
.
lambda
().
eq
(
TGzOfferInfo:
:
getNationalId
,
idCard
)
.
eq
(
TGzOfferInfo:
:
getOfferStatus
,
preStatus
)
.
eq
(
TGzOfferInfo:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
gzOfferInfo
))
{
gzOfferInfo
.
setOfferStatus
(
updStatus
);
gzOfferInfoMapper
.
updateById
(
gzOfferInfo
);
//todo 瓜子状态变更增加操作日志
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
f7357ea3
...
@@ -30,7 +30,6 @@ import lombok.RequiredArgsConstructor;
...
@@ -30,7 +30,6 @@ import lombok.RequiredArgsConstructor;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
...
@@ -342,13 +341,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -342,13 +341,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
baseMapper
.
updateById
(
pre
);
baseMapper
.
updateById
(
pre
);
}
}
if
(
Common
.
isNotNull
(
pre
.
getContractId
()))
{
if
(
Common
.
isNotNull
(
pre
.
getContractId
()))
{
//如果存在合同申请审核数据,将状态更新成
袋
提交
//如果存在合同申请审核数据,将状态更新成
待
提交
contractInfo
=
contractInfoService
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
contractInfo
=
contractInfoService
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getId
,
pre
.
getContractId
())
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getId
,
pre
.
getContractId
())
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractInfo
))
{
if
(
Common
.
isNotNull
(
contractInfo
))
{
contractInfo
.
setAuditStatus
(
CommonConstants
.
ZERO_INT
);
contractInfo
.
setAuditStatus
(
CommonConstants
.
ZERO_INT
);
contractInfo
.
setInUse
(
CommonConstants
.
ONE_STRING
);
contractInfoService
.
updateById
(
contractInfo
);
contractInfoService
.
updateById
(
contractInfo
);
}
}
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
f7357ea3
...
@@ -485,7 +485,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -485,7 +485,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
public
R
<
String
>
sendContractDownloadOfferMsg
(
TGzOfferInfoVo
tGzOfferInfo
)
{
public
R
<
String
>
sendContractDownloadOfferMsg
(
TGzOfferInfoVo
tGzOfferInfo
)
{
//获取所有满足条件的已归档的offer提醒的数据
//获取所有满足条件的已归档的offer提醒的数据
if
(
Common
.
isNotNull
(
tGzOfferInfo
))
{
if
(
Common
.
isNotNull
(
tGzOfferInfo
))
{
tGzOfferInfo
.
setOfferStatus
(
"99"
);
tGzOfferInfo
.
setOfferStatus
(
CommonConstants
.
NINETY_NINE
);
List
<
TGzOfferInfoVo
>
offerList
=
baseMapper
.
getTGzOfferInfoSendAlertList
(
tGzOfferInfo
);
List
<
TGzOfferInfoVo
>
offerList
=
baseMapper
.
getTGzOfferInfoSendAlertList
(
tGzOfferInfo
);
if
(
Common
.
isNotNull
(
offerList
)
&&
!
offerList
.
isEmpty
())
{
if
(
Common
.
isNotNull
(
offerList
)
&&
!
offerList
.
isEmpty
())
{
if
(
Common
.
isNotNull
(
offerList
)
&&
offerList
.
size
()
>
200
)
{
if
(
Common
.
isNotNull
(
offerList
)
&&
offerList
.
size
()
>
200
)
{
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
f7357ea3
...
@@ -671,4 +671,8 @@ public interface CommonConstants {
...
@@ -671,4 +671,8 @@ public interface CommonConstants {
//单条数据检索SQL
//单条数据检索SQL
public
static
final
String
SQL_LIMIT_ONE
=
" limit 1 "
;
public
static
final
String
SQL_LIMIT_ONE
=
" limit 1 "
;
String
POST_TYPE
=
"post_type"
;
String
POST_TYPE
=
"post_type"
;
String
GZ_DEPT_NO
=
"皖A694302"
;
String
NINETY_NINE
=
"99"
;
}
}
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