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
a29790bb
Commit
a29790bb
authored
Oct 16, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
77dd2305
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
723 additions
and
59 deletions
+723
-59
CustomerExpiringStatistics.java
.../plus/v1/yifu/archives/vo/CustomerExpiringStatistics.java
+12
-0
CustomerRevokeStatistics.java
...ud/plus/v1/yifu/archives/vo/CustomerRevokeStatistics.java
+12
-0
CustomerStatistics.java
...fu/cloud/plus/v1/yifu/archives/vo/CustomerStatistics.java
+16
-0
TDispatchInfoPreVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
+9
-0
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+36
-0
TEmployeeContractPreService.java
...v1/yifu/archives/service/TEmployeeContractPreService.java
+18
-0
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+8
-7
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+530
-3
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+13
-13
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+1
-0
ArchiveTask.java
.../java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
+45
-0
TDispatchInfoPre.java
...fu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
+9
-0
TDispatchInfoPreController.java
...v1/yifu/social/controller/TDispatchInfoPreController.java
+2
-2
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+1
-1
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+11
-33
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/CustomerExpiringStatistics.java
0 → 100644
View file @
a29790bb
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
public
class
CustomerExpiringStatistics
implements
Serializable
{
private
String
customerUserLoginname
;
private
int
expiringCount
=
0
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/CustomerRevokeStatistics.java
0 → 100644
View file @
a29790bb
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
public
class
CustomerRevokeStatistics
implements
Serializable
{
private
String
customerUserLoginname
;
private
int
revokedCount
=
0
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/CustomerStatistics.java
0 → 100644
View file @
a29790bb
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
public
class
CustomerStatistics
implements
Serializable
{
private
String
customerUserLoginname
;
private
String
customerUsername
;
private
int
initiatedCount
=
0
;
private
int
failedCount
=
0
;
private
int
electronicSignFailedCount
=
0
;
private
int
offlineSignFailedCount
=
0
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
View file @
a29790bb
...
@@ -5,6 +5,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...
@@ -5,6 +5,7 @@ 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
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -344,6 +345,14 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -344,6 +345,14 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"合同签署状态 0已签署 1未签署"
)
@Schema
(
description
=
"合同签署状态 0已签署 1未签署"
)
@ExcelProperty
(
"合同签署状态"
)
@ExcelProperty
(
"合同签署状态"
)
private
String
contractStatus
;
private
String
contractStatus
;
/**
* 就职岗位
*/
@Length
(
max
=
50
,
message
=
"就职岗位 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"就职岗位"
,
maxLength
=
50
)
@Schema
(
description
=
"就职岗位"
)
@ExcelProperty
(
"就职岗位"
)
private
String
position
;
/**
/**
* 合同id
* 合同id
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
a29790bb
...
@@ -248,4 +248,40 @@ public class TEmployeeContractPreController {
...
@@ -248,4 +248,40 @@ public class TEmployeeContractPreController {
public
Boolean
checkContractPreIsExit
(
@RequestBody
EmpProjectStatusVo
vo
)
{
public
Boolean
checkContractPreIsExit
(
@RequestBody
EmpProjectStatusVo
vo
)
{
return
tEmployeeContractPreService
.
checkContractPreIsExit
(
vo
);
return
tEmployeeContractPreService
.
checkContractPreIsExit
(
vo
);
}
}
/**
* @Description: 每日晚23:00自动撤销超时电子签署任务
* @Author: huych
* @Date: 2025-10-15
* @return: R
**/
@Inner
@PostMapping
(
"/inner/autoRevokeElectronicSign"
)
public
R
autoRevokeElectronicSign
()
{
return
tEmployeeContractPreService
.
autoRevokeElectronicSign
();
}
/**
* @Description: 每日早9点通知前端客服前一日撤销电子签署情况
* @Author: huych
* @Date: 2025-10-15
* @return: R
**/
@Inner
@PostMapping
(
"/inner/notifyRevokedElectronicSign"
)
public
R
notifyRevokedElectronicSign
()
{
return
tEmployeeContractPreService
.
notifyRevokedElectronicSign
();
}
/**
* @Description: 每日早9点电子签合同即将超期提醒
* @Author: huych
* @Date: 2025-10-15
* @return: R
**/
@Inner
@PostMapping
(
"/inner/electronicSignExpiringReminder"
)
public
R
electronicSignExpiringReminder
()
{
return
tEmployeeContractPreService
.
electronicSignExpiringReminder
();
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreService.java
View file @
a29790bb
...
@@ -79,4 +79,22 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
...
@@ -79,4 +79,22 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
);
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
);
/**
* 每日晚23:00自动撤销超时电子签署任务
* @return R
*/
R
autoRevokeElectronicSign
();
/**
* 每日早9点通知前端客服前一日撤销电子签署情况
* @return R
*/
R
notifyRevokedElectronicSign
();
/**
* 每日早9点电子签合同即将超期提醒
* @return R
*/
R
electronicSignExpiringReminder
();
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
a29790bb
...
@@ -21,6 +21,7 @@ import com.fasc.open.api.exception.ApiException;
...
@@ -21,6 +21,7 @@ import com.fasc.open.api.exception.ApiException;
import
com.fasc.open.api.v5_1.res.template.SignTemplateListInfo
;
import
com.fasc.open.api.v5_1.res.template.SignTemplateListInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.FddContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.FddContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.FascUtil
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.FascUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
@@ -49,7 +50,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -49,7 +50,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
private
final
TFascPushLogService
tFascPushLogService
;
private
final
TFascPushLogService
tFascPushLogService
;
private
final
TFascTemplateService
tFascTemplateService
;
private
final
TFascTemplateService
tFascTemplateService
;
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
private
final
TEmployeeContractPre
Service
tEmployeeContractPreService
;
private
final
TEmployeeContractPre
Mapper
tEmployeeContractPreMapper
;
@Override
@Override
public
R
<
String
>
getTemplate
(
String
templateName
)
throws
ApiException
{
public
R
<
String
>
getTemplate
(
String
templateName
)
throws
ApiException
{
...
@@ -170,7 +171,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -170,7 +171,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
@Override
@Override
public
R
<
String
>
submitContract
(
String
id
)
throws
ApiException
{
public
R
<
String
>
submitContract
(
String
id
)
throws
ApiException
{
// templateName 签署任务模板名称
// templateName 签署任务模板名称
TEmployeeContractPre
contract
=
tEmployeeContractPre
Service
.
ge
tById
(
id
);
TEmployeeContractPre
contract
=
tEmployeeContractPre
Mapper
.
selec
tById
(
id
);
if
(
contract
==
null
)
{
if
(
contract
==
null
)
{
return
R
.
failed
(
"未找到合同"
);
return
R
.
failed
(
"未找到合同"
);
}
}
...
@@ -194,7 +195,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -194,7 +195,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
}
}
// TODO - 判断是否入职超过1个月
// TODO - 判断是否入职超过1个月
R
<
String
>
requestInfo
=
fascUtil
.
submitContract
(
contract
,
tFascPushLogService
,
tEmployeeContractPre
Service
);
R
<
String
>
requestInfo
=
fascUtil
.
submitContract
(
contract
,
tFascPushLogService
,
tEmployeeContractPre
Mapper
);
return
requestInfo
;
return
requestInfo
;
}
}
...
@@ -209,7 +210,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -209,7 +210,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
@Override
@Override
public
R
<
String
>
cancelTask
(
String
id
)
throws
ApiException
{
public
R
<
String
>
cancelTask
(
String
id
)
throws
ApiException
{
// templateName 签署任务模板名称
// templateName 签署任务模板名称
TEmployeeContractPre
contract
=
tEmployeeContractPre
Service
.
ge
tById
(
id
);
TEmployeeContractPre
contract
=
tEmployeeContractPre
Mapper
.
selec
tById
(
id
);
if
(
contract
==
null
)
{
if
(
contract
==
null
)
{
return
R
.
failed
(
"未找到合同"
);
return
R
.
failed
(
"未找到合同"
);
}
}
...
@@ -218,7 +219,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -218,7 +219,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
}
}
// TODO - 判断什么状态撤销等,需要产品定
// TODO - 判断什么状态撤销等,需要产品定
return
fascUtil
.
cancelTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPre
Service
);
return
fascUtil
.
cancelTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPre
Mapper
);
}
}
...
@@ -232,7 +233,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -232,7 +233,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
@Override
@Override
public
R
<
String
>
urgeTask
(
String
id
)
throws
ApiException
{
public
R
<
String
>
urgeTask
(
String
id
)
throws
ApiException
{
// templateName 签署任务模板名称
// templateName 签署任务模板名称
TEmployeeContractPre
contract
=
tEmployeeContractPre
Service
.
ge
tById
(
id
);
TEmployeeContractPre
contract
=
tEmployeeContractPre
Mapper
.
selec
tById
(
id
);
if
(
contract
==
null
)
{
if
(
contract
==
null
)
{
return
R
.
failed
(
"未找到合同"
);
return
R
.
failed
(
"未找到合同"
);
}
}
...
@@ -241,7 +242,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -241,7 +242,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
}
}
// TODO - 判断什么状态催办等,需要产品定
// TODO - 判断什么状态催办等,需要产品定
return
fascUtil
.
urgeTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPre
Service
);
return
fascUtil
.
urgeTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPre
Mapper
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
a29790bb
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
a29790bb
...
@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre;
...
@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascPushLog
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascPushLog
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplateDetail
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplateDetail
;
import
com.yifu.cloud.plus.v1.yifu.archives.
service.TEmployeeContractPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.
mapper.TEmployeeContractPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascPushLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascPushLogService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
@@ -313,7 +313,7 @@ public class FascUtil {
...
@@ -313,7 +313,7 @@ public class FascUtil {
}
}
public
R
<
String
>
submitContract
(
TEmployeeContractPre
contract
,
TFascPushLogService
tFascPushLogService
public
R
<
String
>
submitContract
(
TEmployeeContractPre
contract
,
TFascPushLogService
tFascPushLogService
,
TEmployeeContractPre
Service
tEmployeeContractPreService
)
throws
ApiException
{
,
TEmployeeContractPre
Mapper
tEmployeeContractPreMapper
)
throws
ApiException
{
OpenApiClient
openApiClient
=
new
OpenApiClient
(
fascConfig
.
getAppId
(),
fascConfig
.
getAppSecret
(),
fascConfig
.
getAppUrl
());
OpenApiClient
openApiClient
=
new
OpenApiClient
(
fascConfig
.
getAppId
(),
fascConfig
.
getAppSecret
(),
fascConfig
.
getAppUrl
());
String
accessToken
=
this
.
getFascToken
(
openApiClient
);
String
accessToken
=
this
.
getFascToken
(
openApiClient
);
OpenId
openId
=
new
OpenId
();
OpenId
openId
=
new
OpenId
();
...
@@ -364,7 +364,7 @@ public class FascUtil {
...
@@ -364,7 +364,7 @@ public class FascUtil {
sendValue
=
submitTask
(
requestId
,
openApiClient
,
accessToken
);
sendValue
=
submitTask
(
requestId
,
openApiClient
,
accessToken
);
if
(
R
.
isSuccess
(
sendValue
))
{
if
(
R
.
isSuccess
(
sendValue
))
{
// 电子签签署中
// 电子签签署中
this
.
doSuccessContract
(
contract
,
tEmployeeContractPre
Service
,
requestId
);
this
.
doSuccessContract
(
contract
,
tEmployeeContractPre
Mapper
,
requestId
);
return
R
.
ok
();
return
R
.
ok
();
}
else
{
}
else
{
msg
=
"第三步失败:提交任务失败:"
+
sendValue
.
getMsg
();
msg
=
"第三步失败:提交任务失败:"
+
sendValue
.
getMsg
();
...
@@ -376,24 +376,24 @@ public class FascUtil {
...
@@ -376,24 +376,24 @@ public class FascUtil {
msg
=
"第一步失败:"
+
res
.
getMsg
();
msg
=
"第一步失败:"
+
res
.
getMsg
();
}
}
}
}
this
.
doFailContract
(
contract
,
tEmployeeContractPre
Service
,
msg
);
this
.
doFailContract
(
contract
,
tEmployeeContractPre
Mapper
,
msg
);
return
R
.
failed
(
msg
);
return
R
.
failed
(
msg
);
}
}
// 发起失败,更新合同状态
// 发起失败,更新合同状态
private
void
doFailContract
(
TEmployeeContractPre
contract
,
TEmployeeContractPre
Service
tEmployeeContractPreService
,
String
msg
)
{
private
void
doFailContract
(
TEmployeeContractPre
contract
,
TEmployeeContractPre
Mapper
tEmployeeContractPreMapper
,
String
msg
)
{
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
7
]);
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
7
]);
contract
.
setRequestMsg
(
msg
);
contract
.
setRequestMsg
(
msg
);
tEmployeeContractPre
Service
.
updateById
(
contract
);
tEmployeeContractPre
Mapper
.
updateById
(
contract
);
}
}
// 发起成功,更新合同状态
// 发起成功,更新合同状态
private
void
doSuccessContract
(
TEmployeeContractPre
contract
,
TEmployeeContractPre
Service
tEmployeeContractPreService
,
String
requestId
)
{
private
void
doSuccessContract
(
TEmployeeContractPre
contract
,
TEmployeeContractPre
Mapper
tEmployeeContractPreMapper
,
String
requestId
)
{
// 电子签签署中
// 电子签签署中
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
6
]);
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
6
]);
contract
.
setRequestId
(
requestId
);
contract
.
setRequestId
(
requestId
);
contract
.
setRequestMsg
(
""
);
contract
.
setRequestMsg
(
""
);
tEmployeeContractPre
Service
.
updateById
(
contract
);
tEmployeeContractPre
Mapper
.
updateById
(
contract
);
}
}
// 第二步:填写控件
// 第二步:填写控件
...
@@ -524,7 +524,7 @@ public class FascUtil {
...
@@ -524,7 +524,7 @@ public class FascUtil {
// 撤销签署
// 撤销签署
public
R
<
String
>
cancelTask
(
TEmployeeContractPre
contract
,
TFascPushLogService
tFascPushLogService
public
R
<
String
>
cancelTask
(
TEmployeeContractPre
contract
,
TFascPushLogService
tFascPushLogService
,
TEmployeeContractPre
Service
tEmployeeContractPreService
)
throws
ApiException
{
,
TEmployeeContractPre
Mapper
tEmployeeContractPreMapper
)
throws
ApiException
{
OpenApiClient
openApiClient
=
new
OpenApiClient
(
fascConfig
.
getAppId
(),
fascConfig
.
getAppSecret
(),
fascConfig
.
getAppUrl
());
OpenApiClient
openApiClient
=
new
OpenApiClient
(
fascConfig
.
getAppId
(),
fascConfig
.
getAppSecret
(),
fascConfig
.
getAppUrl
());
String
accessToken
=
this
.
getFascToken
(
openApiClient
);
String
accessToken
=
this
.
getFascToken
(
openApiClient
);
...
@@ -551,7 +551,7 @@ public class FascUtil {
...
@@ -551,7 +551,7 @@ public class FascUtil {
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
contract
.
setSignType
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
contract
.
setSignType
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
contract
.
setRequestMsg
(
""
);
contract
.
setRequestMsg
(
""
);
tEmployeeContractPre
Service
.
updateById
(
contract
);
tEmployeeContractPre
Mapper
.
updateById
(
contract
);
return
R
.
ok
();
return
R
.
ok
();
}
else
{
}
else
{
// 撤销签署失败原因为 已完成签署(处理的同时员工完成签署公司免验证签完成),则更新为签署完成的“待归档”状态。
// 撤销签署失败原因为 已完成签署(处理的同时员工完成签署公司免验证签完成),则更新为签署完成的“待归档”状态。
...
@@ -560,7 +560,7 @@ public class FascUtil {
...
@@ -560,7 +560,7 @@ public class FascUtil {
contract
.
setRevokeReason
(
FascConstants
.
TIME_OUT_REASON
);
contract
.
setRevokeReason
(
FascConstants
.
TIME_OUT_REASON
);
}
}
contract
.
setRequestMsg
(
res
.
getMsg
());
contract
.
setRequestMsg
(
res
.
getMsg
());
tEmployeeContractPre
Service
.
updateById
(
contract
);
tEmployeeContractPre
Mapper
.
updateById
(
contract
);
return
R
.
failed
(
res
.
getMsg
());
return
R
.
failed
(
res
.
getMsg
());
}
}
}
}
...
@@ -570,7 +570,7 @@ public class FascUtil {
...
@@ -570,7 +570,7 @@ public class FascUtil {
// 催办
// 催办
public
R
<
String
>
urgeTask
(
TEmployeeContractPre
contract
,
TFascPushLogService
tFascPushLogService
public
R
<
String
>
urgeTask
(
TEmployeeContractPre
contract
,
TFascPushLogService
tFascPushLogService
,
TEmployeeContractPre
Service
tEmployeeContractPreService
)
throws
ApiException
{
,
TEmployeeContractPre
Mapper
tEmployeeContractPreMapper
)
throws
ApiException
{
OpenApiClient
openApiClient
=
new
OpenApiClient
(
fascConfig
.
getAppId
(),
fascConfig
.
getAppSecret
(),
fascConfig
.
getAppUrl
());
OpenApiClient
openApiClient
=
new
OpenApiClient
(
fascConfig
.
getAppId
(),
fascConfig
.
getAppSecret
(),
fascConfig
.
getAppUrl
());
String
accessToken
=
this
.
getFascToken
(
openApiClient
);
String
accessToken
=
this
.
getFascToken
(
openApiClient
);
...
@@ -599,7 +599,7 @@ public class FascUtil {
...
@@ -599,7 +599,7 @@ public class FascUtil {
return
R
.
ok
();
return
R
.
ok
();
}
else
{
}
else
{
contract
.
setRequestMsg
(
res
.
getMsg
());
contract
.
setRequestMsg
(
res
.
getMsg
());
tEmployeeContractPre
Service
.
updateById
(
contract
);
tEmployeeContractPre
Mapper
.
updateById
(
contract
);
return
R
.
failed
(
res
.
getMsg
());
return
R
.
failed
(
res
.
getMsg
());
}
}
}
}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
a29790bb
...
@@ -1713,6 +1713,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1713,6 +1713,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo
.
setJoinLeaveDate
(
registration
.
getJoinLeaveDate
());
preVo
.
setJoinLeaveDate
(
registration
.
getJoinLeaveDate
());
preVo
.
setDeptNo
(
registration
.
getDeptNo
());
preVo
.
setDeptNo
(
registration
.
getDeptNo
());
preVo
.
setEmpName
(
registration
.
getEmployeeName
());
preVo
.
setEmpName
(
registration
.
getEmployeeName
());
preVo
.
setPosition
(
registration
.
getPosition
());
preVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
preVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
preVo
.
setCreateBy
(
user
.
getId
());
preVo
.
setCreateBy
(
user
.
getId
());
preVo
.
setCreateName
(
user
.
getNickname
());
preVo
.
setCreateName
(
user
.
getNickname
());
...
...
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
View file @
a29790bb
...
@@ -123,4 +123,49 @@ public class ArchiveTask {
...
@@ -123,4 +123,49 @@ public class ArchiveTask {
log
.
info
(
"-------------每天刷新合同续签待待办信息到微信-定时任务结束------------"
);
log
.
info
(
"-------------每天刷新合同续签待待办信息到微信-定时任务结束------------"
);
}
}
/**
* @Author huych
* @Description 每日晚23:00自动撤销超时电子签署任务
* @Date 2025-10-15
* @Param
* @return
**/
public
void
autoRevokeElectronicSignTask
()
{
log
.
info
(
"-------------每日晚23:00自动撤销超时电子签署任务-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/autoRevokeElectronicSign"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每日晚23:00自动撤销超时电子签署任务-定时任务结束------------"
);
}
/**
* @Author huych
* @Description 每日早9点通知前端客服前一日撤销电子签署情况
* @Date 2025-10-15
* @Param
* @return
**/
public
void
notifyRevokedElectronicSignTask
()
{
log
.
info
(
"-------------每日早9点通知前端客服前一日撤销电子签署情况-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/notifyRevokedElectronicSign"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每日早9点通知前端客服前一日撤销电子签署情况-定时任务结束------------"
);
}
/**
* @Author huych
* @Description 每日早9点电子签合同即将超期提醒
* @Date 2025-10-15
* @Param
* @return
**/
public
void
electronicSignExpiringReminderTask
()
{
log
.
info
(
"-------------每日早9点电子签合同即将超期提醒-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/electronicSignExpiringReminder"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每日早9点电子签合同即将超期提醒-定时任务结束------------"
);
}
}
}
\ No newline at end of file
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
View file @
a29790bb
...
@@ -404,4 +404,13 @@ public class TDispatchInfoPre extends BaseEntity {
...
@@ -404,4 +404,13 @@ public class TDispatchInfoPre extends BaseEntity {
@Schema
(
description
=
"0未删除1删除"
)
@Schema
(
description
=
"0未删除1删除"
)
private
String
deleteFlag
;
private
String
deleteFlag
;
/**
* 就职岗位
*/
@Length
(
max
=
50
,
message
=
"就职岗位 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"就职岗位"
,
maxLength
=
50
)
@Schema
(
description
=
"就职岗位"
)
@ExcelProperty
(
"就职岗位"
)
private
String
position
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoPreController.java
View file @
a29790bb
...
@@ -148,8 +148,8 @@ public class TDispatchInfoPreController {
...
@@ -148,8 +148,8 @@ public class TDispatchInfoPreController {
* @return
* @return
*/
*/
@Operation
(
description
=
"社保待购买数量查询"
)
@Operation
(
description
=
"社保待购买数量查询"
)
@
Ge
tMapping
(
"/getListCount"
)
@
Pos
tMapping
(
"/getListCount"
)
public
R
getListCount
(
TDispatchInfoPreSearchVo
searchVo
)
{
public
R
getListCount
(
@RequestBody
TDispatchInfoPreSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
menuUtil
.
setAuthSql
(
user
,
searchVo
);
return
R
.
ok
(
tDispatchInfoPreService
.
getDispatchInfoCount
(
searchVo
));
return
R
.
ok
(
tDispatchInfoPreService
.
getDispatchInfoCount
(
searchVo
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
a29790bb
...
@@ -466,7 +466,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -466,7 +466,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
RestTemplate
restTemplate
=
new
RestTemplate
();
RestTemplate
restTemplate
=
new
RestTemplate
();
Map
<
String
,
Object
>
requestMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
requestMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
String
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"
05
"
+
LoginName
);
String
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"
67
"
+
LoginName
);
StringBuilder
description
=
new
StringBuilder
();
StringBuilder
description
=
new
StringBuilder
();
String
title
=
"作业自动化——社保派单发起失败提醒"
;
String
title
=
"作业自动化——社保派单发起失败提醒"
;
description
.
append
(
"社保派单数:"
).
append
(
sum
).
append
(
"份,失败份数:"
).
append
(
falureNum
).
append
(
"份;"
).
append
(
"<br>"
);
description
.
append
(
"社保派单数:"
).
append
(
sum
).
append
(
"份,失败份数:"
).
append
(
falureNum
).
append
(
"份;"
).
append
(
"<br>"
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
a29790bb
...
@@ -62,6 +62,7 @@
...
@@ -62,6 +62,7 @@
<result
property=
"errorInfo"
column=
"error_info"
/>
<result
property=
"errorInfo"
column=
"error_info"
/>
<result
property=
"errorBackInfo"
column=
"error_back_info"
/>
<result
property=
"errorBackInfo"
column=
"error_back_info"
/>
<result
property=
"errorTime"
column=
"error_time"
/>
<result
property=
"errorTime"
column=
"error_time"
/>
<result
property=
"position"
column=
"position"
/>
</resultMap>
</resultMap>
<resultMap
id=
"tDispatchInfoPreExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreExportVo"
>
<resultMap
id=
"tDispatchInfoPreExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreExportVo"
>
...
@@ -82,7 +83,7 @@
...
@@ -82,7 +83,7 @@
a.EMP_NAME,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
a.PROCESS_STATUS,
a.PROCESS_STATUS,
a.
SETTLE_DOMAIN
,
a.
DEPT_ID
,
a.SOCIAL_PROVINCE,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.SOCIAL_TOWN,
...
@@ -130,24 +131,24 @@
...
@@ -130,24 +131,24 @@
a.CREATE_NAME,
a.CREATE_NAME,
a.UPDATE_TIME,
a.UPDATE_TIME,
a.CREATE_TIME,
a.CREATE_TIME,
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info
,a.position
</sql>
</sql>
<sql
id=
"tDispatchInfoPre_where"
>
<sql
id=
"tDispatchInfoPre_where"
>
<if
test=
"tDispatchInfoPre != null"
>
<if
test=
"tDispatchInfoPre != null"
>
<if
test=
"tDispatchInfoPre.id != null and tDispatchInfoPre.id.trim() != ''"
>
<if
test=
"tDispatchInfoPre.id != null and tDispatchInfoPre.id.trim() != ''"
>
AND a.ID = #{tDispatchInfoPre.id}
AND a.ID = #{tDispatchInfoPre.id}
</if>
</if>
`
<if
test=
"tDispatchInfoPre.idList != null and tDispatchInfoPre.idList.size() > 0"
>
<if
test=
"tDispatchInfoPre.idList != null and tDispatchInfoPre.idList.size() > 0"
>
and a.id in
and a.id in
<foreach
collection=
"tDispatchInfoPre.idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
<foreach
collection=
"tDispatchInfoPre.idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
separator=
","
>
#{param}
#{param}
</foreach>
</foreach>
</if>
`
</if>
<if
test=
"tDispatchInfoPre.statusList != null and tDispatchInfoPre.statusList.size() > 0"
>
<if
test=
"tDispatchInfoPre.statusList != null and tDispatchInfoPre.statusList.size() > 0"
>
AND a.process_status in
AND a.process_status in
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfoPre.statusList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfoPre.statusList"
open=
"("
separator=
","
close=
")"
>
'${item}'
#{item}
</foreach>
</foreach>
</if>
</if>
<if
test=
"tDispatchInfoPre.empName != null and tDispatchInfoPre.empName.trim() != ''"
>
<if
test=
"tDispatchInfoPre.empName != null and tDispatchInfoPre.empName.trim() != ''"
>
...
@@ -159,27 +160,7 @@
...
@@ -159,27 +160,7 @@
<if
test=
"tDispatchInfoPre.processStatus != null and tDispatchInfoPre.processStatus.trim() != ''"
>
<if
test=
"tDispatchInfoPre.processStatus != null and tDispatchInfoPre.processStatus.trim() != ''"
>
AND a.PROCESS_STATUS = #{tDispatchInfoPre.processStatus}
AND a.PROCESS_STATUS = #{tDispatchInfoPre.processStatus}
</if>
</if>
<if
test=
"tDispatchInfoPre.settleDomain != null and tDispatchInfoPre.settleDomain.trim() != ''"
>
AND a.SETTLE_DOMAIN = #{tDispatchInfoPre.settleDomain}
</if>
<if
test=
"tDispatchInfoPre.socialProvince != null and tDispatchInfoPre.socialProvince.trim() != ''"
>
AND a.SOCIAL_PROVINCE = #{tDispatchInfoPre.socialProvince}
</if>
<if
test=
"tDispatchInfoPre.socialCity != null and tDispatchInfoPre.socialCity.trim() != ''"
>
AND a.SOCIAL_CITY = #{tDispatchInfoPre.socialCity}
</if>
<if
test=
"tDispatchInfoPre.socialTown != null and tDispatchInfoPre.socialTown.trim() != ''"
>
AND a.SOCIAL_TOWN = #{tDispatchInfoPre.socialTown}
</if>
<if
test=
"tDispatchInfoPre.fundProvince != null and tDispatchInfoPre.fundProvince.trim() != ''"
>
AND a.FUND_PROVINCE = #{tDispatchInfoPre.fundProvince}
</if>
<if
test=
"tDispatchInfoPre.fundCity != null and tDispatchInfoPre.fundCity.trim() != ''"
>
AND a.FUND_CITY = #{tDispatchInfoPre.fundCity}
</if>
<if
test=
"tDispatchInfoPre.fundTown != null and tDispatchInfoPre.fundTown.trim() != ''"
>
AND a.FUND_TOWN = #{tDispatchInfoPre.fundTown}
</if>
<if
test=
"tDispatchInfoPre.deptName != null and tDispatchInfoPre.deptName.trim() != ''"
>
<if
test=
"tDispatchInfoPre.deptName != null and tDispatchInfoPre.deptName.trim() != ''"
>
AND a.DEPT_NAME like CONCAT('%',#{tDispatchInfoPre.deptName},'%')
AND a.DEPT_NAME like CONCAT('%',#{tDispatchInfoPre.deptName},'%')
</if>
</if>
...
@@ -204,11 +185,11 @@
...
@@ -204,11 +185,11 @@
<if
test=
"tDispatchInfoPre.expectedCollectionTime != null"
>
<if
test=
"tDispatchInfoPre.expectedCollectionTime != null"
>
AND DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d') = CURDATE()
AND DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d') = CURDATE()
</if>
</if>
<if
test=
"tDispatchInfoPre.dispatcherTimeStart != null
and tDispatchInfoPre.dispatcherTimeStart.trim() != ''
"
>
<if
test=
"tDispatchInfoPre.dispatcherTimeStart != null"
>
AND DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{t
EmployeeInsurance
Pre.dispatcherTimeStart}
AND DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d')
<![CDATA[ >= ]]>
#{t
DispatchInfo
Pre.dispatcherTimeStart}
</if>
</if>
<if
test=
"tDispatchInfoPre.dispatcherTimeEnd != null
and tDispatchInfoPre.dispatcherTimeEnd.trim() != ''
"
>
<if
test=
"tDispatchInfoPre.dispatcherTimeEnd != null"
>
and DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{t
EmployeeInsurance
Pre.dispatcherTimeEnd}
and DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d')
<![CDATA[ <= ]]>
#{t
DispatchInfo
Pre.dispatcherTimeEnd}
</if>
</if>
<if
test=
"tDispatchInfoPre.expectedConfirmTime != null"
>
<if
test=
"tDispatchInfoPre.expectedConfirmTime != null"
>
AND a.EXPECTED_CONFIRM_TIME = #{tDispatchInfoPre.expectedConfirmTime}
AND a.EXPECTED_CONFIRM_TIME = #{tDispatchInfoPre.expectedConfirmTime}
...
@@ -222,9 +203,6 @@
...
@@ -222,9 +203,6 @@
<if
test=
"tDispatchInfoPre.contractStatus != null and tDispatchInfoPre.contractStatus.trim() != ''"
>
<if
test=
"tDispatchInfoPre.contractStatus != null and tDispatchInfoPre.contractStatus.trim() != ''"
>
AND a.CONTRACT_STATUS = #{tDispatchInfoPre.contractStatus}
AND a.CONTRACT_STATUS = #{tDispatchInfoPre.contractStatus}
</if>
</if>
<if
test=
"tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''"
>
AND a.error_info is not null
</if>
<if
test=
"tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"
>
<if
test=
"tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"
>
${tDispatchInfoPre.authSql}
${tDispatchInfoPre.authSql}
</if>
</if>
...
...
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