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
1e5ce3fa
Commit
1e5ce3fa
authored
Oct 17, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
c6896097
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
62 additions
and
2 deletions
+62
-2
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+5
-0
TDispatchInfoPreVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
+11
-0
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+10
-0
TEmployeeContractPreService.java
...v1/yifu/archives/service/TEmployeeContractPreService.java
+6
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+28
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+1
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
1e5ce3fa
...
@@ -289,6 +289,11 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -289,6 +289,11 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
TAttaInfo
>
attaList
;
private
List
<
TAttaInfo
>
attaList
;
@Schema
(
description
=
"超期标识 0已超期 1未超期"
)
private
String
overFlag
;
@Schema
(
description
=
"催办标识 0已催办 1未催办"
)
private
String
isUrg
;
@Schema
(
description
=
"法大大模版ID"
)
@Schema
(
description
=
"法大大模版ID"
)
private
String
fadadaTemplateId
;
private
String
fadadaTemplateId
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
View file @
1e5ce3fa
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -172,6 +173,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -172,6 +173,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"入职日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"入职日期"
,
isDate
=
true
)
@Schema
(
description
=
"入职日期"
)
@Schema
(
description
=
"入职日期"
)
@ExcelProperty
(
"入职日期"
)
@ExcelProperty
(
"入职日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
joinLeaveDate
;
private
Date
joinLeaveDate
;
/**
/**
* 前端客服姓名
* 前端客服姓名
...
@@ -193,6 +195,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -193,6 +195,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"预计派单时间"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"预计派单时间"
,
isDate
=
true
)
@Schema
(
description
=
"预计派单时间"
)
@Schema
(
description
=
"预计派单时间"
)
@ExcelProperty
(
"预计派单时间"
)
@ExcelProperty
(
"预计派单时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
expectedCollectionTime
;
private
Date
expectedCollectionTime
;
/**
/**
* 预计派单时间
* 预计派单时间
...
@@ -205,6 +208,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -205,6 +208,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"派单确认时间"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"派单确认时间"
,
isDate
=
true
)
@Schema
(
description
=
"派单确认时间"
)
@Schema
(
description
=
"派单确认时间"
)
@ExcelProperty
(
"派单确认时间"
)
@ExcelProperty
(
"派单确认时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
expectedConfirmTime
;
private
Date
expectedConfirmTime
;
/**
/**
* 是否自动触发派增 0 是 1否
* 是否自动触发派增 0 是 1否
...
@@ -247,6 +251,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -247,6 +251,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"起缴日期"
)
@Schema
(
description
=
"起缴日期"
)
@ExcelProperty
(
"起缴日期"
)
@ExcelProperty
(
"起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
socialStartDate
;
private
Date
socialStartDate
;
/**
/**
* 养老起缴日期
* 养老起缴日期
...
@@ -254,6 +259,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -254,6 +259,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"养老起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"养老起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"养老起缴日期"
)
@Schema
(
description
=
"养老起缴日期"
)
@ExcelProperty
(
"养老起缴日期"
)
@ExcelProperty
(
"养老起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
pensionStart
;
private
Date
pensionStart
;
/**
/**
* 医疗起缴日期
* 医疗起缴日期
...
@@ -261,6 +267,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -261,6 +267,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"医疗起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"医疗起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"医疗起缴日期"
)
@Schema
(
description
=
"医疗起缴日期"
)
@ExcelProperty
(
"医疗起缴日期"
)
@ExcelProperty
(
"医疗起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
medicalStart
;
private
Date
medicalStart
;
/**
/**
* 失业起缴日期
* 失业起缴日期
...
@@ -268,6 +275,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -268,6 +275,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"失业起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"失业起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"失业起缴日期"
)
@Schema
(
description
=
"失业起缴日期"
)
@ExcelProperty
(
"失业起缴日期"
)
@ExcelProperty
(
"失业起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
unemployStart
;
private
Date
unemployStart
;
/**
/**
* 工伤起缴日期
* 工伤起缴日期
...
@@ -275,6 +283,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -275,6 +283,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"工伤起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"工伤起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"工伤起缴日期"
)
@Schema
(
description
=
"工伤起缴日期"
)
@ExcelProperty
(
"工伤起缴日期"
)
@ExcelProperty
(
"工伤起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
workInjuryStart
;
private
Date
workInjuryStart
;
/**
/**
* 生育起缴日期
* 生育起缴日期
...
@@ -282,6 +291,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -282,6 +291,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"生育起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"生育起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"生育起缴日期"
)
@Schema
(
description
=
"生育起缴日期"
)
@ExcelProperty
(
"生育起缴日期"
)
@ExcelProperty
(
"生育起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
birthStart
;
private
Date
birthStart
;
/**
/**
* 大病起缴日期
* 大病起缴日期
...
@@ -289,6 +299,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -289,6 +299,7 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"大病起缴日期"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"大病起缴日期"
,
isDate
=
true
)
@Schema
(
description
=
"大病起缴日期"
)
@Schema
(
description
=
"大病起缴日期"
)
@ExcelProperty
(
"大病起缴日期"
)
@ExcelProperty
(
"大病起缴日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
bigailmentStart
;
private
Date
bigailmentStart
;
/**
/**
* 委托备注
* 委托备注
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
1e5ce3fa
...
@@ -284,4 +284,14 @@ public class TEmployeeContractPreController {
...
@@ -284,4 +284,14 @@ public class TEmployeeContractPreController {
public
R
electronicSignExpiringReminder
()
{
public
R
electronicSignExpiringReminder
()
{
return
tEmployeeContractPreService
.
electronicSignExpiringReminder
();
return
tEmployeeContractPreService
.
electronicSignExpiringReminder
();
}
}
/**
* 一键催办
* @param idList 一键催办列表
**/
@Operation
(
description
=
"一键催办"
)
@PostMapping
(
"/contractUrg"
)
public
R
contractUrg
(
@RequestBody
List
<
String
>
idList
)
{
return
tEmployeeContractPreService
.
contractUrg
(
idList
);
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreService.java
View file @
1e5ce3fa
...
@@ -97,4 +97,10 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
...
@@ -97,4 +97,10 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
*/
*/
R
electronicSignExpiringReminder
();
R
electronicSignExpiringReminder
();
/**
* 合同待签订一键催办
* @param idList id集合
* @return
*/
R
contractUrg
(
List
<
String
>
idList
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
1e5ce3fa
...
@@ -947,6 +947,11 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -947,6 +947,11 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
});
});
stats
.
setExpiringCount
(
stats
.
getExpiringCount
()
+
1
);
stats
.
setExpiringCount
(
stats
.
getExpiringCount
()
+
1
);
}
}
//更新催办和超期标识标识
contract
.
setOverFlag
(
CommonConstants
.
ZERO_STRING
);
if
(
Common
.
isEmpty
(
contract
.
getIsUrg
()))
{
contract
.
setIsUrg
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
}
}
}
...
@@ -971,7 +976,29 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -971,7 +976,29 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return
R
.
failed
(
"执行电子签合同即将超期提醒任务时发生异常:"
+
e
.
getMessage
());
return
R
.
failed
(
"执行电子签合同即将超期提醒任务时发生异常:"
+
e
.
getMessage
());
}
}
}
}
@Override
public
R
contractUrg
(
List
<
String
>
idList
)
{
// 查询所有待催办的合同
List
<
TEmployeeContractPre
>
signingContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
()
.
eq
(
TEmployeeContractPre:
:
getIsUrg
,
CommonConstants
.
ONE_STRING
)
.
in
(
TEmployeeContractPre:
:
getId
,
idList
)
);
if
(
Common
.
isNotNull
(
signingContracts
)
&&
signingContracts
.
size
()
>
0
)
{
try
{
for
(
TEmployeeContractPre
pre
:
signingContracts
)
{
fascService
.
urgeTask
(
pre
.
getId
());
pre
.
setIsUrg
(
CommonConstants
.
ZERO_STRING
);
baseMapper
.
updateById
(
pre
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"发送法大大催办时发生异常"
,
e
);
}
}
return
R
.
ok
();
}
/**
/**
* 计算入职一个月最后一天往前3个工作日的日期列表
* 计算入职一个月最后一天往前3个工作日的日期列表
* @param lastDay 入职一个月的最后一天
* @param lastDay 入职一个月的最后一天
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
1e5ce3fa
...
@@ -283,6 +283,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -283,6 +283,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
preExit
))
{
if
(
Common
.
isNotNull
(
preExit
))
{
TDispatchInfoPreVo
pre
=
new
TDispatchInfoPreVo
();
TDispatchInfoPreVo
pre
=
new
TDispatchInfoPreVo
();
BeanUtils
.
copyProperties
(
preExit
,
pre
);
BeanUtils
.
copyProperties
(
preExit
,
pre
);
preSocialListVo
.
setDispatchInfoPreVo
(
pre
);
preSocialListVo
.
setDispatchInfoPreVo
(
pre
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
1e5ce3fa
...
@@ -4430,7 +4430,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4430,7 +4430,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//针对社保自动化过来的数据,办理更新待购买数据状态
//针对社保自动化过来的数据,办理更新待购买数据状态
TDispatchInfoPre
dispatchInfoPre
=
dispatchInfoPreMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
TDispatchInfoPre
dispatchInfoPre
=
dispatchInfoPreMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getSocialFundId
,
sf
.
getId
())
.
eq
(
TDispatchInfoPre:
:
getSocialFundId
,
sf
.
getId
())
.
eq
(
TDispatchInfoPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
)
.
in
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"5"
,
"6"
,
"9"
)
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
dispatchInfoPre
))
{
if
(
Common
.
isNotNull
(
dispatchInfoPre
))
{
//此处状态可能会更新为 办理成功 办理中 部分办理失败和办理失败
//此处状态可能会更新为 办理成功 办理中 部分办理失败和办理失败
...
...
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