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
c16097ca
Commit
c16097ca
authored
Apr 14, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
6b3b7450
488c396e
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
414 additions
and
146 deletions
+414
-146
EmployeeRegistrationPre.java
...plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
+4
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+0
-35
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+38
-49
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+3
-0
TEmployeeInsurancePreExportVo.java
.../v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
+2
-0
TEmployeeInsurancePreMapper.java
...rances/mapper/insurances/TEmployeeInsurancePreMapper.java
+1
-1
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+7
-7
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+20
-20
TEmployeeInsurancePreMapper.xml
...sources/mapper/insurances/TEmployeeInsurancePreMapper.xml
+6
-3
TSocialFriendReduceSet.java
...ud/plus/v1/yifu/social/entity/TSocialFriendReduceSet.java
+80
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+3
-0
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+2
-0
TSocialFriendReduceSetMapper.java
...s/v1/yifu/social/mapper/TSocialFriendReduceSetMapper.java
+41
-0
TSocialFriendReduceSetService.java
...v1/yifu/social/service/TSocialFriendReduceSetService.java
+40
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+4
-0
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
+3
-3
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+53
-7
TSocialFriendReduceSetServiceImpl.java
...ocial/service/impl/TSocialFriendReduceSetServiceImpl.java
+53
-0
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+8
-20
TSocialFriendReduceSetMapper.xml
...rc/main/resources/mapper/TSocialFriendReduceSetMapper.xml
+45
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
View file @
c16097ca
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -42,6 +43,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema
(
description
=
"就职岗位"
)
private
String
position
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@Schema
(
description
=
"入职日期"
)
private
Date
joinLeaveDate
;
...
...
@@ -75,6 +77,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema
(
description
=
"数据来源"
)
private
String
dataSource
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"预计收集时间"
)
private
LocalDateTime
expectedCollectionTime
;
...
...
@@ -104,6 +107,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema
(
description
=
"确认人"
)
private
String
confirmUser
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"确认时间"
)
private
Date
confirmTime
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
c16097ca
...
...
@@ -33,7 +33,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceExitCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -494,11 +493,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
else
{
return
R
.
failed
(
"保险公司、险种、购买标准、保单起、止日期不可同时重复!"
);
}
// 2:是否工作日判断
String
error
=
checkInsuranceBuy
(
insurancePreVo
);
if
(
null
!=
error
)
{
return
R
.
failed
(
error
);
}
insurancePreVo
.
setEmpIdcard
(
employeeRegistrationPre
.
getEmpIdcard
());
insurancePreVo
.
setDeptNo
(
employeeRegistrationPre
.
getDeptNo
());
...
...
@@ -785,35 +779,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
private
String
checkInsuranceBuy
(
TEmployeeInsurancePre
preVo
)
{
//新增判断保单开始日期
TEmployeeInsuranceWorkDayVo
vo
=
new
TEmployeeInsuranceWorkDayVo
();
R
<
Boolean
>
dataR
;
if
(
preVo
.
getBuyType
()
==
1
)
{
vo
.
setRegistDate
(
preVo
.
getPolicyStart
());
dataR
=
socialDaprUtils
.
checkIsWorkDay
(
vo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Boolean
.
TRUE
.
equals
(
dataR
.
getData
()))
{
return
"新增类型的保单开始日期不能为工作日;"
;
}
}
if
(
preVo
.
getBuyType
()
==
3
&&
Common
.
isNotNull
(
preVo
.
getExpectedCollectionTime
())){
// 将 LocalDateTime 转换为 java.util.Date
vo
.
setRegistDate
(
DateUtil
.
convertToDateByLocalDateTime
(
preVo
.
getExpectedCollectionTime
()));
dataR
=
socialDaprUtils
.
checkIsWorkDay
(
vo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Boolean
.
TRUE
.
equals
(
dataR
.
getData
()))
{
return
"批增类型的预计派单日期不能为工作日;"
;
}
}
if
(
preVo
.
getBuyType
()
==
4
&&
Common
.
isNotNull
(
preVo
.
getExpectedCollectionTime
())){
vo
.
setRegistDate
(
DateUtil
.
convertToDateByLocalDateTime
(
preVo
.
getExpectedCollectionTime
()));
dataR
=
socialDaprUtils
.
checkIsWorkDay
(
vo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Boolean
.
TRUE
.
equals
(
dataR
.
getData
()))
{
return
"替换类型的预计派单日期不能为工作日;"
;
}
}
return
null
;
}
// 商险是否存在判断 type 1 单个接收 2 批量接收
private
TEmployeeInsuranceExitCheckVo
checkInsuranceExit
(
TEmployeeInsurancePreVo
preVo
)
{
//查询入职确认信息数据
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
c16097ca
...
...
@@ -126,7 +126,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
return
wrapper
;
}
private
SerializerFeature
[]
features
=
new
SerializerFeature
[]{
private
static
final
SerializerFeature
[]
features
=
new
SerializerFeature
[]{
WriteMapNullValue
,
WriteNullNumberAsZero
,
WriteNullListAsEmpty
,
WriteNullStringAsEmpty
,
WriteDateUseDateFormat
};
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
c16097ca
...
...
@@ -644,11 +644,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
TEmployeeInsuranceExitCheckVo
checkVo
;
List
<
EmployeeRegistrationReceiveVo
>
receiveVoList
=
new
ArrayList
<>();
R
<
TEmployeeInsuranceWorkDayVo
>
dataR
;
for
(
EmployeeRegistration
registration:
registrationList
)
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
insurancePreVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
insurancePreVo
.
setDeptNo
(
registration
.
getDeptNo
());
//日期赋值
TEmployeeInsuranceWorkDayVo
dayVo
=
new
TEmployeeInsuranceWorkDayVo
();
dayVo
.
setType
(
CommonConstants
.
TWO_STRING
);
dayVo
.
setRegistDate
(
registration
.
getJoinLeaveDate
());
dataR
=
socialDaprUtils
.
getBeforeOrAfterWorkDay
(
dayVo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Common
.
isNotNull
(
dataR
.
getData
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
getRegistDate
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
getPriDisDate
()))
{
insurancePreVo
.
setExpectedCollectionTime
(
dataR
.
getData
().
getPriDisDate
());
insurancePreVo
.
setPolicyEffect
(
dataR
.
getData
().
getRegistDate
());
if
(
Common
.
isEmpty
(
insurancePreVo
.
getPolicyStart
()))
{
insurancePreVo
.
setPolicyStart
(
dataR
.
getData
().
getRegistDate
());
}
}
else
{
insurancePreVo
.
setExpectedCollectionTime
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setPolicyEffect
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
}
//商险是否存在判断
checkVo
=
checkInsuranceExit
(
insurancePreVo
,
registration
.
getEmployeeName
(),
registration
.
getEmpIdcard
());
if
(
null
!=
checkVo
)
{
...
...
@@ -1208,58 +1227,28 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo
.
setUpdateBy
(
user
.
getId
());
//预计派单日期
if
(
Common
.
isEmpty
(
preVo
.
getExpectedCollectionTime
())
&&
Common
.
isNotNull
(
preVo
.
getPolicyStartType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getPolicyStartType
()))
{
//新增选择保单开始日期类型= 默认等于入职日期
TEmployeeInsuranceWorkDayVo
dayVo
=
new
TEmployeeInsuranceWorkDayVo
();
dayVo
.
setType
(
CommonConstants
.
TWO_STRING
);
dayVo
.
setRegistDate
(
preVo
.
getJoinLeaveDate
());
R
<
TEmployeeInsuranceWorkDayVo
>
dataR
=
socialDaprUtils
.
getBeforeOrAfterWorkDay
(
dayVo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Common
.
isNotNull
(
dataR
.
getData
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
getRegistDate
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
getPriDisDate
()))
{
preVo
.
setExpectedCollectionTime
(
dataR
.
getData
().
getPriDisDate
());
preVo
.
setPolicyEffect
(
dataR
.
getData
().
getRegistDate
());
preVo
.
setPolicyStart
(
dataR
.
getData
().
getRegistDate
());
}
else
{
preVo
.
setExpectedCollectionTime
(
preVo
.
getJoinLeaveDate
());
preVo
.
setPolicyEffect
(
preVo
.
getJoinLeaveDate
());
preVo
.
setPolicyStart
(
preVo
.
getJoinLeaveDate
());
}
}
// if (Common.isEmpty(preVo.getExpectedCollectionTime()) && Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) {
// //新增选择保单开始日期类型= 默认等于入职日期
// TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
// dayVo.setType(CommonConstants.TWO_STRING);
// dayVo.setRegistDate(preVo.getJoinLeaveDate());
// R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
// if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
// && Common.isNotNull(dataR.getData().getRegistDate())
// && Common.isNotNull(dataR.getData().getPriDisDate())) {
// preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate());
// preVo.setPolicyEffect(dataR.getData().getRegistDate());
// preVo.setPolicyStart(dataR.getData().getRegistDate());
// } else {
// preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate());
// preVo.setPolicyEffect(preVo.getJoinLeaveDate());
// preVo.setPolicyStart(preVo.getJoinLeaveDate());
// }
// }
preVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 15:20"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
//商险的工作日判断 type 1 单个接收 2 批量接收
private
String
checkInsuranceBuy
(
TEmployeeInsurancePreVo
preVo
,
String
type
)
{
//新增判断保单开始日期
TEmployeeInsuranceWorkDayVo
vo
=
new
TEmployeeInsuranceWorkDayVo
();
R
<
Boolean
>
dataR
;
if
(
preVo
.
getBuyType
()
==
1
)
{
vo
.
setRegistDate
(
preVo
.
getPolicyStart
());
dataR
=
socialDaprUtils
.
checkIsWorkDay
(
vo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Boolean
.
TRUE
.
equals
(
dataR
.
getData
()))
{
return
"新增类型的保单开始日期不能为工作日;"
;
}
}
if
(
preVo
.
getBuyType
()
==
3
&&
CommonConstants
.
ONE_STRING
.
equals
(
type
)){
vo
.
setRegistDate
(
preVo
.
getExpectedCollectionTime
());
dataR
=
socialDaprUtils
.
checkIsWorkDay
(
vo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Boolean
.
TRUE
.
equals
(
dataR
.
getData
()))
{
return
"批增类型的预计派单日期不能为工作日;"
;
}
}
if
(
preVo
.
getBuyType
()
==
4
&&
CommonConstants
.
ONE_STRING
.
equals
(
type
)){
vo
.
setRegistDate
(
preVo
.
getExpectedCollectionTime
());
dataR
=
socialDaprUtils
.
checkIsWorkDay
(
vo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Boolean
.
TRUE
.
equals
(
dataR
.
getData
()))
{
return
"替换类型的预计派单日期不能为工作日;"
;
}
}
return
null
;
}
//商险是否存在判断
private
TEmployeeInsuranceExitCheckVo
checkInsuranceExit
(
TEmployeeInsurancePreVo
preVo
,
String
empName
,
String
empIdcard
)
{
//查询入职确认信息数据
...
...
@@ -1269,7 +1258,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//查询商险数据
TInsuranceDetail
insuranceDetail
=
null
;
R
<
TEmployeeInsuranceSelectVo
>
dataInsurR
=
insuranceDaprUtil
.
selectInsuranceInfo
(
preVo
);
if
(
Common
.
isNotNull
(
dataInsurR
)
&&
Common
.
isNotNull
(
dataInsurR
.
getData
().
getInsuranceDetail
()))
{
if
(
Common
.
isNotNull
(
dataInsurR
)
&&
Common
.
isNotNull
(
dataInsurR
.
getData
()
)&&
Common
.
isNotNull
(
dataInsurR
.
getData
()
.
getInsuranceDetail
()))
{
insuranceDetail
=
dataInsurR
.
getData
().
getInsuranceDetail
();
}
//二次确认接收场景
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
c16097ca
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -136,6 +137,7 @@ public class TInsuranceDetail extends BaseEntity {
* 办理时间
*/
@Schema
(
description
=
"办理时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
batchDate
;
/**
...
...
@@ -289,6 +291,7 @@ public class TInsuranceDetail extends BaseEntity {
* 商险办理时间
*/
@Schema
(
description
=
"商险办理时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
handledTime
;
/**
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
View file @
c16097ca
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -17,6 +18,7 @@ import java.util.Date;
* @date 2025-03-31 12:25:13
*/
@Data
@ColumnWidth
(
18
)
public
class
TEmployeeInsurancePreExportVo
implements
Serializable
{
/**
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TEmployeeInsurancePreMapper.java
View file @
c16097ca
...
...
@@ -37,7 +37,7 @@ public interface TEmployeeInsurancePreMapper extends BaseMapper<TEmployeeInsuran
void
updateBatchById
(
@Param
(
"idList"
)
List
<
String
>
idList
);
List
<
TEmployeeInsurancePreExportVo
>
selectExportList
(
@Param
(
"
employeeRegistration
"
)
TEmployeeInsurancePreSearchVo
employeeRegistration
);
List
<
TEmployeeInsurancePreExportVo
>
selectExportList
(
@Param
(
"
tEmployeeInsurancePre
"
)
TEmployeeInsurancePreSearchVo
employeeRegistration
);
List
<
TEmployeeInsurancePre
>
getAllUnconfimData
();
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
c16097ca
...
...
@@ -226,20 +226,20 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
addParam
.
setInsurancePreId
(
insurancePre
.
getId
());
batchAddParamList
.
add
(
addParam
);
}
if
(
CommonConstants
.
THREE
_INT
==
insurancePre
.
getBuyType
())
{
if
(
CommonConstants
.
FOUR
_INT
==
insurancePre
.
getBuyType
())
{
InsuranceReplaceParam
addParam
=
new
InsuranceReplaceParam
();
addParam
.
setEmpName
(
insurancePre
.
getEmployeeName
());
addParam
.
setEmpIdcardNo
(
insurancePre
.
getEmpIdcard
());
addParam
.
setDeptNo
(
insurancePre
.
getDeptNo
());
addParam
.
setEmpName
(
insurancePre
.
get
Replace
EmployeeName
());
addParam
.
setEmpIdcardNo
(
insurancePre
.
get
Replace
EmpIdcard
());
addParam
.
setDeptNo
(
insurancePre
.
get
Replace
DeptNo
());
addParam
.
setInsuranceCompanyName
(
insurancePre
.
getInsuranceCompanyName
());
addParam
.
setInsuranceTypeName
(
insurancePre
.
getInsuranceTypeName
());
addParam
.
setBuyStandard
(
insurancePre
.
getBuyStandard
());
addParam
.
setPolicyStart
(
DateUtil
.
dateToString
(
insurancePre
.
getPolicyStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
addParam
.
setPolicyEnd
(
DateUtil
.
dateToString
(
insurancePre
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
addParam
.
setPost
(
insurancePre
.
getPosition
());
addParam
.
setReplaceEmpName
(
insurancePre
.
get
Replace
EmployeeName
());
addParam
.
setReplaceDeptNo
(
insurancePre
.
get
Replace
DeptNo
());
addParam
.
setReplaceEmpIdcardNo
(
insurancePre
.
get
Replace
EmpIdcard
());
addParam
.
setReplaceEmpName
(
insurancePre
.
getEmployeeName
());
addParam
.
setReplaceDeptNo
(
insurancePre
.
getDeptNo
());
addParam
.
setReplaceEmpIdcardNo
(
insurancePre
.
getEmpIdcard
());
addParam
.
setRemark
(
CommonConstants
.
EMPTY_STRING
);
addParam
.
setInsurancePreId
(
insurancePre
.
getId
());
replaceAddParamList
.
add
(
addParam
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
c16097ca
...
...
@@ -2979,12 +2979,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
// 结算月份 >= 派单月份(结算月 < 派单月份的记录予以拦截,并提示)
if
(!
LocalDateUtil
.
isDate
(
param
.
getSettleMonth
(),
LocalDateUtil
.
NORM_MONTH_PATTERN
)){
if
(
Common
.
isNotNull
(
param
.
getSettleMonth
())
&&
!
LocalDateUtil
.
isDate
(
param
.
getSettleMonth
(),
LocalDateUtil
.
NORM_MONTH_PATTERN
)){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_MONTH_PARSE_ERROR
);
listResult
.
add
(
param
);
continue
;
}
if
(!
LocalDateUtil
.
isCurrentOrFutureMonth
(
param
.
getSettleMonth
())){
if
(
Common
.
isNotNull
(
param
.
getSettleMonth
())
&&
!
LocalDateUtil
.
isCurrentOrFutureMonth
(
param
.
getSettleMonth
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_MONTH_SHOULD_IS_FUTURE
);
listResult
.
add
(
param
);
continue
;
...
...
@@ -3347,12 +3347,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
// 结算月份 >= 派单月份(结算月 < 派单月份的记录予以拦截,并提示)
if
(!
LocalDateUtil
.
isDate
(
param
.
getSettleMonth
(),
LocalDateUtil
.
NORM_MONTH_PATTERN
)){
if
(
Common
.
isNotNull
(
param
.
getSettleMonth
())
&&
!
LocalDateUtil
.
isDate
(
param
.
getSettleMonth
(),
LocalDateUtil
.
NORM_MONTH_PATTERN
)){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_MONTH_PARSE_ERROR
);
listResult
.
add
(
param
);
continue
;
}
if
(!
LocalDateUtil
.
isCurrentOrFutureMonth
(
param
.
getSettleMonth
())){
if
(
Common
.
isNotNull
(
param
.
getSettleMonth
())
&&
!
LocalDateUtil
.
isCurrentOrFutureMonth
(
param
.
getSettleMonth
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_MONTH_SHOULD_IS_FUTURE
);
listResult
.
add
(
param
);
continue
;
...
...
@@ -3564,18 +3564,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//校验身份合法
TCheckIdCard
checkIdCard
=
new
TCheckIdCard
();
checkIdCard
.
setName
(
param
.
getReplaceEmpName
());
checkIdCard
.
setIdCard
(
param
.
getReplaceEmpIdcardNo
());
R
<
TCheckIdCard
>
tCheckIdCardR
=
checkDaprUtil
.
checkIdCardSingle
(
checkIdCard
);
if
(
null
!=
tCheckIdCardR
&&
tCheckIdCardR
.
getCode
()
==
CommonConstants
.
SUCCESS
){
TCheckIdCard
data
=
tCheckIdCardR
.
getData
();
if
(
CommonConstants
.
ONE_INT
!=
data
.
getIsTrue
()){
param
.
setErrorMessage
(
InsurancesConstants
.
REPLACE_EMP_ID_CARD_NO_NOT_FIT
);
listResult
.
add
(
param
);
continue
;
}
}
//
TCheckIdCard checkIdCard = new TCheckIdCard();
//
checkIdCard.setName(param.getReplaceEmpName());
//
checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
//
R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
//
if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
//
TCheckIdCard data = tCheckIdCardR.getData();
//
if (CommonConstants.ONE_INT != data.getIsTrue()){
//
param.setErrorMessage(InsurancesConstants.REPLACE_EMP_ID_CARD_NO_NOT_FIT);
//
listResult.add(param);
//
continue;
//
}
//
}
if
(
param
.
getEmpName
().
equals
(
param
.
getReplaceEmpName
())
&&
param
.
getEmpIdcardNo
().
equals
(
param
.
getReplaceEmpIdcardNo
())){
param
.
setErrorMessage
(
InsurancesConstants
.
REPLACE_EMP_INFO_SAME
);
...
...
@@ -6470,12 +6470,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue
;
}
// 结算月份 >= 派单月份(结算月 < 派单月份的记录予以拦截,并提示)
if
(!
LocalDateUtil
.
isDate
(
param
.
getSettleMonth
(),
LocalDateUtil
.
NORM_MONTH_PATTERN
)){
if
(
Common
.
isNotNull
(
param
.
getSettleMonth
())
&&
!
LocalDateUtil
.
isDate
(
param
.
getSettleMonth
(),
LocalDateUtil
.
NORM_MONTH_PATTERN
)){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_MONTH_PARSE_ERROR
);
errorList
.
add
(
param
);
continue
;
}
if
(!
LocalDateUtil
.
isCurrentOrFutureMonth
(
param
.
getSettleMonth
())){
if
(
Common
.
isNotNull
(
param
.
getSettleMonth
())
&&
!
LocalDateUtil
.
isCurrentOrFutureMonth
(
param
.
getSettleMonth
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_MONTH_SHOULD_IS_FUTURE
);
errorList
.
add
(
param
);
continue
;
...
...
@@ -8295,8 +8295,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
eq
(
TInsuranceDetail:
:
getBuyStandard
,
preVo
.
getBuyStandard
())
.
eq
(
TInsuranceDetail:
:
getInsuranceTypeName
,
preVo
.
getInsuranceTypeName
())
.
eq
(
TInsuranceDetail:
:
getInsuranceCompanyName
,
preVo
.
getInsuranceCompanyName
())
.
eq
(
TInsuranceDetail:
:
getPolicyStart
,
preVo
.
getPolicyStart
(
))
.
eq
(
TInsuranceDetail:
:
getPolicyEnd
,
preVo
.
getPolicyEnd
(
))
.
eq
(
TInsuranceDetail:
:
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
DateUtil
.
dateToString
(
preVo
.
getPolicyStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
))
.
eq
(
TInsuranceDetail:
:
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
DateUtil
.
dateToString
(
preVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
))
.
eq
(
TInsuranceDetail:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
//有效
.
and
(
wrapper
->
wrapper
.
eq
(
TInsuranceDetail:
:
getIsEffect
,
CommonConstants
.
ZERO_INT
)
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TEmployeeInsurancePreMapper.xml
View file @
c16097ca
...
...
@@ -39,6 +39,7 @@
<result
property=
"replaceEmpIdcard"
column=
"replace_emp_idcard"
/>
<result
property=
"replaceDeptNo"
column=
"replace_dept_no"
/>
<result
property=
"configName"
column=
"config_name"
/>
<result
property=
"insurancesId"
column=
"insurances_id"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createName"
column=
"create_name"
/>
<result
property=
"createTime"
column=
"create_time"
/>
...
...
@@ -97,7 +98,7 @@
a.create_name,
a.create_time,
a.update_by,
a.update_time,a.policy_no,a.config_name,a.policy_effect
a.update_time,a.policy_no,a.config_name,a.policy_effect
,a.insurances_id
</sql>
<sql
id=
"tEmployeeInsurancePre_where"
>
<if
test=
"tEmployeeInsurancePre != null"
>
...
...
@@ -181,7 +182,7 @@
AND a.is_address = #{tEmployeeInsurancePre.isAddress}
</if>
<if
test=
"tEmployeeInsurancePre.position != null and tEmployeeInsurancePre.position.trim() != ''"
>
AND a.position = #{tEmployeeInsurancePre.position}
AND a.position like CONCAT('%',#{tEmployeeInsurancePre.position},'%')
</if>
<if
test=
"tEmployeeInsurancePre.dataSource != null and tEmployeeInsurancePre.dataSource.trim() != ''"
>
AND a.data_source = #{tEmployeeInsurancePre.dataSource}
...
...
@@ -225,6 +226,7 @@
1=1
<include
refid=
"tEmployeeInsurancePre_where"
/>
</where>
order by a.create_time desc
</select>
<!--tEmployeeInsurancePre不分页查询-->
...
...
@@ -236,6 +238,7 @@
1=1
<include
refid=
"tEmployeeInsurancePre_where"
/>
</where>
order by a.create_time desc
</select>
<!--查询list,用来对比,记录日志-->
...
...
@@ -294,7 +297,7 @@
WHEN a.buy_type='3' THEN "批增"
WHEN a.buy_type ='4' THEN "替换"
ELSE a.buy_type END as buy_type,
if(a.is_address = '0','是',
'否'
) as is_address
if(a.is_address = '0','是',
if(a.is_address = '1','否','')
) as is_address
FROM t_employee_insurance_pre a
<where>
1=1
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFriendReduceSet.java
0 → 100644
View file @
c16097ca
/*
* 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
.
social
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
/**
* 离职原因税友自动化配置表
*
* @author hgw
* @date 2025-04-14 11:57:06
*/
@Data
@TableName
(
"t_social_friend_reduce_set"
)
@Schema
(
description
=
"离职原因税友自动化配置表"
)
public
class
TSocialFriendReduceSet
{
/**
* 减少原因ID
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ExcelProperty
(
"减少原因ID"
)
@Schema
(
description
=
"减少原因ID"
)
private
String
id
;
/**
* 减少原因
*/
@ExcelAttribute
(
name
=
"减少原因"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"减少原因不能超过32个字符"
)
@ExcelProperty
(
"减少原因"
)
@Schema
(
description
=
"减少原因"
)
private
String
reduceReasonName
;
/**
* 中断原因
*/
@ExcelAttribute
(
name
=
"中断原因"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"中断原因不能超过32个字符"
)
@ExcelProperty
(
"中断原因"
)
@Schema
(
description
=
"中断原因"
)
private
String
tbyy
;
/**
* 劳动用工备案解除/终止原因
*/
@ExcelAttribute
(
name
=
"劳动用工备案解除/终止原因"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"劳动用工备案解除/终止原因不能超过32个字符"
)
@ExcelProperty
(
"劳动用工备案解除/终止原因"
)
@Schema
(
description
=
"劳动用工备案解除/终止原因"
)
private
String
zzyy
;
/**
* 备案解除二级原因
*/
@ExcelAttribute
(
name
=
"备案解除二级原因"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"备案解除二级原因不能超过32个字符"
)
@ExcelProperty
(
"备案解除二级原因"
)
@Schema
(
description
=
"备案解除二级原因"
)
private
String
bajcejyy
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
c16097ca
...
...
@@ -106,4 +106,7 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty
(
"派单类型"
)
private
String
type
;
@ExcelProperty
(
"备案解除二级原因"
)
private
String
bajcejyy
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
c16097ca
...
...
@@ -474,6 +474,7 @@ public class SocialFriendConfig {
// 办理项目
blxmlbOne
.
put
(
"blxm"
,
blxm
);
// 中断原因 除死亡以外,其他停保原因默认:“在职人员解除/终止劳动合同” 死亡对应“死亡或失踪”
// 2025-4-14 16:03:54 陈红提的:tbyy 、 zzyy 、 bajcejyy 改为按t_social_friend_reduce_set配置来
blxmlbOne
.
put
(
"tbyy"
,
vo
.
getTbyy
());
// 中断时间 yyyy-MM-dd 默认当前时间
blxmlbOne
.
put
(
"tbsj"
,
DateUtil
.
getLastDay
());
...
...
@@ -484,6 +485,7 @@ public class SocialFriendConfig {
tszdxx
=
new
JSONObject
();
// 劳动用工备案解除/终止原因 数据字典文档 法律依据 [社保]必填;
tszdxx
.
put
(
"zzyy"
,
vo
.
getZzyy
());
tszdxx
.
put
(
"bajcejyy"
,
vo
.
getBajcejyy
());
// 社保个人身份材料 无
// tszdxx.put("shjycl", )
// 医保个人身份材料 无
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFriendReduceSetMapper.java
0 → 100644
View file @
c16097ca
/*
* 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
.
social
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
/**
* 离职原因税友自动化配置表
*
* @author hgw
* @date 2025-04-14 11:57:06
*/
@Mapper
public
interface
TSocialFriendReduceSetMapper
extends
BaseMapper
<
TSocialFriendReduceSet
>
{
/**
* @Description: 获取全量信息
* @Author: hgw
* @Date: 2025/4/14 15:24
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet>
**/
List
<
TSocialFriendReduceSet
>
getTSocialFriendReduceSetList
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFriendReduceSetService.java
0 → 100644
View file @
c16097ca
/*
* 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
.
social
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet
;
import
java.util.Map
;
/**
* 离职原因税友自动化配置表
*
* @author hgw
* @date 2025-04-14 11:57:06
*/
public
interface
TSocialFriendReduceSetService
extends
IService
<
TSocialFriendReduceSet
>
{
/**
* @Description: 查找List并组装Map
* @Author: hgw
* @Date: 2025/4/14 15:23
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet>
**/
Map
<
String
,
TSocialFriendReduceSet
>
getFriendReduceMap
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c16097ca
...
...
@@ -3601,6 +3601,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getUnemployHandle
()))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
))
{
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
ONE_STRING
);
}
else
{
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
ZERO_STRING
);
}
if
((
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getMedicalHandle
())
...
...
@@ -3610,6 +3612,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
()))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
))
{
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
ONE_STRING
);
}
else
{
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
ZERO_STRING
);
}
socialInfo
.
setYgsAddId
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
socialInfo
.
setYgsRequestId
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
c16097ca
...
...
@@ -312,7 +312,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
}
//查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo
newVo
=
new
TEmployeeInsuranceWorkDayVo
();
newVo
.
setRegistDate
(
vo
.
getRegistDate
(
));
newVo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getRegistDate
(),
CommonConstants
.
ONE_INT_NEGATE
));
newVo
.
setType
(
CommonConstants
.
ONE_STRING
);
getWorkDay
(
holidayMap
,
newVo
);
...
...
@@ -333,11 +333,11 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
}
else
{
// 如果当前时间在15:20之后
TEmployeeInsuranceWorkDayVo
afterVo
=
new
TEmployeeInsuranceWorkDayVo
();
afterVo
.
setRegistDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
afterVo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
),
CommonConstants
.
ONE_INT
));
afterVo
.
setType
(
CommonConstants
.
TWO_STRING
);
getWorkDay
(
holidayMap
,
afterVo
);
vo
.
setPriDisDate
(
afterVo
.
getRegistDate
());
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
newVo
.
getRegist
Date
(),
CommonConstants
.
ONE_INT
));
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getPriDis
Date
(),
CommonConstants
.
ONE_INT
));
}
}
else
{
//如果前一个工作日日期大于今天
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
c16097ca
...
...
@@ -66,6 +66,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialFriendBackLogService
tSocialFriendBackLogService
;
private
final
TSocialFreindSetService
tSocialFreindSetService
;
private
final
TSocialFriendReduceSetService
tSocialFriendReduceSetService
;
private
final
TSocialInfoMapper
socialMapper
;
private
final
AtomicInteger
atomicPushFriend
=
new
AtomicInteger
(
0
);
...
...
@@ -98,6 +99,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
if
(
set
!=
null
&&
Common
.
isNotNull
(
set
.
getType
())
&&
1
==
set
.
getType
())
{
Map
<
String
,
TSocialFriendReduceSet
>
reduceMap
=
tSocialFriendReduceSetService
.
getFriendReduceMap
();
// 获取时间限制配置(获取 当月启用 的配置)
Map
<
String
,
TSocialDeadlineInfo
>
socialSetMap
=
tSocialDeadlineInfoService
.
getSocialSetByAreaId
();
...
...
@@ -105,23 +108,23 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 养工失新增列表
List
<
SociaFriendYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsAddlist
,
1
);
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsAddlist
,
1
,
reduceMap
);
}
// 养工失减少列表
List
<
SociaFriendYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsReducelist
,
2
);
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsReducelist
,
2
,
reduceMap
);
}
// 医生大新增列表
List
<
SociaFriendYgsAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdAddlist
,
3
);
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdAddlist
,
3
,
reduceMap
);
}
// 医生大减少列表
List
<
SociaFriendYgsAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdReducelist
,
4
);
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdReducelist
,
4
,
reduceMap
);
}
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
...
...
@@ -148,7 +151,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
* @return: void
**/
private
void
doPushSocialAndLogYgs
(
Map
<
String
,
TSocialDeadlineInfo
>
socialSetMap
,
List
<
SociaFriendYgsAddVo
>
ygsAddlist
,
int
type
)
{
,
List
<
SociaFriendYgsAddVo
>
ygsAddlist
,
int
type
,
Map
<
String
,
TSocialFriendReduceSet
>
reduceMap
)
{
int
canPushType
;
TSocialInfo
socialInfo
;
String
typeStr
=
"提交"
;
...
...
@@ -170,8 +173,29 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean
nextFlag
=
false
;
SociaFriendYgsAddVo
vo
;
int
i
=
1
;
TSocialFriendReduceSet
reduceSet
;
for
(
int
index
=
0
;
index
<
ygsAddlist
.
size
();
index
++)
{
vo
=
ygsAddlist
.
get
(
index
);
// 派减离职原因转化:
if
(
type
==
2
&&
Common
.
isNotNull
(
vo
.
getTbyy
()))
{
reduceSet
=
reduceMap
.
get
(
vo
.
getTbyy
());
if
(
reduceSet
!=
null
)
{
vo
.
setTbyy
(
reduceSet
.
getTbyy
());
vo
.
setZzyy
(
reduceSet
.
getZzyy
());
vo
.
setBajcejyy
(
reduceSet
.
getBajcejyy
());
}
else
{
remark
=
"超出离职原因的配置,转人工!配置为:"
+
vo
.
getTbyy
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
socialLog
=
tSocialSoldierLogService
.
getFriendLog
(
vo
,
typeStr
,
dispatchItem
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
continue
;
}
}
// 0:未到时间不动; 1:推送; 2:转人工
canPushType
=
this
.
getCanPushType
(
socialSetMap
,
vo
);
if
(
1
==
canPushType
)
{
...
...
@@ -261,7 +285,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
* @return: void
**/
private
void
doPushSocialAndLogYsd
(
Map
<
String
,
TSocialDeadlineInfo
>
socialSetMap
,
List
<
SociaFriendYgsAddVo
>
ysdAddlist
,
int
type
)
{
,
List
<
SociaFriendYgsAddVo
>
ysdAddlist
,
int
type
,
Map
<
String
,
TSocialFriendReduceSet
>
reduceMap
)
{
int
canPushType
;
TSocialInfo
socialInfo
;
String
typeStr
=
"提交"
;
...
...
@@ -284,10 +308,12 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean
nextFlag
=
false
;
SociaFriendYgsAddVo
vo
;
int
i
=
1
;
TSocialFriendReduceSet
reduceSet
;
for
(
int
index
=
0
;
index
<
ysdAddlist
.
size
();
index
++)
{
vo
=
ysdAddlist
.
get
(
index
);
// 0:未到时间不动; 1:推送; 2:转人工
if
(
"
劳动者死亡
"
.
equals
(
vo
.
getTbyy
()))
{
if
(
"
16
"
.
equals
(
vo
.
getTbyy
()))
{
remark
=
"劳动者死亡,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
...
...
@@ -298,6 +324,26 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
logList
.
add
(
socialLog
);
}
}
else
{
// 派减离职原因转化:
if
(
type
==
2
&&
Common
.
isNotNull
(
vo
.
getTbyy
()))
{
reduceSet
=
reduceMap
.
get
(
vo
.
getTbyy
());
if
(
reduceSet
!=
null
)
{
vo
.
setTbyy
(
reduceSet
.
getTbyy
());
vo
.
setZzyy
(
reduceSet
.
getZzyy
());
vo
.
setBajcejyy
(
reduceSet
.
getBajcejyy
());
}
else
{
remark
=
"超出医保离职原因的配置,转人工!配置为:"
+
vo
.
getTbyy
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
socialLog
=
tSocialSoldierLogService
.
getFriendLog
(
vo
,
typeStr
,
dispatchItem
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
continue
;
}
}
canPushType
=
this
.
getCanPushTypeYsd
(
socialSetMap
,
vo
);
if
(
1
==
canPushType
)
{
try
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendReduceSetServiceImpl.java
0 → 100644
View file @
c16097ca
/*
* 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
.
social
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.google.common.collect.Maps
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFriendReduceSetMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendReduceSetService
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
/**
* 离职原因税友自动化配置表
*
* @author hgw
* @date 2025-04-14 11:57:06
*/
@Log4j2
@Service
public
class
TSocialFriendReduceSetServiceImpl
extends
ServiceImpl
<
TSocialFriendReduceSetMapper
,
TSocialFriendReduceSet
>
implements
TSocialFriendReduceSetService
{
@Override
public
Map
<
String
,
TSocialFriendReduceSet
>
getFriendReduceMap
()
{
List
<
TSocialFriendReduceSet
>
list
=
baseMapper
.
getTSocialFriendReduceSetList
();
// 将list转化为map
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
Map
<
String
,
TSocialFriendReduceSet
>
map
=
Maps
.
newHashMap
();
for
(
TSocialFriendReduceSet
reduceSet
:
list
)
{
map
.
put
(
reduceSet
.
getId
(),
reduceSet
);
}
return
map
;
}
return
null
;
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
c16097ca
...
...
@@ -74,14 +74,8 @@
when '2' then '无固定期限劳动合同'
else '固定期限劳动合同' end contractTypeTwo,
a.CONTRACT_END contractEnd,
if(a.REDUCE_REASON = '16','其他原因中断缴费','在职人员主动解除劳动合同') tbyy,
case a.REDUCE_REASON
when '21' then '职工与用人单位协商一致解除劳动合同(18条1款)'
when '5' then '第四十四条第二项,劳动者开始依法享受基本养老保险待遇'
when '16' then '劳动者死亡,或者被人民法院宣告死亡或者宣告失踪'
when '1' then '劳动者提前30天书面通知解除或试用期提前3天通知解除合同'
when '2' then '劳动者严重违反用人单位的规章制度'
else '法律、行政法规规定的其他情形' end zzyy,
a.REDUCE_REASON tbyy,
a.REDUCE_REASON zzyy,
s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown,
...
...
@@ -222,14 +216,8 @@
when '2' then '无固定期限劳动合同'
else '固定期限劳动合同' end contractTypeTwo,
a.CONTRACT_END contractEnd,
if(a.REDUCE_REASON = '16','劳动者死亡','在职人员解除/终止劳动合同') tbyy,
case a.REDUCE_REASON
when '21' then '职工与用人单位协商一致解除劳动合同(18条1款)'
when '5' then '第四十四条第二项,劳动者开始依法享受基本养老保险待遇'
when '16' then '劳动者死亡,或者被人民法院宣告死亡或者宣告失踪'
when '1' then '劳动者提前30天书面通知解除或试用期提前3天通知解除合同'
when '2' then '劳动者严重违反用人单位的规章制度'
else '法律、行政法规规定的其他情形' end zzyy,
a.REDUCE_REASON tbyy,
a.REDUCE_REASON zzyy,
s.SOCIAL_PROVINCE socialProvince,
s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown,
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendReduceSetMapper.xml
0 → 100644
View file @
c16097ca
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ 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)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFriendReduceSetMapper"
>
<resultMap
id=
"tSocialFriendReduceSetMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet"
>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"reduceReasonName"
column=
"REDUCE_REASON_NAME"
/>
<result
property=
"tbyy"
column=
"TBYY"
/>
<result
property=
"zzyy"
column=
"ZZYY"
/>
<result
property=
"bajcejyy"
column=
"BAJCEJYY"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
a.TBYY,
a.ZZYY,
a.BAJCEJYY
</sql>
<!--tSocialFriendReduceSet简单分页查询-->
<select
id=
"getTSocialFriendReduceSetList"
resultMap=
"tSocialFriendReduceSetMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_social_friend_reduce_set a
</select>
</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