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
b47dc9cc
Commit
b47dc9cc
authored
Nov 21, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-派单暂存
parent
38948622
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
821 additions
and
76 deletions
+821
-76
BaseSearchListVO.java
...u/cloud/plus/v1/yifu/common/core/vo/BaseSearchListVO.java
+45
-0
InsuranceDaprUtil.java
...loud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java
+25
-0
SocialDaprUtils.java
.../cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
+18
-0
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+2
-1
EmployeeRegistrationLeave.java
...u/cloud/plus/v1/csp/entity/EmployeeRegistrationLeave.java
+31
-3
BatchSureLeaveVo.java
.../java/com/yifu/cloud/plus/v1/csp/vo/BatchSureLeaveVo.java
+44
-0
EmployeeRegistrationLeaveController.java
...1/csp/controller/EmployeeRegistrationLeaveController.java
+63
-6
EmployeeRegistrationMapper.java
.../cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
+3
-0
EmployeeRegistrationLeaveService.java
...plus/v1/csp/service/EmployeeRegistrationLeaveService.java
+10
-7
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+417
-52
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+24
-5
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+14
-0
TInsurancePreRenewDetailController.java
...rances/controller/TInsurancePreRenewDetailController.java
+32
-0
TInsurancePreRenewDetailMapper.java
...ces/mapper/insurances/TInsurancePreRenewDetailMapper.java
+3
-0
TInsurancePreRenewDetailService.java
...es/service/insurance/TInsurancePreRenewDetailService.java
+7
-0
TInsurancePreRenewDetailServiceImpl.java
...e/insurance/impl/TInsurancePreRenewDetailServiceImpl.java
+18
-0
TInsurancePreRenewDetailMapper.xml
...rces/mapper/insurances/TInsurancePreRenewDetailMapper.xml
+8
-0
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+9
-0
THolidayInfoMapper.java
.../cloud/plus/v1/yifu/social/mapper/THolidayInfoMapper.java
+0
-1
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+4
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+43
-0
THolidayInfoMapper.xml
...cial-biz/src/main/resources/mapper/THolidayInfoMapper.xml
+1
-1
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/vo/BaseSearchListVO.java
0 → 100644
View file @
b47dc9cc
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
core
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* @Description: 通用查询与返回的VO
* @Author: hgw
* @Date: 2025/11/20 15:43
* @return:
**/
@Getter
@Setter
public
class
BaseSearchListVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
// 其他查询参数
private
List
<
BaseSearchVO
>
listParam
=
new
ArrayList
<>();
// 返回参数
private
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java
View file @
b47dc9cc
...
@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
...
@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
...
@@ -109,4 +110,28 @@ public class InsuranceDaprUtil {
...
@@ -109,4 +110,28 @@ public class InsuranceDaprUtil {
return
res
;
return
res
;
}
}
/**
* @param paramVo 查询参数,主要是身份证与项目编码
* @Description: 离职待办确认后,更新为商险续签待办为已离职
* @Author: hgw
* @Date: 2025-11-21 14:28:20
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO>
**/
public
void
updateInsurancePreRenewToIsLeave
(
BaseSearchVO
paramVo
)
{
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/tinsuranceprerenewdetail/inner/updateInsurancePreRenewToIsLeave"
,
paramVo
,
String
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @param paramVo 查询参数,主要是身份证与项目编码
* @Description: 离职待办确认后,更新为商险续签待办为已离职
* @Author: hgw
* @Date: 2025-11-21 14:28:20
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO>
**/
public
void
updateInsurancePreRenewToIsLeaveList
(
BaseSearchListVO
paramVo
)
{
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/tinsuranceprerenewdetail/inner/updateInsurancePreRenewToIsLeaveList"
,
paramVo
,
String
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @
b47dc9cc
...
@@ -8,6 +8,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistCheckVo;
...
@@ -8,6 +8,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistCheckVo;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo
;
...
@@ -17,6 +18,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
...
@@ -17,6 +18,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
...
@@ -401,4 +403,20 @@ public class SocialDaprUtils {
...
@@ -401,4 +403,20 @@ public class SocialDaprUtils {
return
res
;
return
res
;
}
}
/**
* @param paramVo 查询参数,主要是身份证与项目编码
* @Description: 离职待办调用的批量派减社保、公积金
* @Author: hgw
* @Date: 2025-11-21 14:54:37
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO>
**/
public
R
<
BaseSearchListVO
>
leaveToReduceSocialAndFund
(
List
<
TDispatchReduceVo
>
paramVo
)
{
R
<
BaseSearchListVO
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
()
,
"/tsocialfundinfo/inner/leaveToReduceSocialAndFund"
,
JSON
.
toJSONString
(
paramVo
),
BaseSearchListVO
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"查询人员的社保公积金状态失败!"
);
}
return
res
;
}
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
View file @
b47dc9cc
...
@@ -33,7 +33,8 @@ public class RegistConstants {
...
@@ -33,7 +33,8 @@ public class RegistConstants {
public
static
final
String
BACK_RECEIVE
=
"拒绝入职"
;
public
static
final
String
BACK_RECEIVE
=
"拒绝入职"
;
public
static
final
String
BASE_REASON_TYPE
=
"个人辞职"
;
//
public
static
final
String
BASE_REASON_TYPE
=
"1"
;
public
static
final
String
BASE_LINK_PORT
=
"人员离职"
;
public
static
final
String
BASE_LINK_PORT
=
"人员离职"
;
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistrationLeave.java
View file @
b47dc9cc
...
@@ -19,9 +19,9 @@ package com.yifu.cloud.plus.v1.csp.entity;
...
@@ -19,9 +19,9 @@ package com.yifu.cloud.plus.v1.csp.entity;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
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.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -30,7 +30,6 @@ import lombok.EqualsAndHashCode;
...
@@ -30,7 +30,6 @@ import lombok.EqualsAndHashCode;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
/**
* 自动化离职待办
* 自动化离职待办
...
@@ -157,7 +156,7 @@ public class EmployeeRegistrationLeave extends BaseEntity {
...
@@ -157,7 +156,7 @@ public class EmployeeRegistrationLeave extends BaseEntity {
@Schema
(
description
=
"停缴社保日期"
)
@Schema
(
description
=
"停缴社保日期"
)
private
String
socialReduceDate
;
private
String
socialReduceDate
;
/**
/**
* 减少原因(社保)
* 减少原因(社保)
ID默认为1
*/
*/
@ExcelAttribute
(
name
=
"减少原因(社保)"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"减少原因(社保)"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"减少原因(社保)不能超过50个字符"
)
@Length
(
max
=
50
,
message
=
"减少原因(社保)不能超过50个字符"
)
...
@@ -521,4 +520,33 @@ public class EmployeeRegistrationLeave extends BaseEntity {
...
@@ -521,4 +520,33 @@ public class EmployeeRegistrationLeave extends BaseEntity {
@Schema
(
description
=
"项目档案失败时间"
)
@Schema
(
description
=
"项目档案失败时间"
)
private
LocalDateTime
failEmpProjectTime
;
private
LocalDateTime
failEmpProjectTime
;
@Schema
(
description
=
"无需处理原因(社保)"
)
private
String
closeRemarkSocial
;
@Schema
(
description
=
"无需处理原因(公积金)"
)
private
String
closeRemarkFund
;
@Schema
(
description
=
"无需处理原因(商险)"
)
private
String
closeRemarkInsurance
;
@Schema
(
description
=
"无需处理原因(合同)"
)
private
String
closeRemarkContract
;
@Schema
(
description
=
"无需处理原因(档案)"
)
private
String
closeRemarkEmp
;
@Schema
(
description
=
"无需处理原因(项目档案)"
)
private
String
closeRemarkEmpProject
;
@TableField
(
exist
=
false
)
@ExcelProperty
(
value
=
"项目编码"
)
private
String
deptNo
;
@TableField
(
exist
=
false
)
@ExcelProperty
(
value
=
"项目名称"
)
private
String
deptName
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"员工姓名"
)
private
String
employeeName
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/BatchSureLeaveVo.java
0 → 100644
View file @
b47dc9cc
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
import
java.util.List
;
@Data
@Schema
(
description
=
"离职批量确认VO"
)
public
class
BatchSureLeaveVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
628032758008497542L
;
/**
* 更新主键集合ids
*/
@Schema
(
description
=
"更新主键集合ids"
)
private
List
<
String
>
ids
;
/**
* 商险是否处理
*/
@Schema
(
description
=
"商险是否处理:0否1是"
)
private
String
doTypeInsurance
;
@Schema
(
description
=
"停缴社保日期"
)
private
String
socialReduceDate
;
@Schema
(
description
=
"停缴公积金日期"
)
private
String
fundReduceDate
;
@Schema
(
description
=
"减少原因(社保和公积金)"
)
private
String
socialReasonTypeAndFund
;
@Schema
(
description
=
"社保公积金派减备注"
)
private
String
socialTrustRemarkAndFund
;
@Schema
(
description
=
"社保公积金派减时间"
)
private
LocalDateTime
socialExpectedTimeAndFund
;
@Schema
(
description
=
"合同终止发起时间"
)
private
LocalDateTime
contractExpectedTime
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationLeaveController.java
View file @
b47dc9cc
...
@@ -21,17 +21,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -21,17 +21,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationLeave
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationLeave
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationLeaveService
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationLeaveService
;
import
com.yifu.cloud.plus.v1.csp.vo.BatchSureLeaveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveTableVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveTableVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreRenewDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.BatchIgnoreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAutoParam
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -118,6 +117,15 @@ public class EmployeeRegistrationLeaveController {
...
@@ -118,6 +117,15 @@ public class EmployeeRegistrationLeaveController {
return
R
.
ok
(
employeeRegistrationLeaveService
.
initLeaveInfo
(
id
));
return
R
.
ok
(
employeeRegistrationLeaveService
.
initLeaveInfo
(
id
));
}
}
/**
* 批量确认初始化
*/
@Operation
(
summary
=
"批量确认初始化"
,
description
=
"批量确认初始化"
)
@GetMapping
(
"/initBatchSureInfo"
)
public
R
<
BatchSureLeaveVo
>
initBatchSureInfo
()
{
return
R
.
ok
(
employeeRegistrationLeaveService
.
initBatchSureInfo
());
}
/**
/**
* 自动化离职待办 批量导出
* 自动化离职待办 批量导出
*
*
...
@@ -152,6 +160,40 @@ public class EmployeeRegistrationLeaveController {
...
@@ -152,6 +160,40 @@ public class EmployeeRegistrationLeaveController {
menuUtil
.
setAuthSql
(
user
,
searchVo
);
menuUtil
.
setAuthSql
(
user
,
searchVo
);
}
}
/**
* 单个手动关闭
*/
@Operation
(
summary
=
"单个手动关闭-离职待办"
,
description
=
"单个手动关闭-离职待办"
)
@SysLog
(
"单个手动关闭-离职待办"
)
@GetMapping
(
"/doClose"
)
public
R
<
String
>
doClose
(
@RequestParam
String
id
,
@RequestParam
String
remark
)
{
EmployeeRegistrationLeave
leave
=
employeeRegistrationLeaveService
.
getById
(
id
);
if
(
leave
!=
null
)
{
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusSocial
()))
{
leave
.
setCloseRemarkSocial
(
remark
);
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusFund
()))
{
leave
.
setCloseRemarkFund
(
remark
);
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusInsurance
()))
{
leave
.
setCloseRemarkInsurance
(
remark
);
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusContract
()))
{
leave
.
setCloseRemarkContract
(
remark
);
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusEmp
()))
{
leave
.
setCloseRemarkEmp
(
remark
);
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusProject
()))
{
leave
.
setCloseRemarkEmpProject
(
remark
);
}
leave
.
setDoStatus
(
CommonConstants
.
SIX_STRING
);
leave
.
setLeaveStatus
(
CommonConstants
.
THREE_STRING
);
employeeRegistrationLeaveService
.
updateById
(
leave
);
}
return
R
.
ok
();
}
/**
/**
* @param leave 离职待办
* @param leave 离职待办
*/
*/
...
@@ -171,7 +213,7 @@ public class EmployeeRegistrationLeaveController {
...
@@ -171,7 +213,7 @@ public class EmployeeRegistrationLeaveController {
@Operation
(
summary
=
"批量确认-离职待办"
,
description
=
"批量确认-离职待办"
)
@Operation
(
summary
=
"批量确认-离职待办"
,
description
=
"批量确认-离职待办"
)
@SysLog
(
"批量确认-离职待办(与单个确认分开,是因为单个确认还有编辑功能,批量仅改状态"
)
@SysLog
(
"批量确认-离职待办(与单个确认分开,是因为单个确认还有编辑功能,批量仅改状态"
)
@PostMapping
(
"/doSureBatch"
)
@PostMapping
(
"/doSureBatch"
)
public
R
<
String
>
doSureBatch
(
@RequestBody
Batch
Ignor
eVo
vo
)
{
public
R
<
String
>
doSureBatch
(
@RequestBody
Batch
SureLeav
eVo
vo
)
{
if
(
null
==
vo
||
vo
.
getIds
()
==
null
||
vo
.
getIds
().
isEmpty
()){
if
(
null
==
vo
||
vo
.
getIds
()
==
null
||
vo
.
getIds
().
isEmpty
()){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
}
...
@@ -179,6 +221,20 @@ public class EmployeeRegistrationLeaveController {
...
@@ -179,6 +221,20 @@ public class EmployeeRegistrationLeaveController {
}
}
/**
/**
* @Description: 定时任务批量派单
* @Author: hgw
* @Date: 2025-11-21 16:20:03
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R
**/
@Operation
(
description
=
"定时任务批量派单"
)
@PostMapping
(
"/inner/autoDoLeave"
)
public
void
autoDoLeave
()
{
employeeRegistrationLeaveService
.
autoDoLeave
();
}
/**
* @param isExit: 1仅发起日期为今日及之前的事项 0立即发起(全量)
* @param doType: 需处理项:1社保2公积金3商险4合同5项目档案6人员档案
* @Description: 离职待办单个/批量派单
* @Description: 离职待办单个/批量派单
* @Author: hgw
* @Author: hgw
* @Date: 2025/11/17 14:17
* @Date: 2025/11/17 14:17
...
@@ -186,8 +242,9 @@ public class EmployeeRegistrationLeaveController {
...
@@ -186,8 +242,9 @@ public class EmployeeRegistrationLeaveController {
**/
**/
@Operation
(
description
=
"离职待办单个/批量派单"
)
@Operation
(
description
=
"离职待办单个/批量派单"
)
@PostMapping
(
"/batchDoLeave"
)
@PostMapping
(
"/batchDoLeave"
)
public
R
<
List
<
InsuranceAutoParam
>>
batchDoLeave
(
@RequestBody
List
<
String
>
idList
,
@RequestParam
(
required
=
false
)
String
isExit
)
{
public
R
<
List
<
ErrorMessage
>>
batchDoLeave
(
@RequestBody
List
<
String
>
idList
,
@RequestParam
String
isExit
return
employeeRegistrationLeaveService
.
batchDoLeave
(
idList
,
isExit
,
false
);
,
@RequestParam
(
required
=
false
)
String
doType
)
{
return
employeeRegistrationLeaveService
.
batchDoLeave
(
idList
,
isExit
,
doType
);
}
}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
View file @
b47dc9cc
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationLeave
;
import
com.yifu.cloud.plus.v1.csp.vo.*
;
import
com.yifu.cloud.plus.v1.csp.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
...
@@ -47,5 +48,7 @@ public interface EmployeeRegistrationMapper extends BaseMapper<EmployeeRegistrat
...
@@ -47,5 +48,7 @@ public interface EmployeeRegistrationMapper extends BaseMapper<EmployeeRegistrat
List
<
EmployeeRegistrationHrAutoExportVo
>
selectHrAutoExportList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
List
<
EmployeeRegistrationHrAutoExportVo
>
selectHrAutoExportList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
List
<
EmployeeRegistration
>
selectRegistrationListBySure
(
@Param
(
"idList"
)
List
<
String
>
idList
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationLeaveService.java
View file @
b47dc9cc
...
@@ -22,12 +22,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -22,12 +22,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationLeave
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationLeave
;
import
com.yifu.cloud.plus.v1.csp.vo.BatchSureLeaveVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveSearchVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveTableVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationLeaveTableVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreRenewDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.BatchIgnoreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAutoParam
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
import
java.util.List
;
...
@@ -65,14 +64,18 @@ public interface EmployeeRegistrationLeaveService extends IService<EmployeeRegis
...
@@ -65,14 +64,18 @@ public interface EmployeeRegistrationLeaveService extends IService<EmployeeRegis
// 单个确认(含编辑功能)
// 单个确认(含编辑功能)
R
<
String
>
doSure
(
EmployeeRegistrationLeave
leave
);
R
<
String
>
doSure
(
EmployeeRegistrationLeave
leave
);
// 批量确认初始化
BatchSureLeaveVo
initBatchSureInfo
();
// 批量确认(不含编辑)
// 批量确认(不含编辑)
R
<
String
>
doSureBatch
(
Batch
Ignor
eVo
vo
);
R
<
String
>
doSureBatch
(
Batch
SureLeav
eVo
vo
);
// 每天下午三点、三点二十推送续保待派单数据
// 每天下午三点、三点二十推送续保待派单数据
//void autoDoInsurancePreRenew
();
void
autoDoLeave
();
// 批量派单
// 批量派单
// pushQiWeiFlag : 是否推送企微 true:推送(当前仅下午3点与3点20的定时任务,需要推送企微),false:不推送
// @param isExit: 1仅发起日期为今日及之前的事项 0立即发起(全量)
R
<
List
<
InsuranceAutoParam
>>
batchDoLeave
(
List
<
String
>
idList
,
String
sameFlag
,
boolean
pushQiWeiFlag
);
// @param doType: 需处理项:1社保2公积金3商险4合同5项目档案6人员档案
R
<
List
<
ErrorMessage
>>
batchDoLeave
(
List
<
String
>
idList
,
String
isExit
,
String
doType
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
b47dc9cc
This diff is collapsed.
Click to expand it.
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
b47dc9cc
...
@@ -142,6 +142,18 @@
...
@@ -142,6 +142,18 @@
<result
property=
"failContractTime"
column=
"fail_contract_time"
/>
<result
property=
"failContractTime"
column=
"fail_contract_time"
/>
<result
property=
"failEmpTime"
column=
"fail_emp_time"
/>
<result
property=
"failEmpTime"
column=
"fail_emp_time"
/>
<result
property=
"failEmpProjectTime"
column=
"fail_emp_project_time"
/>
<result
property=
"failEmpProjectTime"
column=
"fail_emp_project_time"
/>
<result
property=
"closeRemarkSocial"
column=
"close_remark_social"
/>
<result
property=
"closeRemarkFund"
column=
"close_remark_fund"
/>
<result
property=
"closeRemarkInsurance"
column=
"close_remark_insurance"
/>
<result
property=
"closeRemarkContract"
column=
"close_remark_contract"
/>
<result
property=
"closeRemarkEmpProject"
column=
"close_remark_emp_project"
/>
<result
property=
"closeRemarkEmp"
column=
"close_remark_emp"
/>
<result
property=
"employeeName"
column=
"employee_name"
/>
<result
property=
"empIdcard"
column=
"emp_idcard"
/>
<result
property=
"deptName"
column=
"dept_name"
/>
<result
property=
"deptNo"
column=
"dept_no"
/>
</resultMap>
</resultMap>
<!-- 全量字段 -->
<!-- 全量字段 -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -212,7 +224,13 @@
...
@@ -212,7 +224,13 @@
a.fail_insurance_time,
a.fail_insurance_time,
a.fail_contract_time,
a.fail_contract_time,
a.fail_emp_time,
a.fail_emp_time,
a.fail_emp_project_time
a.fail_emp_project_time,
a.close_remark_social,
a.close_remark_fund,
a.close_remark_insurance,
a.close_remark_contract,
a.close_remark_emp,
a.close_remark_emp_project
</sql>
</sql>
...
@@ -566,7 +584,11 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
...
@@ -566,7 +584,11 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
<!-- 查找符合条件的需要派单的数据 -->
<!-- 查找符合条件的需要派单的数据 -->
<select
id=
"selectLeaveListByDispatch"
resultMap=
"employeeRegistrationLeaveMap"
>
<select
id=
"selectLeaveListByDispatch"
resultMap=
"employeeRegistrationLeaveMap"
>
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
b.employee_name,
b.emp_idcard,
b.dept_name,
b.dept_no,
<include
refid=
"Base_Column_List"
/>
FROM employee_registration_leave a
FROM employee_registration_leave a
left join employee_registration b on a.id=b.id
left join employee_registration b on a.id=b.id
<where>
<where>
...
@@ -577,9 +599,6 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
...
@@ -577,9 +599,6 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
#{param}
#{param}
</foreach>
</foreach>
</if>
</if>
<if
test=
"idList == null or idList.size() == 0"
>
and a.id = '-1'
</if>
</where>
</where>
ORDER BY b.create_time asc,b.id asc
ORDER BY b.create_time asc,b.id asc
</select>
</select>
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
b47dc9cc
...
@@ -411,4 +411,18 @@
...
@@ -411,4 +411,18 @@
</if>
</if>
</update>
</update>
<select
id=
"selectRegistrationListBySure"
resultMap=
"employeeRegistrationMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM employee_registration a
left join employee_registration_leave b on a.id=b.id
where b.leave_status = '0'
<if
test=
"idList != null"
>
AND a.id in
<foreach
item=
"idStr"
index=
"index"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
</select>
</mapper>
</mapper>
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsurancePreRenewDetailController.java
View file @
b47dc9cc
...
@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...
@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreRenewDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreRenewDetail
;
...
@@ -165,4 +167,34 @@ public class TInsurancePreRenewDetailController {
...
@@ -165,4 +167,34 @@ public class TInsurancePreRenewDetailController {
return
tInsurancePreRenewDetailService
.
isWorkDayTest
();
return
tInsurancePreRenewDetailService
.
isWorkDayTest
();
}
}
/**
* @param paramVo
* @Description: 离职待办确认后,更新为商险续签待办为已离职
* @Author: hgw
* @Date: 2025-11-21 14:21:25
* @return: com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
**/
@Operation
(
summary
=
"离职待办确认后,更新为商险续签待办为已离职"
,
description
=
"离职待办确认后,更新为商险续签待办为已离职"
)
@Inner
@PostMapping
(
"/inner/updateInsurancePreRenewToIsLeave"
)
public
String
updateInsurancePreRenewToIsLeave
(
@RequestBody
BaseSearchVO
paramVo
)
{
tInsurancePreRenewDetailService
.
updateInsurancePreRenewToIsLeave
(
paramVo
);
return
CommonConstants
.
UPDATE_SUCCESS
;
}
/**
* @param paramVoList
* @Description: 离职待办确认后,更新为商险续签待办为已离职_多条数据
* @Author: hgw
* @Date: 2025-11-21 14:21:25
* @return: com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
**/
@Operation
(
summary
=
"离职待办确认后,更新为商险续签待办为已离职"
,
description
=
"离职待办确认后,更新为商险续签待办为已离职"
)
@Inner
@PostMapping
(
"/inner/updateInsurancePreRenewToIsLeaveList"
)
public
String
updateInsurancePreRenewToIsLeaveList
(
@RequestBody
BaseSearchListVO
paramVoList
)
{
tInsurancePreRenewDetailService
.
updateInsurancePreRenewToIsLeaveList
(
paramVoList
);
return
CommonConstants
.
UPDATE_SUCCESS
;
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsurancePreRenewDetailMapper.java
View file @
b47dc9cc
...
@@ -55,4 +55,7 @@ public interface TInsurancePreRenewDetailMapper extends BaseMapper<TInsurancePre
...
@@ -55,4 +55,7 @@ public interface TInsurancePreRenewDetailMapper extends BaseMapper<TInsurancePre
void
updateRenewBatchById
(
@Param
(
"idList"
)
List
<
String
>
idList
);
void
updateRenewBatchById
(
@Param
(
"idList"
)
List
<
String
>
idList
);
// 离职待办确认后,更新为商险续签待办为已离职
void
updateInsurancePreRenewToIsLeave
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptNo"
)
String
deptNo
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsurancePreRenewDetailService.java
View file @
b47dc9cc
...
@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreRenewDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreRenewDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.BatchIgnoreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.BatchIgnoreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAutoParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAutoParam
;
...
@@ -61,4 +63,9 @@ public interface TInsurancePreRenewDetailService extends IService<TInsurancePreR
...
@@ -61,4 +63,9 @@ public interface TInsurancePreRenewDetailService extends IService<TInsurancePreR
R
<
List
<
InsuranceAutoParam
>>
batchDoInsurancePreRenew
(
List
<
String
>
idList
,
String
sameFlag
,
boolean
pushQiWeiFlag
);
R
<
List
<
InsuranceAutoParam
>>
batchDoInsurancePreRenew
(
List
<
String
>
idList
,
String
sameFlag
,
boolean
pushQiWeiFlag
);
boolean
isWorkDayTest
();
boolean
isWorkDayTest
();
// 离职待办确认后,更新为商险续签待办为已离职
void
updateInsurancePreRenewToIsLeave
(
BaseSearchVO
paramVo
);
void
updateInsurancePreRenewToIsLeaveList
(
BaseSearchListVO
paramVoList
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsurancePreRenewDetailServiceImpl.java
View file @
b47dc9cc
...
@@ -27,6 +27,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...
@@ -27,6 +27,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.config.WxConfig
;
import
com.yifu.cloud.plus.v1.yifu.insurances.config.WxConfig
;
...
@@ -673,4 +675,20 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
...
@@ -673,4 +675,20 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
return
sysUserMap
;
return
sysUserMap
;
}
}
// 离职待办确认后,更新为商险续签待办为已离职
@Override
public
void
updateInsurancePreRenewToIsLeave
(
BaseSearchVO
paramVo
)
{
baseMapper
.
updateInsurancePreRenewToIsLeave
(
paramVo
.
getEmpIdCard
(),
paramVo
.
getDeptNo
());
}
// 离职待办确认后,更新为商险续签待办为已离职
@Override
public
void
updateInsurancePreRenewToIsLeaveList
(
BaseSearchListVO
paramVoList
)
{
if
(
paramVoList
!=
null
&&
!
paramVoList
.
getListParam
().
isEmpty
())
{
for
(
BaseSearchVO
paramVo
:
paramVoList
.
getListParam
())
{
baseMapper
.
updateInsurancePreRenewToIsLeave
(
paramVo
.
getEmpIdCard
(),
paramVo
.
getDeptNo
());
}
}
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePreRenewDetailMapper.xml
View file @
b47dc9cc
...
@@ -332,4 +332,12 @@
...
@@ -332,4 +332,12 @@
</foreach>
</foreach>
</update>
</update>
<update
id=
"updateInsurancePreRenewToIsLeave"
>
<if
test=
"empIdCard != null and empIdCard.trim() != '' and deptNo != null and deptNo.trim() != ''"
>
update t_insurance_pre_renew_detail a
set a.is_leave = '1'
where a.EMP_IDCARD_NO = #{empIdCard} and a.DEPT_NO = #{deptNo}
</if>
</update>
</mapper>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
b47dc9cc
...
@@ -29,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock;
...
@@ -29,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
...
@@ -503,6 +504,14 @@ public class TDispatchInfoController {
...
@@ -503,6 +504,14 @@ public class TDispatchInfoController {
return
R
.
ok
(
errorMessageList
);
return
R
.
ok
(
errorMessageList
);
}
}
@Operation
(
description
=
"离职调用的派减社保或公积金"
)
@SysLog
(
"离职调用的派减社保或公积金"
)
@PostMapping
(
"/inner/leaveToReduceSocialAndFund"
)
@Inner
public
R
<
BaseSearchListVO
>
leaveToReduceSocialAndFund
(
@RequestBody
List
<
TDispatchReduceVo
>
excelVOList
)
{
return
new
R
<>(
tDispatchInfoService
.
leaveToReduceSocialAndFund
(
excelVOList
));
}
/**
/**
* @Author fxj
* @Author fxj
* @Description 派单申请批量审核
* @Description 派单申请批量审核
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/THolidayInfoMapper.java
View file @
b47dc9cc
...
@@ -24,7 +24,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.THolidayInfo;
...
@@ -24,7 +24,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.THolidayInfo;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.time.LocalDate
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
b47dc9cc
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SocialAndFundReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SocialAndFundReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
...
@@ -72,6 +73,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
...
@@ -72,6 +73,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
,
String
orderId
,
String
flag
);
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
,
String
orderId
,
String
flag
);
// 离职待办调用的批量派减社保、公积金
BaseSearchListVO
leaveToReduceSocialAndFund
(
List
<
TDispatchReduceVo
>
excelVOList
);
@Transactional
@Transactional
@ShardingTransactionType
(
TransactionType
.
BASE
)
@ShardingTransactionType
(
TransactionType
.
BASE
)
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
String
orderId
,
String
flag
);
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
String
orderId
,
String
flag
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
b47dc9cc
...
@@ -51,6 +51,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.*;
...
@@ -51,6 +51,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.*;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock
;
import
com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchListVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil
;
...
@@ -91,6 +93,8 @@ import org.springframework.cache.Cache;
...
@@ -91,6 +93,8 @@ import org.springframework.cache.Cache;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.support.SimpleValueWrapper
;
import
org.springframework.cache.support.SimpleValueWrapper
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.authority.AuthorityUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
...
@@ -3129,6 +3133,45 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3129,6 +3133,45 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
this
.
judgeAllMessage
(
errorMessageList
);
return
this
.
judgeAllMessage
(
errorMessageList
);
}
}
// 离职待办调用的批量派减社保、公积金
@Override
public
BaseSearchListVO
leaveToReduceSocialAndFund
(
List
<
TDispatchReduceVo
>
excelVOList
)
{
BaseSearchListVO
returnVo
=
new
BaseSearchListVO
();
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
int
batchCount
=
CommonConstants
.
BATCH_COUNT
;
List
<
TDispatchReduceVo
>
cachedDataList
=
ListUtils
.
newArrayListWithExpectedSize
(
batchCount
);
YifuUser
userLogin
=
SecurityUtils
.
getUser
();
String
nickName
=
"自动化自动"
;
if
(
userLogin
!=
null
&&
Common
.
isNotNull
(
userLogin
.
getNickname
()))
{
nickName
+=
"-"
+
userLogin
.
getNickname
();
}
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
YifuUser
user
=
new
YifuUser
(
"2"
,
1L
,
""
,
nickName
,
nickName
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"12345678911"
,
true
,
true
,
true
,
true
,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
,
null
);
if
(
excelVOList
!=
null
&&
!
excelVOList
.
isEmpty
())
{
int
i
=
1
;
TDispatchReduceVo
dispatchVo
;
for
(
TDispatchReduceVo
vo
:
excelVOList
)
{
i
++;
cachedDataList
.
add
(
vo
);
if
(
cachedDataList
.
size
()
>=
batchCount
)
{
batchReduceDispatch
(
cachedDataList
,
errorMessageList
,
user
,
null
,
null
);
// 存储完成清理 list
cachedDataList
=
ListUtils
.
newArrayListWithExpectedSize
(
batchCount
);
}
}
}
returnVo
.
setErrorMessageList
(
errorMessageList
);
return
returnVo
;
}
@Override
@Override
public
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
public
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
String
orderId
,
String
flag
)
{
YifuUser
user
,
String
orderId
,
String
flag
)
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/THolidayInfoMapper.xml
View file @
b47dc9cc
...
@@ -96,6 +96,6 @@
...
@@ -96,6 +96,6 @@
SELECT
SELECT
DATE_FORMAT(a.DATE,'%Y-%m-%d') DATE
DATE_FORMAT(a.DATE,'%Y-%m-%d') DATE
FROM t_holiday_info a
FROM t_holiday_info a
where a.DATE between DATE_FORMAT(curdate(),'%Y-%m-%d') and DATE_FORMAT(date_add( curdate(), INTERVAL 1
MONTH
),'%Y-%m-%d')
where a.DATE between DATE_FORMAT(curdate(),'%Y-%m-%d') and DATE_FORMAT(date_add( curdate(), INTERVAL 1
YEAR
),'%Y-%m-%d')
</select>
</select>
</mapper>
</mapper>
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