Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
40c336a3
You need to sign in or sign up before continuing.
Commit
40c336a3
authored
Apr 18, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
2159f328
237e0a37
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
204 additions
and
40 deletions
+204
-40
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+3
-0
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+11
-2
TEmployeeProjectBelongDeptServiceImpl.java
...s/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
+1
-1
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-0
pom.xml
yifu-ekp/yifu-ekp-biz/pom.xml
+5
-0
IcbcTransactionFlowIssueController.java
...v1/ekp/controller/IcbcTransactionFlowIssueController.java
+5
-0
IcbcTransactionFlowIssueService.java
.../plus/v1/ekp/service/IcbcTransactionFlowIssueService.java
+2
-1
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+63
-0
EkpShenhepeizhiMapper.xml
...p-biz/src/main/resources/mapper/EkpShenhepeizhiMapper.xml
+4
-4
InsuranceExportListOneVO.java
.../plus/v1/yifu/insurances/vo/InsuranceExportListOneVO.java
+10
-0
InsuranceExportListVO.java
...oud/plus/v1/yifu/insurances/vo/InsuranceExportListVO.java
+10
-0
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+41
-28
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+2
-0
TEmployeeInsurancePreMapper.xml
...sources/mapper/insurances/TEmployeeInsurancePreMapper.xml
+1
-1
UpdateOverdueTask.java
...com/yifu/cloud/plus/v1/job/compont/UpdateOverdueTask.java
+13
-0
TEmployeeInsuranceWorkDayVo.java
...d/plus/v1/yifu/social/vo/TEmployeeInsuranceWorkDayVo.java
+3
-0
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
+25
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
40c336a3
...
...
@@ -886,6 +886,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
@Override
public
R
batchSendMessage
(
List
<
SendMessageUpdateVo
>
voList
,
String
type
)
{
if
(
Common
.
isNotNull
(
voList
)
&&
voList
.
size
()
>
200
)
{
return
R
.
failed
(
"短信批量发送单次最多两百条"
);
}
//获取短信待发放和信息待填写的数据
List
<
String
>
errorList
=
new
ArrayList
<>();
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
40c336a3
...
...
@@ -34,7 +34,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
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.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties
;
...
...
@@ -156,6 +155,16 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
IGNORE_FIELD
.
add
(
"isAddress"
);
}
private
static
final
List
<
String
>
PRE_IGNORE_FIELD
=
new
ArrayList
<>();
static
{
IGNORE_FIELD
.
add
(
"createTime"
);
IGNORE_FIELD
.
add
(
"deptId"
);
IGNORE_FIELD
.
add
(
"dataSource"
);
IGNORE_FIELD
.
add
(
"createBy"
);
IGNORE_FIELD
.
add
(
"createName"
);
IGNORE_FIELD
.
add
(
"updateBy"
);
}
@Override
public
void
saveModifyAndUpdateInsurance
(
String
empPreId
,
EmployeeRegistrationPre
oldInfo
,
EmployeeRegistrationPre
newInfo
,
YifuUser
user
,
Map
<
String
,
TEmployeeInsurancePre
>
oldMap
)
{
...
...
@@ -321,7 +330,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if
(
Common
.
isNotNull
(
newInsurance
.
getId
()))
{
oldInsurance
=
oldMap
.
get
(
newInsurance
.
getId
());
if
(
oldInsurance
!=
null
)
{
differenceInsuranceKey
=
HrEquator
.
comparisonValue
(
oldInsurance
,
newInsurance
);
differenceInsuranceKey
=
HrEquator
.
comparisonValue
IgnoreField
(
oldInsurance
,
newInsurance
,
PRE_IGNORE_FIELD
);
}
if
(
Common
.
isNotNull
(
differenceInsuranceKey
)
||
oldInsurance
==
null
)
{
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
View file @
40c336a3
...
...
@@ -203,7 +203,7 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
dept
.
setId
(
vo
.
getProjectId
());
dept
.
setEmpDeptid
(
vo
.
getDepartId
().
toString
());
dept
.
setEmpDeptname
(
vo
.
getDepartName
());
this
.
save
(
dept
);
this
.
save
OrUpdate
(
dept
);
}
else
{
this
.
removeById
(
vo
.
getProjectId
());
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
40c336a3
...
...
@@ -186,7 +186,7 @@
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
<where>
a.delete_flag = '0' and a.IS_COMPLETE = '1'
a.delete_flag = '0' and a.IS_COMPLETE = '1'
and a.project_status = 0
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
order by a.CREATE_TIME desc
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
40c336a3
...
...
@@ -666,6 +666,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
TEmployeeInsuranceWorkDayVo
dayVo
=
new
TEmployeeInsuranceWorkDayVo
();
dayVo
.
setType
(
CommonConstants
.
TWO_STRING
);
dayVo
.
setRegistDate
(
registration
.
getJoinLeaveDate
());
if
(
insurancePreVo
.
getBuyType
()
==
1
)
{
dayVo
.
setAddOrBatch
(
CommonConstants
.
ONE_STRING
);
}
dataR
=
socialDaprUtils
.
getBeforeOrAfterWorkDay
(
dayVo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Common
.
isNotNull
(
dataR
.
getData
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
getRegistDate
())
...
...
@@ -1330,6 +1333,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//是否地市自购
preVo
.
setIsAddress
(
insuranceDetail
.
getIsAdress
());
preVo
.
setInsurancesId
(
insuranceDetail
.
getId
());
}
}
}
...
...
yifu-ekp/yifu-ekp-biz/pom.xml
View file @
40c336a3
...
...
@@ -80,6 +80,11 @@
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<groupId>
com.jcraft
</groupId>
<artifactId>
jsch
</artifactId>
<version>
0.1.55
</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.shardingsphere</groupId>-->
<!-- <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>-->
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowIssueController.java
View file @
40c336a3
...
...
@@ -136,4 +136,9 @@ public class IcbcTransactionFlowIssueController {
return
icbcTransactionFlowIssueService
.
doGetEkpBankStatus
();
}
@Operation
(
summary
=
"获取回单文件"
,
description
=
"获取回单文件"
)
@PostMapping
(
"/getPdfFile"
)
public
void
getPdfFile
()
{
icbcTransactionFlowIssueService
.
getPdfFile
();
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowIssueService.java
View file @
40c336a3
...
...
@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.ekp.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.icbc.api.response.JftApiPayrollQueryDetailResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankAtta
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankAttaReturnVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -76,4 +75,6 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo>
**/
R
<
String
>
doGetEkpBankStatus
();
void
getPdfFile
();
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
40c336a3
...
...
@@ -16,6 +16,7 @@ import com.icbc.api.response.JftApiPayrollQueryDetailResponseV1;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.icbc.api.utils.IcbcSignature
;
import
com.icbc.api.utils.WebUtils
;
import
com.jcraft.jsch.*
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcIssueConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.entity.*
;
import
com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper
;
...
...
@@ -1035,6 +1036,68 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
return
R
.
ok
();
}
@Override
public
void
getPdfFile
()
{
String
host
=
"gw.open.icbc.com.cn"
;
int
port
=
8001
;
String
username
=
"wxrl"
;
// String privateKeyPath = "/path/to/your/private_key"; // 替换为你的私钥路径
String
privateKeyPath
=
"D:/icbcFile/id_rsa"
;
// 替换为你的私钥路径
String
remoteDir
=
"/JFTStatementDownload/download"
;
String
localPath
=
"D:/icbcFile/pdfFile"
;
// 替换为本地保存路径
Session
session
=
null
;
ChannelSftp
channelSftp
=
null
;
try
{
JSch
jsch
=
new
JSch
();
// 添加私钥(注意:需要是没有密码保护的私钥)
jsch
.
addIdentity
(
privateKeyPath
);
// 创建会话
session
=
jsch
.
getSession
(
username
,
host
,
port
);
// 关闭严格的主机密钥检查(生产环境应配置known_hosts)
session
.
setConfig
(
"StrictHostKeyChecking"
,
"no"
);
session
.
connect
();
// 创建SFTP通道
channelSftp
=
(
ChannelSftp
)
session
.
openChannel
(
"sftp"
);
channelSftp
.
connect
();
// 切换远程目录
channelSftp
.
cd
(
remoteDir
);
// 列出目录文件
Vector
<
ChannelSftp
.
LsEntry
>
files
=
channelSftp
.
ls
(
"*"
);
log
.
info
(
"找到文件数量: "
+
files
.
size
());
// 下载所有文件
for
(
ChannelSftp
.
LsEntry
entry
:
files
)
{
if
(!
entry
.
getAttrs
().
isDir
())
{
String
fileName
=
entry
.
getFilename
();
log
.
info
(
"正在下载: "
+
fileName
);
channelSftp
.
get
(
fileName
,
localPath
+
fileName
);
}
}
}
catch
(
JSchException
e
)
{
if
(
e
.
getMessage
().
contains
(
"Auth fail"
))
{
return
;
}
}
catch
(
SftpException
e
)
{
return
;
}
finally
{
if
(
channelSftp
!=
null
&&
channelSftp
.
isConnected
())
{
channelSftp
.
exit
();
}
if
(
session
!=
null
&&
session
.
isConnected
())
{
session
.
disconnect
();
}
}
}
/**
* @Description: 发放记录日志
* @Author: hgw
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpShenhepeizhiMapper.xml
View file @
40c336a3
...
...
@@ -5,10 +5,10 @@
<mapper
namespace=
"com.yifu.cloud.plus.v1.ekp.mapper.EkpShenhepeizhiMapper"
>
<!--查询事业部信息:目前是
测试
环境的表名-->
<!--查询事业部信息:目前是
生产
环境的表名-->
<select
id=
"getDivisionLoginNameList"
resultType=
"string"
>
select du.fd_login_name as loginName from ekp_shenhepeizhi_table a
LEFT JOIN ekporg_192
7fe1d4d35e2548a3e
d on d.fd_parent_id = a.fd_id
LEFT JOIN ekporg_192
dc6529f546b9f2008
d on d.fd_parent_id = a.fd_id
LEFT JOIN sys_org_person du on du.fd_id = d.sys_org_person_id
where a.fd_tiaoxian = #{line} and a.fd_shiyebu = #{division}
</select>
...
...
@@ -16,7 +16,7 @@
<!--查询副总信息-->
<select
id=
"getFuLoginNameList"
resultType=
"string"
>
select fu.fd_login_name as loginName from ekp_shenhepeizhi_table a
LEFT JOIN ekporg_192
7fe509c6554968429
f on f.fd_parent_id = a.fd_id
LEFT JOIN ekporg_192
dc6529f5576856a70
f on f.fd_parent_id = a.fd_id
LEFT JOIN sys_org_person fu on fu.fd_id = f.sys_org_person_id
where a.fd_tiaoxian = #{line} and a.fd_shiyebu = #{division}
</select>
...
...
@@ -24,7 +24,7 @@
<!--查询事业部条线负责人-->
<select
id=
"getLineLoginNameList"
resultType=
"string"
>
select lu.fd_login_name as loginName from ekp_shenhepeizhi_table a
LEFT JOIN ekporg_192
7fe1d4d389080b7a7
l on l.fd_parent_id = a.fd_id
LEFT JOIN ekporg_192
dc6529f5b1d699c39
l on l.fd_parent_id = a.fd_id
LEFT JOIN sys_org_person lu on lu.fd_id = l.sys_org_person_id
where a.fd_tiaoxian = #{line} and a.fd_shiyebu = #{division}
</select>
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListOneVO.java
View file @
40c336a3
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -187,4 +189,12 @@ public class InsuranceExportListOneVO implements Serializable {
*/
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
/**
* 派单备注
*/
@Schema
(
description
=
"派单备注"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"派单备注"
)
private
String
remarkDispatch
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListVO.java
View file @
40c336a3
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -194,4 +196,12 @@ public class InsuranceExportListVO implements Serializable {
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
/**
* 派单备注
*/
@Schema
(
description
=
"派单备注"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"派单备注"
)
private
String
remarkDispatch
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
40c336a3
...
...
@@ -330,29 +330,30 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
List
<
TEmployeeInsurancePreVo
>
employeeInsurancePreVos
=
registrationPreVo
.
getEmployeeInsurancePreVos
();
TEmployeeInsurancePre
preExit
;
if
(
null
!=
employeeInsurancePreVos
&&
!
employeeInsurancePreVos
.
isEmpty
())
{
for
(
TEmployeeInsurancePreVo
preVo
:
employeeInsurancePreVos
)
{
//判断是否存在商险待购买信息
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
preVo
.
getRegisterId
())
.
eq
(
TEmployeeInsurancePre:
:
getEmpIdcard
,
preVo
.
getEmpIdcard
())
.
eq
(
TEmployeeInsurancePre:
:
getBuyStandard
,
preVo
.
getBuyStandard
())
.
eq
(
TEmployeeInsurancePre:
:
getInsuranceTypeName
,
preVo
.
getInsuranceTypeName
())
.
eq
(
TEmployeeInsurancePre:
:
getInsuranceCompanyName
,
preVo
.
getInsuranceCompanyName
())
.
eq
(
TEmployeeInsurancePre:
:
getPolicyStart
,
preVo
.
getPolicyStart
())
.
eq
(
TEmployeeInsurancePre:
:
getPolicyEnd
,
preVo
.
getPolicyEnd
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
TEmployeeInsurancePre
pre
=
new
TEmployeeInsurancePre
();
BeanUtils
.
copyProperties
(
preVo
,
pre
);
if
(
Common
.
isNotNull
(
preVo
.
getExpectedCollectionTime
()))
{
pre
.
setExpectedCollectionTime
(
LocalDateTimeUtils
.
dateToLocalDateTime
(
preVo
.
getExpectedCollectionTime
()));
}
if
(
Common
.
isNotNull
(
preExit
))
{
pre
.
setId
(
preExit
.
getId
());
baseMapper
.
deleteById
(
preExit
);
baseMapper
.
insert
(
pre
);
}
else
{
baseMapper
.
insert
(
pre
);
//暂时不需要,先注释,后续可能会需要
try
{
for
(
TEmployeeInsurancePreVo
preVo
:
employeeInsurancePreVos
)
{
//判断是否存在商险待购买信息
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
()
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
preVo
.
getRegisterId
())
.
eq
(
TEmployeeInsurancePre:
:
getEmpIdcard
,
preVo
.
getEmpIdcard
())
.
eq
(
TEmployeeInsurancePre:
:
getBuyStandard
,
preVo
.
getBuyStandard
())
.
eq
(
TEmployeeInsurancePre:
:
getInsuranceTypeName
,
preVo
.
getInsuranceTypeName
())
.
eq
(
TEmployeeInsurancePre:
:
getInsuranceCompanyName
,
preVo
.
getInsuranceCompanyName
())
.
eq
(
TEmployeeInsurancePre:
:
getPolicyStart
,
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getPolicyStart
()),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
.
eq
(
TEmployeeInsurancePre:
:
getPolicyEnd
,
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo
.
getPolicyEnd
()),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
TEmployeeInsurancePre
pre
=
new
TEmployeeInsurancePre
();
BeanUtils
.
copyProperties
(
preVo
,
pre
);
if
(
Common
.
isNotNull
(
preVo
.
getExpectedCollectionTime
()))
{
pre
.
setExpectedCollectionTime
(
LocalDateTimeUtils
.
dateToLocalDateTime
(
preVo
.
getExpectedCollectionTime
()));
}
if
(
Common
.
isNotNull
(
preExit
))
{
pre
.
setId
(
preExit
.
getId
());
baseMapper
.
deleteById
(
preExit
);
baseMapper
.
insert
(
pre
);
}
else
{
baseMapper
.
insert
(
pre
);
//暂时不需要,先注释,后续可能会需要
// if (Common.isNotNull(pre.getExpectedCollectionTime())) {
// // 事务提交后触发调度
// TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
...
...
@@ -367,7 +368,11 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
// }
// });
// }
}
}
}
catch
(
Exception
e
){
log
.
error
(
"执行异常"
,
e
);
return
null
;
}
}
return
true
;
...
...
@@ -395,11 +400,13 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
@Override
public
void
updateInsurancePreCustomerName
(
EmployeeRegistrationCustomerUserUpdateVo
updateVo
)
{
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getDeptNo
,
updateVo
.
getDeptNo
())
.
set
(
TEmployeeInsurancePre:
:
getCustomerUsername
,
updateVo
.
getCustomerUserName
())
.
set
(
TEmployeeInsurancePre:
:
getCustomerUserLoginname
,
updateVo
.
getCustomerUserLoginName
());
this
.
update
(
updateWrapper
);
if
(
Common
.
isNotNull
(
updateVo
))
{
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getDeptNo
,
updateVo
.
getDeptNo
())
.
set
(
TEmployeeInsurancePre:
:
getCustomerUsername
,
updateVo
.
getCustomerUserName
())
.
set
(
TEmployeeInsurancePre:
:
getCustomerUserLoginname
,
updateVo
.
getCustomerUserLoginName
());
this
.
update
(
updateWrapper
);
}
}
@Override
...
...
@@ -422,6 +429,12 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
//获取所有待派单的数据
List
<
String
>
unConfirmList
=
baseMapper
.
getAllUnDisData
();
if
(
null
!=
unConfirmList
&&
!
unConfirmList
.
isEmpty
())
{
//更新成已确认
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
in
(
TEmployeeInsurancePre:
:
getId
,
unConfirmList
)
.
eq
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
ZERO_STRING
)
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
);
this
.
update
(
updateWrapper
);
try
{
this
.
batchDispatcherInsurance
(
unConfirmList
);
}
catch
(
Exception
e
)
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
40c336a3
...
...
@@ -1125,6 +1125,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
InsuranceExportListOneVO
>
list
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
listVOS
)){
for
(
InsuranceExportListOneVO
listVO
:
listVOS
)
{
listVO
.
setRemarkDispatch
(
listVO
.
getRemark
());
listVO
.
setRemark
(
InsurancesConstants
.
INSERT
);
TInsuranceReplace
one
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
.
eq
(
TInsuranceReplace:
:
getToInsuranceDetailId
,
listVO
.
getId
())
...
...
@@ -1289,6 +1290,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
InsuranceExportListVO
>
list
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
listVOS
)){
for
(
InsuranceExportListVO
listVO
:
listVOS
)
{
listVO
.
setRemarkDispatch
(
listVO
.
getRemark
());
listVO
.
setRemark
(
InsurancesConstants
.
INSERT
);
TInsuranceReplace
one
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
.
eq
(
TInsuranceReplace:
:
getToInsuranceDetailId
,
listVO
.
getId
())
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TEmployeeInsurancePreMapper.xml
View file @
40c336a3
...
...
@@ -327,6 +327,6 @@
SELECT
id
FROM t_employee_insurance_pre a
where a.process_status in ('1','2','5') and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
where a.process_status in ('
0','
1','2','5') and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
</select>
</mapper>
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/UpdateOverdueTask.java
View file @
40c336a3
...
...
@@ -85,4 +85,17 @@ public class UpdateOverdueTask {
"/temployeeinsurancepre/inner/pushWxConfrimMessage"
,
""
,
Void
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每天九点推送商险待确认信息-定时任务开始------------"
);
}
/**
* 每天刷新商险到期提醒信息
* @author huych
* @param
* @return void
*/
public
void
pushDisConfrimInsurances
()
{
log
.
info
(
"-------------每天三点二十推送商险待确认信息------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
(),
"/temployeeinsurancepre/inner/pushDisConfrimInsurances"
,
""
,
Void
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每天三点二十推送商险待确认信息-定时任务开始------------"
);
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TEmployeeInsuranceWorkDayVo.java
View file @
40c336a3
...
...
@@ -27,4 +27,7 @@ public class TEmployeeInsuranceWorkDayVo implements Serializable {
@Schema
(
description
=
"类型 1 前一个工作日 2 后一个工作日"
)
private
String
type
;
@Schema
(
description
=
"类型 1 新增 2 其他"
)
private
String
addOrBatch
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
40c336a3
...
...
@@ -309,7 +309,14 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
for
(
THolidayInfo
h:
holidayInfos
){
holidayMap
.
put
(
h
.
getDate
(),
h
.
getDay
());
}
}
else
{
vo
.
setPriDisDate
(
vo
.
getRegistDate
());
return
vo
;
}
LocalDate
preRegistDate
=
vo
.
getRegistDate
().
toInstant
()
.
atZone
(
java
.
time
.
ZoneId
.
systemDefault
())
.
toLocalDate
();
//查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo
newVo
=
new
TEmployeeInsuranceWorkDayVo
();
newVo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getRegistDate
(),
CommonConstants
.
ONE_INT_NEGATE
));
...
...
@@ -328,8 +335,18 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
// 如果日期前一个工作日日期小于等于今天
if
(
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
20
))
||
currentTime
.
equals
(
LocalTime
.
of
(
15
,
20
)))
{
// 如果当前时间在15:20之前
vo
.
setPriDisDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getPriDisDate
(),
CommonConstants
.
ONE_INT
));
//判断当前时间是否为非工作日,如果是的话,预派时间需要为下个工作日
if
(
null
!=
holidayMap
.
get
(
LocalDateTimeUtils
.
convertLDToDate
(
today
)))
{
TEmployeeInsuranceWorkDayVo
newVoUnWork
=
new
TEmployeeInsuranceWorkDayVo
();
newVoUnWork
.
setRegistDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
newVoUnWork
.
setType
(
CommonConstants
.
TWO_STRING
);
getWorkDay
(
holidayMap
,
newVoUnWork
);
vo
.
setPriDisDate
(
newVoUnWork
.
getRegistDate
());
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getPriDisDate
(),
CommonConstants
.
ONE_INT
));
}
else
{
vo
.
setPriDisDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getPriDisDate
(),
CommonConstants
.
ONE_INT
));
}
}
else
{
// 如果当前时间在15:20之后
TEmployeeInsuranceWorkDayVo
afterVo
=
new
TEmployeeInsuranceWorkDayVo
();
...
...
@@ -346,6 +363,12 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
//预计生效日期
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
newVo
.
getRegistDate
(),
CommonConstants
.
ONE_INT
));
}
if
(
Common
.
isNotNull
(
vo
.
getAddOrBatch
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getAddOrBatch
())
&&
vo
.
getRegistDate
().
toInstant
().
atZone
(
java
.
time
.
ZoneId
.
systemDefault
())
.
toLocalDate
().
isBefore
(
preRegistDate
))
{
//针对新增如果保单开始日期小于入职日期那么保单开始日期等于入职日期
vo
.
setRegistDate
(
LocalDateTimeUtils
.
convertLDToDate
(
preRegistDate
));
}
return
vo
;
}
...
...
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