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
ded502c2
Commit
ded502c2
authored
Feb 23, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1
parents
c0d58380
cb92410b
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
1153 additions
and
313 deletions
+1153
-313
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+17
-0
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+13
-1
InsuranceSearchVo.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceSearchVo.java
+38
-0
InsuranceWarnExportVo.java
...oud/plus/v1/yifu/insurances/vo/InsuranceWarnExportVo.java
+307
-0
InsurancesWarnUpdateVo.java
...ud/plus/v1/yifu/insurances/vo/InsurancesWarnUpdateVo.java
+85
-0
InsuredListVo.java
.../yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
+15
-15
TBusinessInsuranceVo.java
...loud/plus/v1/yifu/insurances/vo/TBusinessInsuranceVo.java
+105
-6
TInsurancesWarnController.java
...yifu/insurances/controller/TInsurancesWarnController.java
+20
-104
TInsuranceDetailMapper.java
.../insurances/mapper/insurances/TInsuranceDetailMapper.java
+7
-1
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+10
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+344
-73
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+145
-28
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+0
-9
TPaymentInfoVo.java
...com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
+0
-9
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+45
-60
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+0
-5
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
ded502c2
...
@@ -342,6 +342,8 @@ public interface CommonConstants {
...
@@ -342,6 +342,8 @@ public interface CommonConstants {
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT1
=
2000
;
int
BATCH_COUNT1
=
2000
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"
;
String
IMPORT_DATA_ANALYSIS_ERROR_TWO
=
"数据导入解析异常,请检查表数据格式"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
String
ID
=
"ID"
;
String
ID
=
"ID"
;
String
PARAM_IS_NOT_ERROR
=
"传参异常,请检查参数"
;
String
PARAM_IS_NOT_ERROR
=
"传参异常,请检查参数"
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
ded502c2
...
@@ -1297,5 +1297,22 @@ public class InsurancesConstants {
...
@@ -1297,5 +1297,22 @@ public class InsurancesConstants {
public
static
final
String
AGAIN_UPDATE_STATUS
=
"再次同步状态成功"
;
public
static
final
String
AGAIN_UPDATE_STATUS
=
"再次同步状态成功"
;
public
static
final
String
UPLOAD_PARAM_CHECK_FAIL
=
"上传必要参数不能为空"
;
public
static
final
String
UPLOAD_PARAM_CHECK_FAIL
=
"上传必要参数不能为空"
;
/**
* 商险忽略备注
*/
public
static
final
String
[]
INSURANCE_IGNORE_REMARK
=
{
"已续保"
,
"不续保-员工已离职"
,
"不续保-客户停止合作"
,
"不续保-客户要求不续保"
,
"不续保-客户要求转社保"
,
"未续保"
};
/**
* 项目名称不可为空
*/
public
static
final
String
PROJECT_NAME_IS_NOT_EMPTY
=
"项目名称不可为空"
;
/**
* 项目编码不可为空
*/
public
static
final
String
PROJECT_NO_IS_NOT_EMPTY
=
"项目编码不可为空"
;
/**
* 商险到期提醒批量导出
*/
public
static
final
String
INSURANCE_ALERT_EXPORT
=
"商险到期提醒批量导出"
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
ded502c2
...
@@ -207,7 +207,7 @@ public class TInsuranceDetail extends BaseEntity {
...
@@ -207,7 +207,7 @@ public class TInsuranceDetail extends BaseEntity {
/**
/**
* 结算类型 (0、与薪资合并结算 1、单独结算)
* 结算类型 (0、与薪资合并结算 1、单独结算)
*/
*/
@Schema
(
description
=
"结算类型 (0、
预估 1、实缴
)"
)
@Schema
(
description
=
"结算类型 (0、
与薪资合并结算 1、单独结算
)"
)
private
Integer
settleType
;
private
Integer
settleType
;
/**
/**
...
@@ -385,5 +385,17 @@ public class TInsuranceDetail extends BaseEntity {
...
@@ -385,5 +385,17 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"退回原因"
)
@Schema
(
description
=
"退回原因"
)
private
String
backRemark
;
private
String
backRemark
;
/**
* 忽略提醒 0:忽略 1:不忽略
*/
@Schema
(
description
=
"有忽略提醒 0:忽略 1:不忽略"
)
private
String
expireIgnoreFlag
;
/**
* 消息提醒备注
*/
@Schema
(
description
=
"消息提醒备注"
)
private
String
expireRemark
;
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
}
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceSearchVo.java
0 → 100644
View file @
ded502c2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
lombok.Data
;
import
java.util.List
;
/**
* @Author fxj
* @Date 2023/2/21
* @Description
* @Version 1.0
*/
@Data
public
class
InsuranceSearchVo
extends
TBusinessInsuranceVo
{
private
List
<
String
>
idList
;
/**
* @Author fxj
* 查询数据起
**/
private
int
limitStart
;
/**
* @Author fxj
* 查询数据止
**/
private
int
limitEnd
;
/**
* @Author fxj
* 导出字段
**/
List
<
String
>
exportFields
;
/**
* @Author fxj
* 导出选择的ID
**/
private
String
idStr
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceWarnExportVo.java
0 → 100644
View file @
ded502c2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* @Author fxj
* @Date 2023/2/22
* @Description
* @Version 1.0
*/
@ColumnWidth
(
10
)
@Data
public
class
InsuranceWarnExportVo
implements
Serializable
{
/**
* 员工姓名
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"员工姓名"
)
@Schema
(
name
=
"员工姓名"
)
private
String
empName
;
/**
* 员工身份证号
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"员工身份证号码"
)
@Schema
(
name
=
"员工身份证号码"
)
private
String
empIdcardNo
;
/**
* 客户名称
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"客户"
)
@Schema
(
name
=
"客户"
)
private
String
customerName
;
/**
* 结算部门名称中文(内部组织架构)
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目名称"
)
@Schema
(
name
=
"项目名称"
)
private
String
deptName
;
/**
* 结算部门编码(内部组织架构)
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目编码"
)
@Schema
(
name
=
"项目编码"
)
private
String
deptNo
;
/**
* 保险公司(配置项)
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保险公司"
)
@Schema
(
name
=
"保险公司(配置项)"
)
private
String
insuranceCompanyName
;
/**
* 险种名称中文(配置项) 用于导入
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"险种名称"
)
@Schema
(
name
=
"险种名称"
)
private
String
insuranceTypeName
;
/**
* 保单开始时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单开始时间"
)
@Schema
(
name
=
"保单开始时间"
)
private
String
policyStart
;
/**
* 保单结束时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单结束时间"
)
@Schema
(
name
=
"保单结束时间"
)
private
String
policyEnd
;
/**
* 购买标准
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"购买标准"
)
@Schema
(
name
=
"购买标准"
)
private
String
buyStandard
;
/**
* 实际保费
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保费"
)
@Schema
(
name
=
"保费"
)
private
BigDecimal
actualPremium
;
/**
* 创建人
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"创建人"
)
@Schema
(
name
=
"创建人"
)
private
String
createName
;
/**
* 创建时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"创建时间"
)
@Schema
(
name
=
"创建时间"
)
private
String
createTime
;
/**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"办理状态"
)
@Schema
(
name
=
"办理状态"
)
private
String
buyHandleStatus
;
/**
* 出险状态(0未出险;1已出险)
*/
/*@Schema(name = "出险状态(0未出险;1已出险)")
private Integer useStatus;*/
/**
* 保单号
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单号"
)
@Schema
(
name
=
"保单号"
)
private
String
policyNo
;
/**
* 医保
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"医保"
)
@Schema
(
name
=
"医保"
)
private
BigDecimal
medicalQuota
;
/**
* 身故或残疾
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"身故或残疾"
)
@Schema
(
name
=
"身故或残疾"
)
private
BigDecimal
dieDisableQuota
;
/**
* 结算月份
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"结算月份"
)
@Schema
(
name
=
"结算月份"
)
private
String
settleMonth
;
/**
* 发票号
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"发票号"
)
@Schema
(
name
=
"发票号"
)
private
String
invoiceNo
;
/**
* 被替换时间
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"被替换时间"
)
@Schema
(
name
=
"被替换时间"
)
private
String
replaceTime
;
/**
* 保单生效时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单生效时间"
)
@Schema
(
name
=
"保单生效时间"
)
private
String
policyEffect
;
/**
* 备注
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"备注"
)
@Schema
(
name
=
"备注"
)
private
String
remark
;
/**
* 商险购买地省
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"商险购买地省"
)
@Schema
(
name
=
"商险购买地省"
)
private
String
insuranceProvince
;
/**
* 商险购买地
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"商险购买地市"
)
@Schema
(
name
=
"商险购买地市"
)
private
String
insuranceCityName
;
/**
* 是否有效 0有效 1无效
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否有效"
)
@Schema
(
name
=
"是否有效 0有效 1无效"
)
private
String
isEffect
;
/**
* 岗位
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"岗位"
)
@Schema
(
name
=
"岗位"
)
private
String
post
;
//替换人名称,用户展示
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"被替换人姓名"
)
@Schema
(
name
=
"被替换人姓名"
)
private
String
fromEmpName
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"替换人姓名"
)
@Schema
(
name
=
"替换人姓名"
)
//被替换名称,用户展示
private
String
toEmpName
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"替换时间"
)
@Schema
(
name
=
"替换时间"
)
private
String
toReplaceTime
;
/**
* 是否过期状态 0 未过期 1已过期。主要用于页面查询展示
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否过期"
)
@Schema
(
name
=
"是否过期"
)
private
String
isOverdue
;
/**
* 预估保费
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"预估保费"
)
@Schema
(
name
=
"预估保费"
)
private
BigDecimal
estimatePremium
;
/**
* 结算类型 (0、与薪资合并结算 1、单独结算)
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"结算类型"
)
@Schema
(
description
=
"结算类型 (0、与薪资合并结算 1、单独结算)"
)
private
String
settleType
;
/**
* 退费金额
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"退费金额"
)
@Schema
(
name
=
"退费金额"
)
private
BigDecimal
refundMoney
;
/**
* 退费时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"退费时间"
)
@Schema
(
name
=
"退费时间"
)
private
String
refundCreateTime
;
/**
* 退费人
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"退费人"
)
@Schema
(
name
=
"退费人"
)
private
String
refundCreateUser
;
/**
* 派单人所属部门
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"派单人所属部门"
)
@Schema
(
name
=
"派单人所属部门"
)
private
String
createUserDeptName
;
/**
* 消息提醒备注
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"消息提醒备注"
)
private
String
expireRemark
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsurancesWarnUpdateVo.java
0 → 100644
View file @
ded502c2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
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.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author fxj
* @Date 2023/2/21
* @Description
* @Version 1.0
*/
@Schema
(
description
=
"商险备注批量操作"
)
@Data
public
class
InsurancesWarnUpdateVo
extends
RowIndex
implements
Serializable
{
/**
* 员工姓名
*/
@ExcelAttribute
(
name
=
"员工姓名"
,
errorInfo
=
"员工姓名不能为空"
,
maxLength
=
32
,
needExport
=
true
)
private
String
empName
;
/**
* 员工身份证号
*/
@ExcelAttribute
(
name
=
"员工身份证号码"
,
errorInfo
=
"员工身份证号不能为空"
,
maxLength
=
32
,
needExport
=
true
)
private
String
empIdcardNo
;
/**
* 结算部门名称中文(内部组织架构)
*/
@Schema
(
name
=
"项目名称"
)
@ExcelAttribute
(
name
=
"项目名称"
)
private
String
deptName
;
/**
* 结算部门编码(内部组织架构)
*/
@Schema
(
name
=
"项目编码"
)
@ExcelAttribute
(
name
=
"项目编码"
)
private
String
deptNo
;
/**
* 保险公司(配置项)
*/
@ExcelAttribute
(
name
=
"保险公司名称"
,
errorInfo
=
"保险公司(配置项)不能为空"
,
maxLength
=
32
,
needExport
=
true
)
private
String
insuranceCompanyName
;
/**
* 险种名称中文(配置项) 用于导入
*/
@ExcelAttribute
(
name
=
"险种名称"
,
errorInfo
=
"险种名称不能为空"
,
maxLength
=
32
,
needExport
=
true
)
private
String
insuranceTypeName
;
/**
* 保单开始时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@ExcelAttribute
(
name
=
"保单开始时间"
,
errorInfo
=
"保单开始时间不能为空"
,
needExport
=
true
)
private
String
policyStart
;
/**
* 保单结束时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@ExcelAttribute
(
name
=
"保单结束时间"
,
needExport
=
true
)
private
String
policyEnd
;
/**
* 购买标准
*/
@Schema
(
name
=
"购买标准"
)
private
String
buyStandard
;
/**
* 到期消息提醒批量导入是否续保
*/
@ExcelAttribute
(
name
=
"是否续保"
,
maxLength
=
32
)
private
String
renewal
;
/**
* 备注(未续保原因)
*/
@ExcelAttribute
(
name
=
"备注(未续保原因)"
)
private
String
expireRemark
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
View file @
ded502c2
...
@@ -56,7 +56,22 @@ public class InsuredListVo implements Serializable {
...
@@ -56,7 +56,22 @@ public class InsuredListVo implements Serializable {
@ExcelProperty
(
value
=
"投保类型"
)
@ExcelProperty
(
value
=
"投保类型"
)
@ExcelAttribute
(
name
=
"投保类型"
,
readConverterExp
=
"1=新增,3=批增,4=替换"
)
@ExcelAttribute
(
name
=
"投保类型"
,
readConverterExp
=
"1=新增,3=批增,4=替换"
)
private
String
buyType
;
private
String
buyType
;
/**
* 客户名称
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@Schema
(
description
=
"客户"
)
@ExcelProperty
(
value
=
"客户"
)
private
String
unitName
;
/**
* 客户编码
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@Schema
(
description
=
"客户编码"
)
@ExcelProperty
(
value
=
"客户编码"
)
@ExcelIgnore
private
String
unitNo
;
/**
/**
* 项目名称
* 项目名称
*/
*/
...
@@ -182,22 +197,7 @@ public class InsuredListVo implements Serializable {
...
@@ -182,22 +197,7 @@ public class InsuredListVo implements Serializable {
@Schema
(
description
=
"减员状态 1待减员 2减员中3减员退回"
)
@Schema
(
description
=
"减员状态 1待减员 2减员中3减员退回"
)
@ExcelIgnore
@ExcelIgnore
private
Integer
reduceHandleStatus
;
private
Integer
reduceHandleStatus
;
/**
* 客户名称
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@Schema
(
description
=
"客户名称"
)
@ExcelProperty
(
value
=
"客户名称"
)
private
String
unitName
;
/**
* 客户编码
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@Schema
(
description
=
"客户编码"
)
@ExcelProperty
(
value
=
"客户编码"
)
@ExcelIgnore
private
String
unitNo
;
/**
/**
* 项目编码
* 项目编码
*/
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TBusinessInsuranceVo.java
View file @
ded502c2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
...
@@ -17,6 +19,7 @@ import java.util.List;
...
@@ -17,6 +19,7 @@ import java.util.List;
* @Description 商险派单信息表
* @Description 商险派单信息表
* @Date 16:59 2023/2/20
* @Date 16:59 2023/2/20
**/
**/
@ColumnWidth
(
10
)
@Data
@Data
@Schema
(
name
=
"商险派单信息表"
)
@Schema
(
name
=
"商险派单信息表"
)
public
class
TBusinessInsuranceVo
implements
Serializable
{
public
class
TBusinessInsuranceVo
implements
Serializable
{
...
@@ -30,69 +33,99 @@ public class TBusinessInsuranceVo implements Serializable {
...
@@ -30,69 +33,99 @@ public class TBusinessInsuranceVo implements Serializable {
/**
/**
* 员工姓名
* 员工姓名
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"员工姓名"
)
@Schema
(
name
=
"员工姓名"
)
@Schema
(
name
=
"员工姓名"
)
private
String
empName
;
private
String
empName
;
/**
/**
* 员工身份证号
* 员工身份证号
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"员工身份证号码"
)
@Schema
(
name
=
"员工身份证号码"
)
@Schema
(
name
=
"员工身份证号码"
)
private
String
empIdcardNo
;
private
String
empIdcardNo
;
/**
/**
* 结算部门名称中文(内部组织架构)
* 结算部门名称中文(内部组织架构)
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目名称"
)
@Schema
(
name
=
"项目名称"
)
@Schema
(
name
=
"项目名称"
)
private
String
deptName
;
private
String
deptName
;
/**
/**
* 结算部门编码(内部组织架构)
* 结算部门编码(内部组织架构)
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目编码"
)
@Schema
(
name
=
"项目编码"
)
@Schema
(
name
=
"项目编码"
)
private
String
deptNo
;
private
String
deptNo
;
/**
/**
* 保险公司(配置项)
* 保险公司(配置项)
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保险公司"
)
@Schema
(
name
=
"保险公司(配置项)"
)
@Schema
(
name
=
"保险公司(配置项)"
)
private
String
insuranceCompanyName
;
private
String
insuranceCompanyName
;
/**
/**
* 险种名称中文(配置项) 用于导入
* 险种名称中文(配置项) 用于导入
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"险种名称"
)
@Schema
(
name
=
"险种名称"
)
@Schema
(
name
=
"险种名称"
)
private
String
insuranceTypeName
;
private
String
insuranceTypeName
;
/**
/**
* 保单开始时间
* 保单开始时间
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单开始时间"
)
@Schema
(
name
=
"保单开始时间"
)
@Schema
(
name
=
"保单开始时间"
)
private
LocalDate
policyStart
;
private
LocalDate
policyStart
;
/**
/**
* 保单结束时间
* 保单结束时间
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单结束时间"
)
@Schema
(
name
=
"保单结束时间"
)
@Schema
(
name
=
"保单结束时间"
)
private
LocalDate
policyEnd
;
private
LocalDate
policyEnd
;
/**
/**
* 购买标准
* 购买标准
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"购买标准"
)
@Schema
(
name
=
"购买标准"
)
@Schema
(
name
=
"购买标准"
)
private
String
buyStandard
;
private
String
buyStandard
;
/**
/**
* 实际保费
* 实际保费
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保费"
)
@Schema
(
name
=
"保费"
)
@Schema
(
name
=
"保费"
)
private
BigDecimal
actualPremium
;
private
BigDecimal
actualPremium
;
/**
/**
* 创建人
* 创建人
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"创建人"
)
@Schema
(
name
=
"创建人"
)
@Schema
(
name
=
"创建人"
)
private
String
createName
;
private
String
createName
;
/**
/**
* 创建时间
* 创建时间
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"创建时间"
)
@Schema
(
name
=
"创建时间"
)
@Schema
(
name
=
"创建时间"
)
private
LocalDateTime
createTime
;
private
LocalDateTime
createTime
;
/**
/**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"办理状态"
)
@Schema
(
name
=
"办理状态"
)
@Schema
(
name
=
"办理状态"
)
private
String
buyHandleStatus
;
private
String
buyHandleStatus
;
/**
/**
...
@@ -103,51 +136,70 @@ public class TBusinessInsuranceVo implements Serializable {
...
@@ -103,51 +136,70 @@ public class TBusinessInsuranceVo implements Serializable {
/**
/**
* 保单号
* 保单号
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单号"
)
@Schema
(
name
=
"保单号"
)
@Schema
(
name
=
"保单号"
)
private
String
policyNo
;
private
String
policyNo
;
/**
/**
* 医保
* 医保
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"医保"
)
@Schema
(
name
=
"医保"
)
@Schema
(
name
=
"医保"
)
private
BigDecimal
medicalQuota
;
private
BigDecimal
medicalQuota
;
/**
/**
* 身故或残疾
* 身故或残疾
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"身故或残疾"
)
@Schema
(
name
=
"身故或残疾"
)
@Schema
(
name
=
"身故或残疾"
)
private
BigDecimal
dieDisableQuota
;
private
BigDecimal
dieDisableQuota
;
/**
/**
* 结算月份
* 结算月份
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"结算月份"
)
@Schema
(
name
=
"结算月份"
)
@Schema
(
name
=
"结算月份"
)
private
String
settleMonth
;
private
String
settleMonth
;
/**
/**
* 发票号
* 发票号
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"发票号"
)
@Schema
(
name
=
"发票号"
)
@Schema
(
name
=
"发票号"
)
private
String
invoiceNo
;
private
String
invoiceNo
;
/**
/**
* 被替换时间
* 被替换时间
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"被替换时间"
)
@Schema
(
name
=
"被替换时间"
)
@Schema
(
name
=
"被替换时间"
)
private
String
replaceTime
;
private
String
replaceTime
;
/**
/**
* 保单生效时间
* 保单生效时间
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"保单生效时间"
)
@Schema
(
name
=
"保单生效时间"
)
@Schema
(
name
=
"保单生效时间"
)
private
String
policyEffect
;
private
String
policyEffect
;
/**
/**
* 客户名称
* 客户名称
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"客户名称"
)
@Schema
(
name
=
"客户名称"
)
@Schema
(
name
=
"客户名称"
)
private
String
customerName
;
private
String
customerName
;
/**
/**
* 备注
* 备注
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"备注"
)
@Schema
(
name
=
"备注"
)
@Schema
(
name
=
"备注"
)
private
String
remark
;
private
String
remark
;
...
@@ -155,54 +207,79 @@ public class TBusinessInsuranceVo implements Serializable {
...
@@ -155,54 +207,79 @@ public class TBusinessInsuranceVo implements Serializable {
/**
/**
* 商险购买地省
* 商险购买地省
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"商险购买地省"
)
@Schema
(
name
=
"商险购买地省"
)
@Schema
(
name
=
"商险购买地省"
)
private
String
insuranceProvince
;
private
String
insuranceProvince
;
/**
/**
* 商险购买地
* 商险购买地
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"商险购买地市"
)
@Schema
(
name
=
"商险购买地市"
)
@Schema
(
name
=
"商险购买地市"
)
private
String
insuranceCityName
;
private
String
insuranceCityName
;
/**
/**
* 是否有效 0有效 1无效
* 是否有效 0有效 1无效
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否有效"
)
@Schema
(
name
=
"是否有效 0有效 1无效"
)
@Schema
(
name
=
"是否有效 0有效 1无效"
)
private
String
isEffect
;
private
String
isEffect
;
/**
/**
* 岗位
* 岗位
*/
*/
@Length
(
max
=
32
,
message
=
"岗位不能超过32个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"岗位"
)
@Schema
(
name
=
"岗位"
)
private
String
post
;
private
String
post
;
//替换人名称,用户展示
//替换人名称,用户展示
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"被替换人姓名"
)
@Schema
(
name
=
"被替换人姓名"
)
@Schema
(
name
=
"被替换人姓名"
)
private
String
fromEmpName
;
private
String
fromEmpName
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"替换人姓名"
)
@Schema
(
name
=
"替换人姓名"
)
@Schema
(
name
=
"替换人姓名"
)
//被替换名称,用户展示
//被替换名称,用户展示
private
String
toEmpName
;
private
String
toEmpName
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"替换时间"
)
@Schema
(
name
=
"替换时间"
)
@Schema
(
name
=
"替换时间"
)
private
String
toReplaceTime
;
private
String
toReplaceTime
;
/**
/**
* 是否过期状态 0 未过期 1已过期。主要用于页面查询展示
* 是否过期状态 0 未过期 1已过期。主要用于页面查询展示
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否过期"
)
@Schema
(
name
=
"是否过期"
)
@Schema
(
name
=
"是否过期"
)
private
String
isOverdue
;
private
String
isOverdue
;
/**
/**
* 预估保费
* 预估保费
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"预估保费"
)
@Schema
(
name
=
"预估保费"
)
@Schema
(
name
=
"预估保费"
)
private
BigDecimal
estimatePremium
;
private
BigDecimal
estimatePremium
;
/**
/**
*
保费结算类型:1取实际保费 2.取预估保费
*
结算类型 (0、与薪资合并结算 1、单独结算)
*/
*/
@Schema
(
name
=
"保费结算类型:1取实际保费 2.取预估保费"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
private
String
settleType
;
@ExcelProperty
(
value
=
"结算类型"
)
@Schema
(
description
=
"结算类型 (0、与薪资合并结算 1、单独结算)"
)
private
Integer
settleType
;
/**
/**
* 退费金额
* 退费金额
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"退费金额"
)
@Schema
(
name
=
"退费金额"
)
@Schema
(
name
=
"退费金额"
)
private
BigDecimal
refundMoney
;
private
BigDecimal
refundMoney
;
...
@@ -210,12 +287,17 @@ public class TBusinessInsuranceVo implements Serializable {
...
@@ -210,12 +287,17 @@ public class TBusinessInsuranceVo implements Serializable {
/**
/**
* 退费时间
* 退费时间
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"退费时间"
)
@Schema
(
name
=
"退费时间"
)
@Schema
(
name
=
"退费时间"
)
private
LocalDateTime
refundCreateTime
;
private
LocalDateTime
refundCreateTime
;
/**
/**
* 退费人
* 退费人
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"退费人"
)
@Schema
(
name
=
"退费人"
)
@Schema
(
name
=
"退费人"
)
private
String
refundCreateUser
;
private
String
refundCreateUser
;
/*
/*
...
@@ -240,12 +322,16 @@ public class TBusinessInsuranceVo implements Serializable {
...
@@ -240,12 +322,16 @@ public class TBusinessInsuranceVo implements Serializable {
/**
/**
* 派单人所属部门
* 派单人所属部门
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"派单人所属部门"
)
@Schema
(
name
=
"派单人所属部门"
)
@Schema
(
name
=
"派单人所属部门"
)
private
String
createUserDeptName
;
private
String
createUserDeptName
;
/**
/**
* 消息提醒备注
* 消息提醒备注
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"消息提醒备注"
)
private
String
expireRemark
;
private
String
expireRemark
;
/**
/**
...
@@ -258,4 +344,17 @@ public class TBusinessInsuranceVo implements Serializable {
...
@@ -258,4 +344,17 @@ public class TBusinessInsuranceVo implements Serializable {
*/
*/
@Schema
(
name
=
"商险购买地市"
)
@Schema
(
name
=
"商险购买地市"
)
private
List
<
String
>
insuranceCitys
;
private
List
<
String
>
insuranceCitys
;
/**
* 创建人ID
*/
@Schema
(
name
=
"创建人ID"
)
private
String
createBy
;
/**
* 忽略提醒 0:忽略 1:不忽略
*/
@Schema
(
description
=
"有忽略提醒 0:忽略 1:不忽略"
)
private
String
expireIgnoreFlag
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsurancesWarnController.java
View file @
ded502c2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
controller
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
controller
;
import
cn.hutool.core.util.CharsetUtil
;
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.google.common.collect.Lists
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
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.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.WorkBanchWarnVo
;
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
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
lombok.SneakyThrows
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -51,7 +41,7 @@ public class TInsurancesWarnController {
...
@@ -51,7 +41,7 @@ public class TInsurancesWarnController {
**/
**/
@Operation
(
description
=
"商险到期提醒分页查询"
)
@Operation
(
description
=
"商险到期提醒分页查询"
)
@GetMapping
(
"/getExpireWarn/Vopage"
)
@GetMapping
(
"/getExpireWarn/Vopage"
)
public
R
<
IPage
<
TBusinessInsuranceVo
>>
getTBusinessInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
TBusinessInsurance
Vo
tBusinessInsurance
)
{
public
R
<
IPage
<
TBusinessInsuranceVo
>>
getTBusinessInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
InsuranceSearch
Vo
tBusinessInsurance
)
{
return
R
.
ok
(
insuranceDetailService
.
getInsuranceExpireWarnVoPage
(
page
,
tBusinessInsurance
));
return
R
.
ok
(
insuranceDetailService
.
getInsuranceExpireWarnVoPage
(
page
,
tBusinessInsurance
));
}
}
...
@@ -60,36 +50,26 @@ public class TInsurancesWarnController {
...
@@ -60,36 +50,26 @@ public class TInsurancesWarnController {
* @Description 备注批量导入
* @Description 备注批量导入
* @Date 16:57 2023/2/16
* @Date 16:57 2023/2/16
**/
**/
@Operation
(
description
=
"备注批量导入(wxhr:insurance_remark_add)"
)
@SneakyThrows
@Operation
(
description
=
"备注批量导入(wxhr:insurance_Warn_batch_update)"
)
@SysLog
(
"备注批量导入"
)
@SysLog
(
"备注批量导入"
)
@PostMapping
(
"/remark/batchAdd"
)
@PostMapping
(
"/remark/batchAdd"
)
public
R
<
Object
>
remarkBatchAdd
(
@RequestBody
String
jsonString
)
{
//@PreAuthorize("@pms.hasPermission('insurance_Warn_batch_update')")
/*ExcelUtil<TBusinessInsuranceVo> util1 = new ExcelUtil<>(TBusinessInsuranceVo.class);
public
R
<
List
<
ErrorMessage
>>
remarkBatchAdd
(
@RequestBody
MultipartFile
file
)
{
util1.parseJsonStringToList(jsonString, BasicServiceUtil.initMapForExport(remoteSysDictService, preRemoteBasicArchivesService));
return
insuranceDetailService
.
remarkBatchAdd
(
file
.
getInputStream
());
List<TBusinessInsuranceVo> businessInsuranceVoList = util1.getEntityList();
if (businessInsuranceVoList.isEmpty()) {
return Result.fail("无数据");
}
}
if (null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty()) {
return Result.fail(InsuranceConstant.DATA_CHECK_FAIL, util1.getErrorInfo());
}*/
return
null
;
//insuranceDetailService.remarkBatchAdd(businessInsuranceVoList);
}
/**
/**
* @Author fxj
* @Author fxj
* @Description 商险到期提醒分页查询导出
* @Description 商险到期提醒分页查询导出
* @Date 16:57 2023/2/16
* @Date 16:57 2023/2/16
**/
**/
@
Ge
tMapping
(
"/getExpireWarn/export"
)
@
Pos
tMapping
(
"/getExpireWarn/export"
)
@Operation
(
description
=
"商险到期提醒分页查询导出 hasPermission('wxhr:insurance_expirewarnexport')"
)
@Operation
(
description
=
"商险到期提醒分页查询导出 hasPermission('wxhr:insurance_expirewarnexport')"
)
@SysLog
(
"商险到期提醒分页查询导出"
)
@SysLog
(
"商险到期提醒分页查询导出"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:insurance_expirewarnexport')"
)
//@PreAuthorize("@pms.hasPermission('wxhr:insurance_expirewarnexport')")
public
void
getExpireWarnExport
(
HttpServletResponse
response
,
HttpServletRequest
request
,
public
void
getExpireWarnExport
(
HttpServletResponse
response
,
HttpServletRequest
request
,
@RequestBody
InsuranceSearchVo
vo
)
{
@RequestParam
(
name
=
"idStr"
,
required
=
false
)
String
[]
idstr
,
insuranceDetailService
.
exportInsurancesWarn
(
vo
,
response
,
vo
.
getExportFields
(),
vo
.
getIdStr
());
@RequestParam
(
name
=
"exportFields"
,
required
=
true
)
String
[]
exportFields
,
TBusinessInsuranceVo
vo
)
{
List
<
TBusinessInsuranceVo
>
list
=
null
;
}
}
/**
/**
...
@@ -101,19 +81,7 @@ public class TInsurancesWarnController {
...
@@ -101,19 +81,7 @@ public class TInsurancesWarnController {
@SysLog
(
"到期提醒备注"
)
@SysLog
(
"到期提醒备注"
)
@PutMapping
(
"/expireRemark"
)
@PutMapping
(
"/expireRemark"
)
public
R
<
Object
>
expireRemark
(
@RequestBody
TBusinessInsuranceVo
vo
)
{
public
R
<
Object
>
expireRemark
(
@RequestBody
TBusinessInsuranceVo
vo
)
{
if
(
Common
.
isEmpty
(
vo
.
getId
())
||
Common
.
isEmpty
(
vo
.
getExpireRemark
()))
{
return
insuranceDetailService
.
expireRemark
(
vo
);
return
R
.
failed
(
InsurancesConstants
.
UPLOAD_PARAM_CHECK_FAIL
);
}
TInsuranceDetail
entity
=
insuranceDetailService
.
getById
(
vo
.
getId
());
if
(
entity
==
null
)
{
return
R
.
failed
(
"未查询到相关商险订单"
);
}
/* entity.setExpireRemark(vo.getExpireRemark());
entity.setLastUpdateUser(SecurityUtils.getUser().getNickName());
entity.setLastUpdateUserId(SecurityUtils.getUser().getId());
entity.setLastUpdateTime(LocalDateTime.now());*/
insuranceDetailService
.
updateById
(
entity
);
return
R
.
ok
(
"操作成功"
);
}
}
/**
/**
...
@@ -126,13 +94,9 @@ public class TInsurancesWarnController {
...
@@ -126,13 +94,9 @@ public class TInsurancesWarnController {
@PutMapping
(
"/expireIgnore"
)
@PutMapping
(
"/expireIgnore"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:insurance_expireignore')"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:insurance_expireignore')"
)
public
R
<
Object
>
expireIgnore
(
@RequestBody
TBusinessInsuranceVo
vo
)
{
public
R
<
Object
>
expireIgnore
(
@RequestBody
TBusinessInsuranceVo
vo
)
{
if
(
Common
.
isEmpty
(
vo
.
getId
()))
{
return
R
.
failed
(
InsurancesConstants
.
UPLOAD_PARAM_CHECK_FAIL
);
}
return
insuranceDetailService
.
expireIgnore
(
vo
);
return
insuranceDetailService
.
expireIgnore
(
vo
);
}
}
/**
/**
* @Author fxj
* @Author fxj
* @Description 到期提醒批量忽略
* @Description 到期提醒批量忽略
...
@@ -146,62 +110,14 @@ public class TInsurancesWarnController {
...
@@ -146,62 +110,14 @@ public class TInsurancesWarnController {
return
insuranceDetailService
.
batchexpireIgnore
(
ids
);
return
insuranceDetailService
.
batchexpireIgnore
(
ids
);
}
}
/**
* @Author: wangan
* @Date: 2020/5/18
* @Description: 到期提醒忽略
* @return: com.yifu.cloud.v1.common.core.util.R
**/
/*@Operation(description = "到期提醒忽略(wxhr:insurance_expireignore)")
@SysLog("到期提醒忽略")
@PutMapping("/batchExpireIgnore")
@PreAuthorize("@pms.hasPermission('wxhr:insurance_expireignore')")
public Result<Object> batchExpireIgnoreList(@RequestBody List<TBusinessInsurance> voList) {
if (voList.isEmpty()) {
return Result.fail("无数据");
}
ArrayList<ErrorMessage> errorMessages = Lists.newArrayList();
for (int i = 0; i < voList.size(); i++) {
TBusinessInsurance vo = voList.get(i);
if (Common.isEmpty(vo.getId())) {
errorMessages.add(new ErrorMessage(i + 1, "提醒商险ID不能为空"));
continue;
}
TBusinessInsurance entity = tBusinessInsuranceService.getById(vo.getId());
if (entity == null) {
errorMessages.add(new ErrorMessage(i + 1, "未查询到相关商险订单"));
continue;
}
try {
entity.setExpireIgnoreFlag(CommonConstants.dingleDigitStrArray[0]);
entity.setLastUpdateUser(SecurityUtils.getUser().getNickName());
entity.setLastUpdateUserId(SecurityUtils.getUser().getId());
entity.setLastUpdateTime(LocalDateTime.now());
tBusinessInsuranceService.updateById(entity);
} catch (Exception e) {
log.error("执行异常", e);
errorMessages.add(new ErrorMessage(i + 1, "执行忽略失败"));
continue;
}
}
if (!errorMessages.isEmpty()) {
return Result.fail("数据条数" + voList.size(), voList, errorMessages);
}
return Result.success("数据条数" + voList.size(), voList, errorMessages);
}*/
/**
/**
* @Author fxj
* @Author fxj
* @Description 工作台消息提醒:商险到期总数通知提醒
/商险未购买总数通知提醒
* @Description 工作台消息提醒:商险到期总数通知提醒
* @Date 17:03 2023/2/16
* @Date 17:03 2023/2/16
**/
**/
@Operation
(
description
=
"商险到期总数通知提醒/商险未购买总数通知提醒"
)
@Operation
(
description
=
"商险到期总数通知提醒"
)
@PostMapping
(
"/inner/workBranch/getWorkBanchInsuranceMessageWarn"
)
@PostMapping
(
"/workBranch/getWorkBanchInsuranceMessageWarn"
)
public
R
<
List
<
WorkBanchWarnVo
>>
getExpireInsuranceWarn
(
@RequestBody
public
R
<
Integer
>
getExpireInsuranceWarn
()
{
Integer
expireInsuranceWarnNameUrlFlag
,
return
insuranceDetailService
.
getExpireInsuranceWarn
();
Integer
noBuyInsuranceWarnNameUrlFlag
,
Integer
noSettleInsuranceWarnNameUrlFlag
,
Boolean
haveAllOrg
,
Integer
userId
)
{
return
insuranceDetailService
.
getExpireInsuranceWarn
(
expireInsuranceWarnNameUrlFlag
,
noBuyInsuranceWarnNameUrlFlag
,
noSettleInsuranceWarnNameUrlFlag
,
haveAllOrg
,
userId
);
}
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
View file @
ded502c2
...
@@ -283,6 +283,12 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
...
@@ -283,6 +283,12 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
* @Date 16:33 2023/2/20
* @Date 16:33 2023/2/20
**/
**/
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
@Param
(
"param"
)
TBusinessInsurance
Vo
param
,
@Param
(
"param"
)
InsuranceSearch
Vo
param
,
@Param
(
"domains"
)
List
<
TSettleDomainSelectVo
>
domains
);
@Param
(
"domains"
)
List
<
TSettleDomainSelectVo
>
domains
);
List
<
InsuranceWarnExportVo
>
noPageDiy
(
@Param
(
"param"
)
InsuranceSearchVo
searchVo
,
@Param
(
"domains"
)
List
<
TSettleDomainSelectVo
>
listSelectVO
);
int
noPageCountDiy
(
@Param
(
"param"
)
InsuranceSearchVo
searchVo
,
@Param
(
"domains"
)
List
<
TSettleDomainSelectVo
>
listSelectVO
);
void
batchexpireIgnore
(
@Param
(
"idList"
)
List
<
String
>
idList
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
ded502c2
...
@@ -4,6 +4,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
...
@@ -4,6 +4,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
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.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
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.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
...
@@ -12,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
...
@@ -12,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
import
com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -510,11 +512,17 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -510,11 +512,17 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
**/
**/
void
updateSettleStatus
();
void
updateSettleStatus
();
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
TBusinessInsurance
Vo
tBusinessInsurance
);
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
InsuranceSearch
Vo
tBusinessInsurance
);
R
<
List
<
WorkBanchWarnVo
>>
getExpireInsuranceWarn
(
Integer
expireInsuranceWarnNameUrlFlag
,
Integer
noBuyInsuranceWarnNameUrlFlag
,
Integer
noSettleInsuranceWarnNameUrlFlag
,
Boolean
haveAllOrg
,
Integer
userId
);
R
<
Integer
>
getExpireInsuranceWarn
(
);
R
<
Object
>
batchexpireIgnore
(
String
ids
);
R
<
Object
>
batchexpireIgnore
(
String
ids
);
R
<
Object
>
expireIgnore
(
TBusinessInsuranceVo
vo
);
R
<
Object
>
expireIgnore
(
TBusinessInsuranceVo
vo
);
R
<
List
<
ErrorMessage
>>
remarkBatchAdd
(
InputStream
inputStream
);
void
exportInsurancesWarn
(
InsuranceSearchVo
vo
,
HttpServletResponse
response
,
List
<
String
>
exportFields
,
String
idstr
);
R
<
Object
>
expireRemark
(
TBusinessInsuranceVo
vo
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
ded502c2
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
service
.
insurance
.
impl
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
service
.
insurance
.
impl
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.EasyExcelFactory
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.context.AnalysisContext
;
import
com.alibaba.excel.read.listener.ReadListener
;
import
com.alibaba.excel.read.metadata.holder.ReadRowHolder
;
import
com.alibaba.excel.util.ListUtils
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
...
@@ -54,6 +59,7 @@ import javax.annotation.Resource;
...
@@ -54,6 +59,7 @@ import javax.annotation.Resource;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Field
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.math.RoundingMode
;
...
@@ -1800,6 +1806,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1800,6 +1806,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceSettle
settle
;
TInsuranceSettle
settle
;
TInsurancePolicy
one
;
TInsurancePolicy
one
;
BigDecimal
bigDecimalAct
;
BigDecimal
bigDecimalAct
;
R
<
TIncomeDetailReturnVo
>
detailInfoList
;
for
(
InsuranceRegisterParam
success
:
listSuccess
)
{
for
(
InsuranceRegisterParam
success
:
listSuccess
)
{
long
d1
=
System
.
currentTimeMillis
();
long
d1
=
System
.
currentTimeMillis
();
//登记保单保费
//登记保单保费
...
@@ -1808,7 +1815,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1808,7 +1815,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
actualMoney
=
detail
.
getActualPremium
();
actualMoney
=
detail
.
getActualPremium
();
boolean
booleanInvoiceNo
=
false
;
boolean
booleanInvoiceNo
=
false
;
if
(
StringUtils
.
isNotBlank
(
success
.
getInvoiceNo
())){
if
(
StringUtils
.
isNotBlank
(
success
.
getInvoiceNo
())){
if
(
Common
.
isEmpty
(
detail
.
getInvoiceNo
())
||
success
.
getInvoiceNo
().
equals
(
detail
.
getInvoiceNo
()))
{
if
(
Common
.
isEmpty
(
detail
.
getInvoiceNo
())
||
!
success
.
getInvoiceNo
().
equals
(
detail
.
getInvoiceNo
()))
{
booleanInvoiceNo
=
true
;
booleanInvoiceNo
=
true
;
}
}
detail
.
setInvoiceNo
(
success
.
getInvoiceNo
());
detail
.
setInvoiceNo
(
success
.
getInvoiceNo
());
...
@@ -1837,7 +1844,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1837,7 +1844,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
boolean
booleanPolicyNo
=
false
;
boolean
booleanPolicyNo
=
false
;
if
(
StringUtils
.
isNotBlank
(
success
.
getPolicyNo
())){
if
(
StringUtils
.
isNotBlank
(
success
.
getPolicyNo
())){
if
(
Common
.
isEmpty
(
detail
.
getPolicyNo
())
||
success
.
getPolicyNo
().
equals
(
detail
.
getPolicyNo
()))
{
if
(
Common
.
isEmpty
(
detail
.
getPolicyNo
())
||
!
success
.
getPolicyNo
().
equals
(
detail
.
getPolicyNo
()))
{
booleanPolicyNo
=
true
;
booleanPolicyNo
=
true
;
}
}
detail
.
setPolicyNo
(
success
.
getPolicyNo
());
detail
.
setPolicyNo
(
success
.
getPolicyNo
());
...
@@ -1948,12 +1955,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1948,12 +1955,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
settle
).
isPresent
())
{
//如果当前实缴信息未推送,则新增实缴单推送
//如果当前实缴信息未推送,则新增实缴单推送
if
(
StringUtils
.
isNotBlank
(
success
.
getInvoiceNo
()))
{
detail
.
setInvoiceNo
(
success
.
getInvoiceNo
());
}
if
(
StringUtils
.
isNotBlank
(
success
.
getPolicyNo
()))
{
detail
.
setPolicyNo
(
success
.
getPolicyNo
());
}
doJointInsuranceTask
.
asynchronousEkpInfo
(
detail
,
settle
,
CommonConstants
.
FOUR_INT
);
doJointInsuranceTask
.
asynchronousEkpInfo
(
detail
,
settle
,
CommonConstants
.
FOUR_INT
);
}
}
}
}
...
@@ -1991,7 +1992,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1991,7 +1992,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
incomeDetail
.
setFeeType
(
CommonConstants
.
ONE_STRING
);
incomeDetail
.
setFeeType
(
CommonConstants
.
ONE_STRING
);
//判断是否存在当月的商险收入数据
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
())
{
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
())
{
//生成红冲数据
//生成红冲数据
...
@@ -2024,7 +2025,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2024,7 +2025,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
incomeDetail
.
setMoney
(
actualMoney
);
incomeDetail
.
setMoney
(
actualMoney
);
}
}
//判断是否存在当月的商险收入数据
//判断是否存在当月的商险收入数据
R
<
TIncomeDetailReturnVo
>
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
detailInfoList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
if
(
Common
.
isNotNull
(
detailInfoList
)
&&
detailInfoList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
())
{
&&
!
detailInfoList
.
getData
().
getDetailList
().
isEmpty
())
{
//生成红冲数据
//生成红冲数据
...
@@ -3475,7 +3476,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3475,7 +3476,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
Map
<
String
,
String
>
map
=
new
HashMap
<>();
Map
<
String
,
String
>
map
=
new
HashMap
<>();
InsuranceRegisterParam
param
;
InsuranceRegisterParam
param
;
SettleVo
settleVo
;
SettleVo
settleVo
;
List
<
TInsuranceEkp
>
ekpList
;
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
param
=
distinctList
.
get
(
i
);
param
=
distinctList
.
get
(
i
);
// 必填校验
// 必填校验
...
@@ -3582,7 +3583,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3582,7 +3583,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
LambdaQueryWrapper
<
TInsuranceEkp
>
ekpLambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
TInsuranceEkp
>
ekpLambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
ekpLambdaQueryWrapper
.
eq
(
TInsuranceEkp
::
getDetailId
,
detail
.
getId
()).
eq
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ZERO_INT
);
ekpLambdaQueryWrapper
.
eq
(
TInsuranceEkp
::
getDetailId
,
detail
.
getId
()).
eq
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ZERO_INT
);
List
<
TInsuranceEkp
>
ekpList
=
tInsuranceEkpService
.
list
(
ekpLambdaQueryWrapper
);
ekpList
=
tInsuranceEkpService
.
list
(
ekpLambdaQueryWrapper
);
if
(
CollectionUtils
.
isNotEmpty
(
ekpList
)){
if
(
CollectionUtils
.
isNotEmpty
(
ekpList
)){
param
.
setErrorMessage
(
InsurancesConstants
.
EKP_SEND_ERROR
);
param
.
setErrorMessage
(
InsurancesConstants
.
EKP_SEND_ERROR
);
continue
;
continue
;
...
@@ -3665,49 +3666,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3665,49 +3666,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Common
.
isNotNull
(
detail
.
getActualPremium
()))
{
if
(
Common
.
isNotNull
(
detail
.
getActualPremium
()))
{
booleanActualPremium
=
StringUtils
.
isNotBlank
(
param
.
getActualPremium
())
&&
detail
.
getActualPremium
().
compareTo
(
new
BigDecimal
(
param
.
getActualPremium
()))
!=
0
;
booleanActualPremium
=
StringUtils
.
isNotBlank
(
param
.
getActualPremium
())
&&
detail
.
getActualPremium
().
compareTo
(
new
BigDecimal
(
param
.
getActualPremium
()))
!=
0
;
}
}
//如果当前为合并结算
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
if
(
CommonConstants
.
ZERO_INT
==
detail
.
getSettleType
()
&&
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
settleVo
=
getInsuranceDetailSettleStatus
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
if
(!
Common
.
isEmpty
(
settleVo
)){
//保费更新,保单号,发票号不更新
if
(
booleanActualPremium
&&
!
booleanPolicyNo
&&
!
booleanInvoiceNo
){
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
continue
;
}
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
continue
;
}
}
//保单号,发票号更新时
if
(!
booleanPolicyNo
||
!
booleanInvoiceNo
){
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getEstimateStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
continue
;
}
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getEstimateStatus
())
||
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
())){
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
}
}
}
}
}
else
if
(
CommonConstants
.
ONE_INT
==
detail
.
getSettleType
()
&&
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
//如果当前为单独结算,判断实缴有没有结算
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
settleVo
=
getInsuranceDetailSettleStatus
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
settleVo
=
getInsuranceDetailSettleStatus
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
if
(!
Common
.
isEmpty
(
settleVo
)
&&
booleanActualPremium
&&
!
booleanPolicyNo
&&
!
booleanInvoiceNo
){
if
(!
Common
.
isEmpty
(
settleVo
)
&&
(
booleanActualPremium
||
booleanPolicyNo
||
booleanInvoiceNo
)
){
//
判断实缴是否结算中
//
保费更新或者保单号发票号更新
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getActualStatus
()))
{
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleVo
.
getActualStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
continue
;
continue
;
}
}
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
()))
{
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleVo
.
getActualStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
continue
;
}
}
}
}
}
}
...
@@ -7401,46 +7372,346 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -7401,46 +7372,346 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @Date 16:51 2023/2/16
* @Date 16:51 2023/2/16
**/
**/
@Override
@Override
public
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
TBusinessInsurance
Vo
condition
)
{
public
IPage
<
TBusinessInsuranceVo
>
getInsuranceExpireWarnVoPage
(
Page
<
TBusinessInsuranceVo
>
page
,
InsuranceSearch
Vo
condition
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(!
SecurityUtils
.
isHaveAllOrg
(
null
,
user
))
{
condition
.
setCreateBy
(
SecurityUtils
.
getUser
().
getId
());
R
<
TSettleDomainListVo
>
sdRes
=
archivesDaprUtil
.
getPermissionByUserId
(
user
.
getId
());
R
<
TSettleDomainListVo
>
sdRes
=
archivesDaprUtil
.
getPermissionByUserId
(
user
.
getId
());
List
<
TInsuranceAreaRes
>
areaRes
=
insuranceAreaResMapper
.
selectList
(
Wrappers
.<
TInsuranceAreaRes
>
query
().
lambda
()
List
<
TInsuranceAreaRes
>
areaRes
=
insuranceAreaResMapper
.
selectList
(
Wrappers
.<
TInsuranceAreaRes
>
query
().
lambda
()
.
eq
(
TInsuranceAreaRes:
:
getUserId
,
user
.
getId
()).
eq
(
TInsuranceAreaRes:
:
getStatus
,
CommonConstants
.
ZERO_STRING
));
.
eq
(
TInsuranceAreaRes:
:
getUserId
,
user
.
getId
()).
eq
(
TInsuranceAreaRes:
:
getStatus
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isNotNull
(
areaRes
))
{
if
(
Common
.
isNotNull
(
areaRes
))
{
List
<
String
>
provinces
=
new
ArrayList
<>();
List
<
String
>
provinces
=
new
ArrayList
<>();
List
<
String
>
citys
=
new
ArrayList
<>();
List
<
String
>
citys
=
new
ArrayList
<>();
for
(
TInsuranceAreaRes
res:
areaRes
)
{
for
(
TInsuranceAreaRes
res
:
areaRes
)
{
if
(
Common
.
isEmpty
(
res
.
getCity
()))
{
if
(
Common
.
isEmpty
(
res
.
getCity
()))
{
provinces
.
add
(
res
.
getProvince
());
provinces
.
add
(
res
.
getProvince
());
}
else
{
}
else
{
citys
.
add
(
res
.
getCity
());
citys
.
add
(
res
.
getCity
());
}
}
}
}
condition
.
setInsuranceProvinces
(
provinces
);
condition
.
setInsuranceProvinces
(
provinces
);
condition
.
setInsuranceCitys
(
citys
);
condition
.
setInsuranceCitys
(
citys
);
}
}
condition
.
setCreateName
(
SecurityUtils
.
getUser
().
getId
());
if
(
Common
.
isNotNull
(
sdRes
)
&&
Common
.
isNotNull
(
sdRes
.
getData
()))
{
if
(
Common
.
isNotNull
(
sdRes
)
&&
Common
.
isNotNull
(
sdRes
.
getData
())){
return
baseMapper
.
getInsuranceExpireWarnVoPage
(
page
,
condition
,
sdRes
.
getData
().
getListSelectVO
());
return
baseMapper
.
getInsuranceExpireWarnVoPage
(
page
,
condition
,
sdRes
.
getData
().
getListSelectVO
());
}
}
else
{
}
return
baseMapper
.
getInsuranceExpireWarnVoPage
(
page
,
condition
,
null
);
return
baseMapper
.
getInsuranceExpireWarnVoPage
(
page
,
condition
,
null
);
}
}
}
@Override
@Override
public
R
<
List
<
WorkBanchWarnVo
>>
getExpireInsuranceWarn
(
Integer
expireInsuranceWarnNameUrlFlag
,
Integer
noBuyInsuranceWarnNameUrlFlag
,
Integer
noSettleInsuranceWarnNameUrlFlag
,
Boolean
haveAllOrg
,
Integer
userId
)
{
public
R
<
Object
>
batchexpireIgnore
(
String
ids
)
{
return
null
;
if
(
Common
.
isEmpty
(
ids
)){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
List
<
String
>
idList
=
Common
.
getList
(
ids
);
baseMapper
.
batchexpireIgnore
(
idList
);
return
R
.
ok
();
}
}
/**
* @Author fxj
* @Description 商险到期提醒 批量备注更新
* @Date 16:26 2023/2/21
**/
@Override
@Override
public
R
<
Object
>
batchexpireIgnore
(
String
ids
)
{
public
R
<
List
<
ErrorMessage
>>
remarkBatchAdd
(
InputStream
inputStream
)
{
return
null
;
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
ExcelUtil
<
InsurancesWarnUpdateVo
>
util1
=
new
ExcelUtil
<>(
InsurancesWarnUpdateVo
.
class
);
// 写法2:
// 匿名内部类 不用额外写一个DemoDataListener
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
try
{
EasyExcelFactory
.
read
(
inputStream
,
InsurancesWarnUpdateVo
.
class
,
new
ReadListener
<
InsurancesWarnUpdateVo
>()
{
/**
* 单次缓存的数据量
*/
public
static
final
int
BATCH_COUNT
=
CommonConstants
.
BATCH_COUNT
;
/**
*临时存储
*/
private
List
<
InsurancesWarnUpdateVo
>
cachedDataList
=
ListUtils
.
newArrayListWithExpectedSize
(
BATCH_COUNT
);
@Override
public
void
invoke
(
InsurancesWarnUpdateVo
data
,
AnalysisContext
context
)
{
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
))
{
errorMessageList
.
add
(
errorMessage
);
}
else
{
cachedDataList
.
add
(
data
);
}
if
(
cachedDataList
.
size
()
>=
BATCH_COUNT
)
{
saveData
();
// 存储完成清理 list
cachedDataList
=
ListUtils
.
newArrayListWithExpectedSize
(
BATCH_COUNT
);
}
}
}
@Override
public
void
doAfterAllAnalysed
(
AnalysisContext
context
)
{
saveData
();
}
/**
* 加上存储数据库
*/
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
if
(!
cachedDataList
.
isEmpty
())
{
remarkBatchAdd
(
cachedDataList
,
errorMessageList
);
}
log
.
info
(
"存储数据库成功!"
);
}
}).
sheet
().
doRead
();
}
catch
(
Exception
e
)
{
log
.
error
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR_TWO
,
e
);
return
R
.
failed
(
CommonConstants
.
IMPORT_DATA_ANALYSIS_ERROR_TWO
);
}
boolean
isTrue
=
true
;
for
(
ErrorMessage
message
:
errorMessageList
)
{
if
(!
CommonConstants
.
SAVE_SUCCESS
.
equals
(
message
.
getMessage
()))
{
isTrue
=
false
;
break
;
}
}
if
(
isTrue
)
{
return
R
.
ok
();
}
else
{
return
R
.
ok
(
errorMessageList
);
}
}
@Override
@Override
public
R
<
Object
>
expireIgnore
(
TBusinessInsuranceVo
vo
)
{
public
R
<
Object
>
expireIgnore
(
TBusinessInsuranceVo
vo
)
{
return
null
;
if
(
Common
.
isEmpty
(
vo
.
getId
()))
{
return
R
.
failed
(
InsurancesConstants
.
UPLOAD_PARAM_CHECK_FAIL
);
}
TInsuranceDetail
entity
=
baseMapper
.
selectById
(
vo
.
getId
());
if
(
entity
==
null
)
{
return
R
.
failed
(
"未查询到相关商险订单"
);
}
entity
.
setExpireIgnoreFlag
(
vo
.
getExpireIgnoreFlag
());
baseMapper
.
updateById
(
entity
);
return
R
.
ok
();
}
private
void
remarkBatchAdd
(
List
<
InsurancesWarnUpdateVo
>
businessInsuranceVoList
,
List
<
ErrorMessage
>
errorMessages
)
{
InsurancesWarnUpdateVo
vo
;
TInsuranceDetail
detail
;
for
(
int
i
=
0
;
i
<
businessInsuranceVoList
.
size
();
i
++)
{
try
{
int
line
=
i
;
vo
=
businessInsuranceVoList
.
get
(
i
);
if
(
Common
.
isEmpty
(
vo
.
getEmpName
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
EMP_NAME_NOT_EMPTY
));
continue
;
}
if
(
Common
.
isEmpty
(
vo
.
getEmpIdcardNo
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
EMP_IDCARD_NO_NOT_EMPTY
));
continue
;
}
if
(
vo
.
getPolicyStart
()
==
null
)
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
POLICY_START_NOT_EMPTY
));
continue
;
}
if
(
vo
.
getPolicyEnd
()
==
null
)
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
POLICY_END_NOT_EMPTY
));
continue
;
}
if
(
Common
.
isEmpty
(
vo
.
getBuyStandard
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
BUY_STANDARD_NOT_EMPTY
));
continue
;
}
if
(
Common
.
isEmpty
(
vo
.
getInsuranceCompanyName
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
INSURANCE_COMPANY_NAME_NOT_EMPTY
));
continue
;
}
if
(
Common
.
isEmpty
(
vo
.
getInsuranceTypeName
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
INSURANCE_TYPE_NAME_NOT_EMPTY
));
continue
;
}
if
(
Common
.
isEmpty
(
vo
.
getDeptNo
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
PROJECT_NO_IS_NOT_EMPTY
));
continue
;
}
if
(
Common
.
isEmpty
(
vo
.
getDeptName
()))
{
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
InsurancesConstants
.
PROJECT_NAME_IS_NOT_EMPTY
));
continue
;
}
// 必填校验
ErrorMessage
errorMessage
=
null
;
boolean
matchRemark
=
false
;
String
expireIgnoreFlag
=
null
;
for
(
String
remark
:
InsurancesConstants
.
INSURANCE_IGNORE_REMARK
)
{
if
(
StringUtils
.
equals
(
remark
,
vo
.
getRenewal
()))
{
//是否续保
matchRemark
=
true
;
if
(
StringUtils
.
equals
(
remark
,
InsurancesConstants
.
INSURANCE_IGNORE_REMARK
[
5
]))
{
expireIgnoreFlag
=
CommonConstants
.
ONE_STRING
;
//不忽略
if
(
StringUtils
.
isEmpty
(
vo
.
getExpireRemark
()))
{
errorMessage
=
new
ErrorMessage
(
line
+
2
,
"备注不能为空"
);
continue
;
}
}
else
{
expireIgnoreFlag
=
CommonConstants
.
ZERO_STRING
;
//忽略
if
(
StringUtils
.
isEmpty
(
vo
.
getExpireRemark
()))
{
vo
.
setExpireRemark
(
remark
);
}
}
}
}
if
(
errorMessage
!=
null
)
{
errorMessages
.
add
(
errorMessage
);
continue
;
}
if
(!
matchRemark
)
{
errorMessages
.
add
(
new
ErrorMessage
(
line
+
2
,
"是否续保未定义"
));
continue
;
}
//查数据是否存在:姓名 + 身份证号 + 保险公司 + 险种名称 + 保单开始时间 + 保单结束时间 + 购买标准
detail
=
this
.
baseMapper
.
selectOne
(
Wrappers
.<
TInsuranceDetail
>
query
().
lambda
()
.
eq
(
TInsuranceDetail:
:
getEmpName
,
vo
.
getEmpName
())
.
eq
(
TInsuranceDetail:
:
getEmpIdcardNo
,
vo
.
getEmpIdcardNo
())
.
eq
(
TInsuranceDetail:
:
getInsuranceCompanyName
,
vo
.
getInsuranceCompanyName
())
.
eq
(
TInsuranceDetail:
:
getInsuranceTypeName
,
vo
.
getInsuranceTypeName
())
.
eq
(
TInsuranceDetail:
:
getPolicyStart
,
vo
.
getPolicyStart
())
.
eq
(
TInsuranceDetail:
:
getPolicyEnd
,
vo
.
getPolicyEnd
())
.
eq
(
TInsuranceDetail:
:
getBuyStandard
,
vo
.
getBuyStandard
())
.
eq
(
TInsuranceDetail:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
orderByDesc
(
TInsuranceDetail:
:
getUpdateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
if
(!
Optional
.
ofNullable
(
detail
).
isPresent
())
{
errorMessages
.
add
(
new
ErrorMessage
(
line
+
2
,
InsurancesConstants
.
NOT_FOUND_INSURANCE_RECORD
));
continue
;
}
detail
.
setExpireIgnoreFlag
(
expireIgnoreFlag
);
detail
.
setExpireRemark
(
vo
.
getExpireRemark
());
this
.
updateById
(
detail
);
errorMessages
.
add
(
new
ErrorMessage
(
line
+
2
,
CommonConstants
.
UPDATE_SUCCESS
));
}
catch
(
Exception
e
)
{
log
.
error
(
"商险批量备注执行异常"
,
e
);
errorMessages
.
add
(
new
ErrorMessage
(
i
+
2
,
CommonConstants
.
UPDATE_DATA_FAIL
));
continue
;
}
}
}
/**
* @Author fxj
* @Description 商险到期提醒导出
* @Date 16:25 2023/2/21
**/
@Override
public
void
exportInsurancesWarn
(
InsuranceSearchVo
searchVo
,
HttpServletResponse
response
,
List
<
String
>
exportFields
,
String
idstr
)
{
String
fileName
=
InsurancesConstants
.
INSURANCE_ALERT_EXPORT
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
//获取要导出的列表
List
<
InsuranceWarnExportVo
>
list
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
idstr
)){
searchVo
.
setIdList
(
Common
.
getList
(
idstr
));
}
long
count
=
noPageCountDiy
(
searchVo
);
ServletOutputStream
out
=
null
;
try
{
out
=
response
.
getOutputStream
();
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
response
.
setCharacterEncoding
(
CommonConstants
.
UTF8
);
response
.
setHeader
(
CommonConstants
.
CONTENT_DISPOSITION
,
CommonConstants
.
ATTACHMENT_FILENAME
+
URLEncoder
.
encode
(
fileName
,
CommonConstants
.
UTF8
));
ExcelUtil
<
InsuranceWarnExportVo
>
util
=
new
ExcelUtil
<>(
InsuranceWarnExportVo
.
class
);
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
InsuranceWarnExportVo
.
class
)
.
includeColumnFieldNames
(
exportFields
).
build
();
int
index
=
0
;
if
(
count
>
CommonConstants
.
ZERO_INT
){
WriteSheet
writeSheet
;
for
(
int
i
=
0
;
i
<=
count
;
i
+=
CommonConstants
.
EXCEL_EXPORT_LIMIT
)
{
// 获取实际记录
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
list
=
noPageDiy
(
searchVo
);
if
(
Common
.
isNotNull
(
list
)){
writeSheet
=
EasyExcel
.
writerSheet
(
InsurancesConstants
.
INSURANCE_ALERT_EXPORT
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
index
++;
}
if
(
Common
.
isNotNull
(
list
)){
list
.
clear
();
}
}
}
else
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
InsurancesConstants
.
INSURANCE_ALERT_EXPORT
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
}
if
(
Common
.
isNotNull
(
list
)){
list
.
clear
();
}
excelWriter
.
finish
();
}
catch
(
Exception
e
){
log
.
error
(
InsurancesConstants
.
INSURANCE_ALERT_EXPORT
+
"执行异常"
,
e
);
}
finally
{
try
{
if
(
null
!=
out
)
{
out
.
close
();
}
}
catch
(
IOException
e
)
{
log
.
error
(
InsurancesConstants
.
INSURANCE_ALERT_EXPORT
+
"执行异常"
,
e
);
}
}
}
@Override
public
R
<
Object
>
expireRemark
(
TBusinessInsuranceVo
vo
)
{
if
(
Common
.
isEmpty
(
vo
.
getId
())
||
Common
.
isEmpty
(
vo
.
getExpireRemark
()))
{
return
R
.
failed
(
InsurancesConstants
.
UPLOAD_PARAM_CHECK_FAIL
);
}
TInsuranceDetail
entity
=
baseMapper
.
selectById
(
vo
.
getId
());
if
(
entity
==
null
)
{
return
R
.
failed
(
"未查询到相关商险订单"
);
}
entity
.
setExpireRemark
(
vo
.
getExpireRemark
());
baseMapper
.
updateById
(
entity
);
return
R
.
ok
();
}
}
private
List
<
InsuranceWarnExportVo
>
noPageDiy
(
InsuranceSearchVo
searchVo
)
{
List
<
TSettleDomainSelectVo
>
listSelectVO
=
null
;
listSelectVO
=
getExportCondition
(
searchVo
,
listSelectVO
);
return
baseMapper
.
noPageDiy
(
searchVo
,
listSelectVO
);
}
private
int
noPageCountDiy
(
InsuranceSearchVo
searchVo
)
{
List
<
TSettleDomainSelectVo
>
listSelectVO
=
null
;
listSelectVO
=
getExportCondition
(
searchVo
,
listSelectVO
);
return
baseMapper
.
noPageCountDiy
(
searchVo
,
listSelectVO
);
}
private
List
<
TSettleDomainSelectVo
>
getExportCondition
(
InsuranceSearchVo
searchVo
,
List
<
TSettleDomainSelectVo
>
listSelectVO
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
R
<
TSettleDomainListVo
>
sdRes
=
archivesDaprUtil
.
getPermissionByUserId
(
user
.
getId
());
List
<
TInsuranceAreaRes
>
areaRes
=
insuranceAreaResMapper
.
selectList
(
Wrappers
.<
TInsuranceAreaRes
>
query
().
lambda
()
.
eq
(
TInsuranceAreaRes:
:
getUserId
,
user
.
getId
()).
eq
(
TInsuranceAreaRes:
:
getStatus
,
CommonConstants
.
ZERO_STRING
));
if
(
Common
.
isNotNull
(
areaRes
))
{
List
<
String
>
provinces
=
new
ArrayList
<>();
List
<
String
>
citys
=
new
ArrayList
<>();
for
(
TInsuranceAreaRes
res:
areaRes
){
if
(
Common
.
isEmpty
(
res
.
getCity
())){
provinces
.
add
(
res
.
getProvince
());
}
else
{
citys
.
add
(
res
.
getCity
());
}
}
searchVo
.
setInsuranceProvinces
(
provinces
);
searchVo
.
setInsuranceCitys
(
citys
);
}
searchVo
.
setCreateBy
(
SecurityUtils
.
getUser
().
getId
());
if
(
Common
.
isNotNull
(
sdRes
)
&&
Common
.
isNotNull
(
sdRes
.
getData
())){
listSelectVO
=
sdRes
.
getData
().
getListSelectVO
();
}
return
listSelectVO
;
}
@Override
public
R
<
Integer
>
getExpireInsuranceWarn
()
{
InsuranceSearchVo
searchVo
=
new
InsuranceSearchVo
();
List
<
TSettleDomainSelectVo
>
listSelectVO
=
null
;
listSelectVO
=
getExportCondition
(
searchVo
,
listSelectVO
);
return
R
.
ok
(
baseMapper
.
noPageCountDiy
(
searchVo
,
listSelectVO
));
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
ded502c2
...
@@ -1551,7 +1551,7 @@
...
@@ -1551,7 +1551,7 @@
a.INVOICE_NO,
a.INVOICE_NO,
r2.REPLACE_TIME,
r2.REPLACE_TIME,
a.POLICY_EFFECT,
a.POLICY_EFFECT,
a.UNIT_NAME,
a.UNIT_NAME
as "customerName"
,
a.UNIT_NO,
a.UNIT_NO,
a.REMARK,
a.REMARK,
a.INSURANCE_PROVINCE_NAME,
a.INSURANCE_PROVINCE_NAME,
...
@@ -1566,54 +1566,171 @@
...
@@ -1566,54 +1566,171 @@
rf.REFUND_MONEY,
rf.REFUND_MONEY,
rf.CREATE_TIME as "refundCreateTime",
rf.CREATE_TIME as "refundCreateTime",
rf.CREATE_NAME as "refundCreateUser",
rf.CREATE_NAME as "refundCreateUser",
a.CREATE_USER_DEPT_NAME
a.CREATE_USER_DEPT_NAME,
from t_insurance_detail a
a.EXPIRE_REMARK
LEFT JOIN view_insurance_replace r on a.id=r.TO_INSURANCE_DETAIL_ID
</sql>
LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
<sql
id=
"expire_export_sql_param"
>
LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
select
a.id,
a.EMP_NAME,
a.EMP_IDCARD_NO,
a.DEPT_NAME,
a.DEPT_NO,
a.INSURANCE_COMPANY_NAME,
a.INSURANCE_TYPE_NAME,
a.POLICY_START,
a.POLICY_END,
a.BUY_STANDARD,
a.ACTUAL_PREMIUM,
a.CREATE_NAME,
a.CREATE_TIME,
"已办理" as "BUY_HANDLE_STATUS",
a.POLICY_NO,
a.MEDICAL_QUOTA,
a.DIE_DISABLE_QUOTA,
a.SETTLE_TYPE,
a.SETTLE_MONTH,
a.INVOICE_NO,
r2.REPLACE_TIME,
a.POLICY_EFFECT,
a.UNIT_NAME as "customerName",
a.UNIT_NO,
a.REMARK,
a.INSURANCE_PROVINCE_NAME,
a.INSURANCE_CITY_NAME,
case when a.IS_EFFECT = 0 then "有效"
when a.IS_EFFECT = 1 then "无效"
else null end as "IS_EFFECT" ,
a.POST,
r.fromEmpName,
r.toEmpName,
r.REPLACE_TIME as "toReplaceTime",
case when a.IS_OVERDUE = 0 then "未过期"
when a.IS_OVERDUE = 1 then "已过期"
else null end as "IS_OVERDUE" ,
a.ESTIMATE_PREMIUM,
rf.REFUND_MONEY,
rf.CREATE_TIME as "refundCreateTime",
rf.CREATE_NAME as "refundCreateUser",
a.CREATE_USER_DEPT_NAME,
a.EXPIRE_REMARK
</sql>
</sql>
<sql
id=
"expire_sql_where"
>
<sql
id=
"expire_sql_where"
>
<where>
<where>
<!-- info.AUDIT_STATUS='0' and t.STATUS = 5 状态 0.待提交 1.待办理 2.已提交保险公司 3.已办理 4.办理失败 5:待结算(已输入保单号)-->
<!-- info.AUDIT_STATUS='0' and t.STATUS = 5 状态 0.待提交 1.待办理 2.已提交保险公司 3.已办理 4.办理失败 5:待结算(已输入保单号)-->
AND t.INVALID_FLAG='0'
<!--未作废-->
<!--一个月内的,没有再续买商险的数据-->
<!--一个月内的,没有再续买商险的数据-->
a
nd t.STATUS in('3','5','6','7','8','9')
a
.BUY_HANDLE_STATUS ='3'
and EXPIRE_IGNORE_FLAG='1'
and
a.
EXPIRE_IGNORE_FLAG='1'
and (
and (
date_add(curdate() - day(curdate()) + 1, interval 3 month) >
date_add(curdate() - day(curdate()) + 1, interval 3 month) >
t
.POLICY_END
a
.POLICY_END
)
)
and t.VALID_FLAG='0'
<if
test=
"param != null"
>
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
AND t
.EMP_NAME like CONCAT('%' , #{param.empName},'%')
AND a
.EMP_NAME like CONCAT('%' , #{param.empName},'%')
</if>
</if>
<if
test=
"param.empIdcardNo != null and param.empIdcardNo.trim() != ''"
>
<if
test=
"param.empIdcardNo != null and param.empIdcardNo.trim() != ''"
>
AND t.EMP_IDCARD_NO like CONCAT('%' ,#{param.empIdcardNo},'%')
AND a.EMP_IDCARD_NO like CONCAT('%' ,#{param.empIdcardNo},'%')
</if>
<if
test=
"param.idList != null and param.idList.size() > 0"
>
and a.id in
<foreach
collection=
"param.idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
</if>
<if
test=
"param.insuranceProvinces != null and param.insuranceProvinces != null"
>
<if
test=
"param.insuranceProvinces.size() > 0"
>
and a.INSURANCE_PROVINCE in
<foreach
collection=
"param.insuranceProvinces"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
</if>
</if>
<if
test=
"param.insuranceCitys != null and param.insuranceCitys != null"
>
<if
test=
"param.insuranceCitys.size() > 0"
>
and a.INSURANCE_CITY in
<foreach
collection=
"param.insuranceCitys"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
</if>
</if>
<if
test=
"param.insuranceCitys != null and param.insuranceProvinces != null"
>
<if
test=
"param.insuranceCitys.size() > 0 and param.insuranceProvinces.size() > 0"
>
and (
a.INSURANCE_PROVINCE in
<foreach
collection=
"param.insuranceProvinces"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
or a.INSURANCE_CITY in
<foreach
collection=
"param.insuranceCitys"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
)
</if>
</if>
</if>
</if>
<!--数据权限判断-->
<!--数据权限判断-->
AND (
t.CREATE_USER_ID = #{param.createUserId
}
AND (
a.CREATE_BY = #{param.createBy
}
<if
test=
"domains != null"
>
<if
test=
"domains != null"
>
<if
test=
"domains.size() > 0"
>
<if
test=
"domains.size() > 0"
>
or
t
.SETTLEMENT_ORGAN in
or
a
.SETTLEMENT_ORGAN in
<foreach
collection=
"domains"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
<foreach
collection=
"domains"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param
.id
}
#{param}
</foreach>
</foreach>
</if>
</if>
</if>
</if>
<if
test=
"domains == null"
>
or 1=1
</if>
)
)
</where>
</where>
order by t.CREATE_TIME desc
</sql>
</sql>
<select
id=
"getInsuranceExpireWarnVoPage"
<select
id=
"getInsuranceExpireWarnVoPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo"
>
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo"
>
<include
refid=
"expire_sql_param"
/>
<include
refid=
"expire_sql_param"
/>
from t_insurance_detail a
LEFT JOIN view_insurance_replace r on a.id=r.TO_INSURANCE_DETAIL_ID
LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
<include
refid=
"expire_sql_where"
/>
<include
refid=
"expire_sql_where"
/>
order by a.CREATE_TIME desc
</select>
</select>
<select
id=
"noPageDiy"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceWarnExportVo"
>
<include
refid=
"expire_export_sql_param"
/>
from t_insurance_detail a
LEFT JOIN view_insurance_replace r on a.id=r.TO_INSURANCE_DETAIL_ID
LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
<include
refid=
"expire_sql_where"
/>
order by a.CREATE_TIME desc
<if
test=
"param != null and param.limitStart != null"
>
limit #{param.limitStart},#{param.limitEnd}
</if>
</select>
<select
id=
"noPageCountDiy"
resultType=
"java.lang.Integer"
>
select
count(1)
from t_insurance_detail a
LEFT JOIN view_insurance_replace r on a.id=r.TO_INSURANCE_DETAIL_ID
LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
<include
refid=
"expire_sql_where"
/>
order by a.CREATE_TIME desc
</select>
<update
id=
"batchexpireIgnore"
>
update t_insurance_detail a
set a.EXPIRE_IGNORE_FLAG = '0'
where
<if
test=
"idList != null and idList.size() > 0"
>
a.id in
<foreach
collection=
"idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
</if>
<if
test=
"idList == null or idList.size() = 0"
>
1=2
</if>
</update>
</mapper>
</mapper>
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
ded502c2
...
@@ -356,15 +356,6 @@ public class TPaymentInfo extends BaseEntity {
...
@@ -356,15 +356,6 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty
(
"就职班组"
)
@ExcelProperty
(
"就职班组"
)
private
String
inauguralTeam
;
private
String
inauguralTeam
;
/**
* 排序字段
*/
@ExcelAttribute
(
name
=
"排序字段"
)
@Schema
(
description
=
"排序字段"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"排序字段"
)
private
String
sortTime
;
/**
/**
* 推送状态
* 推送状态
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
View file @
ded502c2
...
@@ -337,15 +337,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
...
@@ -337,15 +337,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"就职班组"
)
@ExcelProperty
(
value
=
"就职班组"
)
private
String
inauguralTeam
;
private
String
inauguralTeam
;
/**
* 排序字段
*/
@Length
(
max
=
32
,
message
=
"排序字段 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"排序字段"
,
maxLength
=
32
)
@Schema
(
description
=
"排序字段"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"排序字段"
)
private
String
sortTime
;
/**
/**
* 单位补缴利息
* 单位补缴利息
*/
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
ded502c2
...
@@ -422,7 +422,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -422,7 +422,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isNotNull
(
redisUtil
.
get
(
importSuccessKey
)))
{
if
(
Common
.
isNotNull
(
redisUtil
.
get
(
importSuccessKey
)))
{
redisUtil
.
remove
(
importSuccessKey
);
redisUtil
.
remove
(
importSuccessKey
);
}
}
List
<
ErrorDetailVO
>
errorMessageList
=
new
ArrayList
<>();
ConcurrentHashMap
<
String
,
ErrorDetailVO
>
errorMessageMap
=
new
ConcurrentHashMap
<>();
//养老
//养老
ConcurrentHashMap
<
String
,
BigDecimal
>
pensionMoneyMap
=
new
ConcurrentHashMap
<>();
ConcurrentHashMap
<
String
,
BigDecimal
>
pensionMoneyMap
=
new
ConcurrentHashMap
<>();
//大病救助金
//大病救助金
...
@@ -465,7 +465,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -465,7 +465,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
))
{
if
(
Common
.
isNotNull
(
errorMessage
))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
errorMessage
.
getLineNum
(),
errorMessage
.
getMessage
()));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
errorMessage
.
getLineNum
(),
errorMessage
.
getMessage
()));
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
}
}
...
@@ -486,7 +486,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -486,7 +486,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
*/
*/
private
void
saveData
()
{
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
importTPaymentSocialInfo
(
cachedDataList
,
sumNumKey
,
importSuccessKey
,
errorMessage
List
,
user
,
importTPaymentSocialInfo
(
cachedDataList
,
sumNumKey
,
importSuccessKey
,
errorMessage
Map
,
user
,
rowNumber
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
rowNumber
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
domainMap
);
medicalMoneyMap
,
accrualMoneyMap
,
domainMap
);
log
.
info
(
"存储数据库成功!"
);
log
.
info
(
"存储数据库成功!"
);
...
@@ -504,6 +504,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -504,6 +504,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
injuryMoneyMap
.
clear
();
injuryMoneyMap
.
clear
();
medicalMoneyMap
.
clear
();
medicalMoneyMap
.
clear
();
accrualMoneyMap
.
clear
();
accrualMoneyMap
.
clear
();
List
<
ErrorDetailVO
>
errorMessageList
=
new
ArrayList
<>(
errorMessageMap
.
values
());
errorMessageMap
.
clear
();
return
this
.
judgeAllMessage
(
errorMessageList
);
return
this
.
judgeAllMessage
(
errorMessageList
);
}
}
...
@@ -519,7 +521,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -519,7 +521,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
boolean
isAllTrue
=
true
;
boolean
isAllTrue
=
true
;
for
(
ErrorDetailVO
d
:
errorMessageList
)
{
for
(
ErrorDetailVO
d
:
errorMessageList
)
{
try
{
try
{
if
(
Common
.
isEmpty
(
d
.
getResult
())
||
d
.
getResult
()
==
0
)
{
if
(
Common
.
isEmpty
(
d
)
||
(
Common
.
isEmpty
(
d
.
getResult
())
||
0
==
d
.
getResult
())
)
{
isAllTrue
=
false
;
isAllTrue
=
false
;
break
;
break
;
}
}
...
@@ -538,7 +540,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -538,7 +540,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
private
void
importTPaymentSocialInfo
(
List
<
TPaymentInfoVo
>
list
,
String
sumNumKey
,
String
importSuccessKey
,
private
void
importTPaymentSocialInfo
(
List
<
TPaymentInfoVo
>
list
,
String
sumNumKey
,
String
importSuccessKey
,
List
<
ErrorDetailVO
>
errorMessageList
,
ConcurrentHashMap
<
String
,
ErrorDetailVO
>
errorMessageMap
,
YifuUser
user
,
Integer
rowNumber
,
YifuUser
user
,
Integer
rowNumber
,
ConcurrentHashMap
<
String
,
BigDecimal
>
pensionMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
pensionMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
bigMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
bigMoneyMap
,
...
@@ -566,7 +568,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -566,7 +568,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
// 判断是否有相同的用户在导入社保费用 存在提示稍后重试
// 判断是否有相同的用户在导入社保费用 存在提示稍后重试
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_IMPORT
;
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_IMPORT
;
if
(
redisUtil
.
exists
(
key
))
{
if
(
redisUtil
.
exists
(
key
))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(-
1
,
"当前用户数据导入中,请稍后重试!"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(-
1
,
"当前用户数据导入中,请稍后重试!"
));
redisUtil
.
remove
(
key
);
redisUtil
.
remove
(
key
);
}
else
{
}
else
{
redisUtil
.
set
(
key
,
user
.
getId
(),
360L
);
redisUtil
.
set
(
key
,
user
.
getId
(),
360L
);
...
@@ -576,7 +578,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -576,7 +578,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
int
taskSize
=
list
.
size
()
/
partSize
+
CommonConstants
.
ONE_INT
;
int
taskSize
=
list
.
size
()
/
partSize
+
CommonConstants
.
ONE_INT
;
int
residualCapacity
=
yfSocialImportThreadPoolExecutor
.
getResidualCapacity
();
int
residualCapacity
=
yfSocialImportThreadPoolExecutor
.
getResidualCapacity
();
if
(
taskSize
>
residualCapacity
)
{
if
(
taskSize
>
residualCapacity
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(-
1
,
MsgUtils
.
getMessage
(
ErrorCodes
.
SOCIALINFO_LIST_NUM_LARGE
)));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(-
1
,
MsgUtils
.
getMessage
(
ErrorCodes
.
SOCIALINFO_LIST_NUM_LARGE
)));
}
else
{
}
else
{
// -----------------------------生成paymentInfoMap本段开始--------------------------------
// -----------------------------生成paymentInfoMap本段开始--------------------------------
//已存在的档案数据
//已存在的档案数据
...
@@ -770,9 +772,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -770,9 +772,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
// -----------------------------生成paymentInfoMap本段结束--------------------------------
// -----------------------------生成paymentInfoMap本段结束--------------------------------
// -----------------------------线程池处理list,批量保存社保信息开始--------------------------------
// -----------------------------线程池处理list,批量保存社保信息开始--------------------------------
List
<
TPaymentInfoVo
>
tempList
=
new
ArrayList
<>();
List
<
CompletableFuture
<
ConcurrentHashMap
<
String
,
ErrorDetailVO
>>>
completableFutureList
=
new
ArrayList
<>();
List
<
CompletableFuture
<
List
<
ErrorDetailVO
>>>
completableFutureList
=
new
ArrayList
<>();
// 创建一个数值格式化对象
// 创建一个数值格式化对象
NumberFormat
numberFormat
=
NumberFormat
.
getInstance
();
NumberFormat
numberFormat
=
NumberFormat
.
getInstance
();
...
@@ -802,11 +802,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -802,11 +802,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
try
{
try
{
// 1.list.size()不足100时直接执行
// 1.list.size()不足100时直接执行
if
(
list
.
size
()
<
100
)
{
if
(
list
.
size
()
<
100
)
{
CompletableFuture
<
List
<
ErrorDetailVO
>>
listCompletableFuture
=
CompletableFuture
.
supplyAsync
(()
->
CompletableFuture
<
ConcurrentHashMap
<
String
,
ErrorDetailVO
>>
listCompletableFuture
=
CompletableFuture
.
supplyAsync
(()
->
executeImportSocialList
(
user
,
list
,
areaMap
,
areaMap2
,
domainMap
,
executeImportSocialList
(
user
,
list
,
areaMap
,
areaMap2
,
domainMap
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
errorMessage
List
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
errorMessage
Map
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
),
yfSocialImportThreadPoolExecutor
);
),
yfSocialImportThreadPoolExecutor
);
completableFutureList
.
add
(
listCompletableFuture
);
completableFutureList
.
add
(
listCompletableFuture
);
...
@@ -815,11 +815,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -815,11 +815,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
for
(
int
i
=
0
;
i
<
100
;
i
=
i
+
25
)
{
for
(
int
i
=
0
;
i
<
100
;
i
=
i
+
25
)
{
// 单个线程每次执行25条
// 单个线程每次执行25条
final
List
<
TPaymentInfoVo
>
finalList
=
list
.
subList
(
i
,
i
+
j
);
final
List
<
TPaymentInfoVo
>
finalList
=
list
.
subList
(
i
,
i
+
j
);
CompletableFuture
<
List
<
ErrorDetailVO
>>
listCompletableFuture
=
CompletableFuture
.
supplyAsync
(()
->
CompletableFuture
<
ConcurrentHashMap
<
String
,
ErrorDetailVO
>>
listCompletableFuture
=
CompletableFuture
.
supplyAsync
(()
->
executeImportSocialList
(
user
,
finalList
,
areaMap
,
areaMap2
,
domainMap
,
executeImportSocialList
(
user
,
finalList
,
areaMap
,
areaMap2
,
domainMap
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
errorMessage
List
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
errorMessage
Map
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
),
yfSocialImportThreadPoolExecutor
);
),
yfSocialImportThreadPoolExecutor
);
completableFutureList
.
add
(
listCompletableFuture
);
completableFutureList
.
add
(
listCompletableFuture
);
...
@@ -829,7 +829,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -829,7 +829,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
boolean
computeFlag
;
boolean
computeFlag
;
do
{
do
{
computeFlag
=
false
;
computeFlag
=
false
;
for
(
CompletableFuture
<
List
<
ErrorDetailVO
>>
listCompletableFuture
:
completableFutureList
)
{
for
(
CompletableFuture
<
ConcurrentHashMap
<
String
,
ErrorDetailVO
>>
listCompletableFuture
:
completableFutureList
)
{
if
(!
listCompletableFuture
.
isDone
())
{
if
(!
listCompletableFuture
.
isDone
())
{
computeFlag
=
true
;
computeFlag
=
true
;
}
}
...
@@ -886,7 +886,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -886,7 +886,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
* @date: 2022/7/25
* @date: 2022/7/25
* @return:
* @return:
*/
*/
private
List
<
ErrorDetailVO
>
executeImportSocialList
(
YifuUser
user
,
private
ConcurrentHashMap
<
String
,
ErrorDetailVO
>
executeImportSocialList
(
YifuUser
user
,
List
<
TPaymentInfoVo
>
list
,
List
<
TPaymentInfoVo
>
list
,
HashMap
<
String
,
String
>
areaMap
,
HashMap
<
String
,
String
>
areaMap
,
HashMap
<
String
,
String
>
areaMap2
,
HashMap
<
String
,
String
>
areaMap2
,
...
@@ -897,7 +897,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -897,7 +897,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoMedicalMap
,
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoMedicalMap
,
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoUnEmpMap
,
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoUnEmpMap
,
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoInjuryMap
,
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoInjuryMap
,
List
<
ErrorDetailVO
>
errorMessageList
,
ConcurrentHashMap
<
String
,
ErrorDetailVO
>
errorMessageMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
pensionMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
pensionMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
bigMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
bigMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
unEmpMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
unEmpMoneyMap
,
...
@@ -911,7 +911,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -911,7 +911,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
TSocialFundInfo
socialInfo
;
TSocialFundInfo
socialInfo
;
TSocialInfo
tSocialInfo
=
null
;
TSocialInfo
tSocialInfo
=
null
;
String
temp
;
String
temp
;
int
res
;
List
<
TSocialInfo
>
socialist
;
List
<
TSocialInfo
>
socialist
;
TSettleDomain
domain
;
TSettleDomain
domain
;
...
@@ -938,15 +937,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -938,15 +937,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
//导入校验
//导入校验
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialPayMonth
()))
{
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialPayMonth
()))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"社保缴纳月份不可为空!"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"社保缴纳月份不可为空!"
));
continue
;
continue
;
}
}
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialCreateMonth
()))
{
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialCreateMonth
()))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"社保生成月份不可为空!"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"社保生成月份不可为空!"
));
continue
;
continue
;
}
}
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialPayAddr
()))
{
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialPayAddr
()))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"社保缴纳地不可为空!"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"社保缴纳地不可为空!"
));
continue
;
continue
;
}
}
//无对应员工的社保数据
//无对应员工的社保数据
...
@@ -960,11 +959,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -960,11 +959,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
?
"null"
:
infoVo
.
getSocialTown
()));
?
"null"
:
infoVo
.
getSocialTown
()));
//对身份证与人员姓名的对应关系进行校验
//对身份证与人员姓名的对应关系进行校验
if
(
socialInfo
!=
null
&&
!
socialInfo
.
getEmpName
().
equals
(
infoVo
.
getEmpName
()))
{
if
(
socialInfo
!=
null
&&
!
socialInfo
.
getEmpName
().
equals
(
infoVo
.
getEmpName
()))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"姓名与身份证信息不一致,请核实后再次尝试!"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"姓名与身份证信息不一致,请核实后再次尝试!"
));
continue
;
continue
;
}
}
if
(
socialInfo
!=
null
&&
socialInfo
.
getSocialStartDate
()
==
null
)
{
if
(
socialInfo
!=
null
&&
socialInfo
.
getSocialStartDate
()
==
null
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpIdcard
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的社保起缴日期为空!"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpIdcard
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的社保起缴日期为空!"
));
continue
;
continue
;
}
}
...
@@ -988,10 +987,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -988,10 +987,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
}
}
if
(!
isTrueAdder
)
{
if
(!
isTrueAdder
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"无对应员工"
+
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"无对应员工"
+
infoVo
.
getEmpIdcard
()
+
"的社保数据(请查验社保缴纳地)"
));
infoVo
.
getEmpIdcard
()
+
"的社保数据(请查验社保缴纳地)"
));
continue
;
continue
;
}
}
}
else
{
tSocialInfo
=
null
;
}
}
//导入模板判重 养老
//导入模板判重 养老
...
@@ -999,7 +1000,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -999,7 +1000,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
pensionMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
if
(
pensionMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitPensionMoney
()),
BigDecimalUtils
.
isNullToZero
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitPensionMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalPensionMoney
())),
pensionMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
infoVo
.
getPersonalPensionMoney
())),
pensionMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的养老缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的养老缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
pensionMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitPensionMoney
()),
pensionMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitPensionMoney
()),
...
@@ -1010,7 +1011,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1010,7 +1011,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
accrualMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
if
(
accrualMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())),
accrualMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
infoVo
.
getCompanyAccrual
())),
accrualMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的补缴缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的补缴缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
accrualMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
accrualMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
...
@@ -1022,7 +1023,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1022,7 +1023,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
medicalMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
if
(
medicalMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMedicalMoney
()),
BigDecimalUtils
.
isNullToZero
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMedicalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMedicalMoney
())),
medicalMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
infoVo
.
getPersonalMedicalMoney
())),
medicalMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的医保缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的医保缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
medicalMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
medicalMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
...
@@ -1034,7 +1035,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1034,7 +1035,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
unEmpMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
if
(
unEmpMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitUnemploymentMoney
()),
BigDecimalUtils
.
isNullToZero
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitUnemploymentMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalUnemploymentMoney
())),
unEmpMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
infoVo
.
getPersonalUnemploymentMoney
())),
unEmpMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的失业缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的失业缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
unEmpMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
unEmpMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
...
@@ -1045,7 +1046,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1045,7 +1046,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
GS
));
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
GS
));
if
(
injuryMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()),
if
(
injuryMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()),
injuryMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
injuryMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的工伤缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的工伤缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
injuryMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()));
injuryMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()));
...
@@ -1054,7 +1055,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1054,7 +1055,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
BIR
));
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
BIR
));
if
(
birMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()),
if
(
birMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()),
birMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
birMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的生育缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的生育缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
birMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()));
birMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()));
...
@@ -1065,7 +1066,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1065,7 +1066,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBigmailmentMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBigmailmentMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalBigmailmentMoney
())),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalBigmailmentMoney
())),
bigMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
bigMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的医疗救助金缴费数据"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
infoVo
.
getSocialHousehold
(),
infoVo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_TEMPLATE
+
"的医疗救助金缴费数据"
));
continue
;
continue
;
}
else
{
}
else
{
bigMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
bigMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
...
@@ -1092,7 +1093,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1092,7 +1093,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalPensionMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalPensionMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitPensionMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitPensionMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalPensionMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalPensionMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的养老缴费数据,请勿重复导入!"
));
+
"的养老缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1117,7 +1118,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1117,7 +1118,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getCompanyAccrual
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getCompanyAccrual
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的补缴缴费数据,请勿重复导入!"
));
+
"的补缴缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1142,7 +1143,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1142,7 +1143,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalUnemploymentMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalUnemploymentMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitUnemploymentMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitUnemploymentMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalUnemploymentMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalUnemploymentMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的失业缴费数据,请勿重复导入!"
));
+
"的失业缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1168,7 +1169,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1168,7 +1169,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMedicalMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMedicalMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitMedicalMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitMedicalMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalMedicalMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalMedicalMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的医保缴费数据,请勿重复导入!"
));
+
"的医保缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1193,7 +1194,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1193,7 +1194,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalBigmailmentMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalBigmailmentMoney
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitBigmailmentMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitBigmailmentMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalBigmailmentMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalBigmailmentMoney
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的医疗救助金缴费数据,请勿重复导入!"
));
+
"的医疗救助金缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1214,7 +1215,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1214,7 +1215,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
null
!=
paymentInfo
&&
((
null
!=
paymentInfo
.
getGsSameFlg
()
&&
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getGsSameFlg
()))
if
(
null
!=
paymentInfo
&&
((
null
!=
paymentInfo
.
getGsSameFlg
()
&&
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getGsSameFlg
()))
||
(
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()),
||
(
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitInjuryMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitInjuryMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的单位工伤缴费数据,请勿重复导入!"
));
+
"的单位工伤缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1235,7 +1236,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1235,7 +1236,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
null
!=
paymentInfo
&&
((
null
!=
paymentInfo
.
getBrSameFlg
()
&&
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getBrSameFlg
()))
if
(
null
!=
paymentInfo
&&
((
null
!=
paymentInfo
.
getBrSameFlg
()
&&
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getBrSameFlg
()))
||
(
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()),
||
(
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitBirthMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitBirthMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的单位生育缴费数据,请勿重复导入!"
));
+
"的单位生育缴费数据,请勿重复导入!"
));
continue
;
continue
;
}
}
...
@@ -1261,7 +1262,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1261,7 +1262,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isNotNull
(
domain
))
{
if
(
Common
.
isNotNull
(
domain
))
{
paymentInfo
.
setBpoFlag
(
domain
.
getBpoFlag
());
paymentInfo
.
setBpoFlag
(
domain
.
getBpoFlag
());
}
else
{
}
else
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"未找到对应的项目信息,请核实"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"未找到对应的项目信息,请核实"
));
continue
;
continue
;
}
}
paymentInfo
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
paymentInfo
.
setSettleDomainId
(
socialInfo
.
getSettleDomain
());
...
@@ -1289,7 +1290,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1289,7 +1290,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setUnitName
(
domain
.
getCustomerName
());
paymentInfo
.
setUnitName
(
domain
.
getCustomerName
());
paymentInfo
.
setBpoFlag
(
domain
.
getBpoFlag
());
paymentInfo
.
setBpoFlag
(
domain
.
getBpoFlag
());
}
else
{
}
else
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"未找到对应的项目信息,请核实"
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"未找到对应的项目信息,请核实"
));
continue
;
continue
;
}
}
paymentInfo
.
setSettleDomainId
(
tSocialInfo
.
getSettleDomainCode
());
paymentInfo
.
setSettleDomainId
(
tSocialInfo
.
getSettleDomainCode
());
...
@@ -1370,31 +1371,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1370,31 +1371,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setCreateBy
(
user
.
getId
());
paymentInfo
.
setCreateBy
(
user
.
getId
());
paymentInfo
.
setCreateName
(
user
.
getNickname
());
paymentInfo
.
setCreateName
(
user
.
getNickname
());
paymentInfo
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
paymentInfo
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
res
=
insertAndSTimestamp
(
paymentInfo
);
int
res
=
baseMapper
.
insert
(
paymentInfo
);
if
(
res
<
0
)
{
if
(
res
<
0
)
{
errorMessage
List
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
CommonConstants
.
SAVE_FAILED
));
errorMessage
Map
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
CommonConstants
.
SAVE_FAILED
));
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ONE_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
CommonConstants
.
SAVE_SUCCESS
));
errorMessageMap
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ONE_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
CommonConstants
.
SAVE_SUCCESS
));
}
}
}
}
}
return
errorMessageList
;
}
/**
* 拼接排序字段并插入
*
* @param entity
* @return
* @Author huyc
* @Date 2022-07-25
**/
private
int
insertAndSTimestamp
(
TPaymentInfo
entity
)
{
if
(
Common
.
isNotNull
(
entity
.
getSocialCreateMonth
())
&&
Common
.
isNotNull
(
entity
.
getSocialPayMonth
()))
{
entity
.
setSortTime
(
entity
.
getSocialCreateMonth
().
concat
(
entity
.
getSocialPayMonth
()).
concat
(
String
.
valueOf
(
System
.
currentTimeMillis
())));
}
}
return
baseMapper
.
insert
(
entity
)
;
return
errorMessageMap
;
}
}
@Override
@Override
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
ded502c2
...
@@ -58,7 +58,6 @@
...
@@ -58,7 +58,6 @@
<result
property=
"socialSecurityPersonalSum"
column=
"SOCIAL_SECURITY_PERSONAL_SUM"
/>
<result
property=
"socialSecurityPersonalSum"
column=
"SOCIAL_SECURITY_PERSONAL_SUM"
/>
<result
property=
"providentSum"
column=
"PROVIDENT_SUM"
/>
<result
property=
"providentSum"
column=
"PROVIDENT_SUM"
/>
<result
property=
"inauguralTeam"
column=
"INAUGURAL_TEAM"
/>
<result
property=
"inauguralTeam"
column=
"INAUGURAL_TEAM"
/>
<result
property=
"sortTime"
column=
"SORT_TIME"
/>
<result
property=
"companyAccrual"
column=
"COMPANY_ACCRUAL"
/>
<result
property=
"companyAccrual"
column=
"COMPANY_ACCRUAL"
/>
<result
property=
"personalAccrual"
column=
"PERSONAL_ACCRUAL"
/>
<result
property=
"personalAccrual"
column=
"PERSONAL_ACCRUAL"
/>
<result
property=
"unitPensionSet"
column=
"UNIT_PENSION_SET"
/>
<result
property=
"unitPensionSet"
column=
"UNIT_PENSION_SET"
/>
...
@@ -288,7 +287,6 @@
...
@@ -288,7 +287,6 @@
a.SOCIAL_SECURITY_PERSONAL_SUM,
a.SOCIAL_SECURITY_PERSONAL_SUM,
a.PROVIDENT_SUM,
a.PROVIDENT_SUM,
a.INAUGURAL_TEAM,
a.INAUGURAL_TEAM,
a.SORT_TIME,
a.SALARY_SOCIAL_FLAG,
a.SALARY_SOCIAL_FLAG,
a.SALARY_FUND_FLAG,
a.SALARY_FUND_FLAG,
a.COMPANY_ACCRUAL,
a.COMPANY_ACCRUAL,
...
@@ -432,9 +430,6 @@
...
@@ -432,9 +430,6 @@
<if
test=
"tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''"
>
<if
test=
"tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''"
>
AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
</if>
</if>
<if
test=
"tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''"
>
AND a.SORT_TIME = #{tPaymentInfo.sortTime}
</if>
<if
test=
"tPaymentInfo.companyAccrual != null"
>
<if
test=
"tPaymentInfo.companyAccrual != null"
>
AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
AND a.COMPANY_ACCRUAL = #{tPaymentInfo.companyAccrual}
</if>
</if>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment