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
baeb4c0d
Commit
baeb4c0d
authored
Aug 03, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
289bfb16
2c21b5f9
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
110 additions
and
78 deletions
+110
-78
EmpContractDispatchVo.java
...cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
+19
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+34
-27
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+49
-43
ServiceUtil.java
.../com/yifu/cloud/plus/v1/yifu/social/util/ServiceUtil.java
+1
-1
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+6
-6
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
View file @
baeb4c0d
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
@@ -224,4 +227,20 @@ public class EmpContractDispatchVo implements Serializable {
...
@@ -224,4 +227,20 @@ public class EmpContractDispatchVo implements Serializable {
@Schema
(
description
=
"合同年限"
,
name
=
"contractTerm"
)
@Schema
(
description
=
"合同年限"
,
name
=
"contractTerm"
)
private
String
contractTerm
;
private
String
contractTerm
;
/**
* 创建者-姓名
*/
@Schema
(
description
=
"创建人-姓名"
)
@TableField
(
fill
=
FieldFill
.
INSERT
)
@ExcelProperty
(
"创建人"
)
private
String
createName
;
/**
* 创建者
*/
@Schema
(
description
=
"创建人"
)
@TableField
(
fill
=
FieldFill
.
INSERT
)
@ExcelIgnore
private
String
createBy
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
baeb4c0d
...
@@ -2150,7 +2150,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2150,7 +2150,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contract
=
new
TEmployeeContractInfo
();
contract
=
new
TEmployeeContractInfo
();
BeanUtil
.
copyProperties
(
contractAdd
,
contract
);
BeanUtil
.
copyProperties
(
contractAdd
,
contract
);
if
(
Common
.
isEmpty
(
contract
.
getEmpId
())
&&
Common
.
isNotNull
(
projectsMap
))
{
if
(
Common
.
isEmpty
(
contract
.
getEmpId
())
&&
Common
.
isNotNull
(
projectsMap
))
{
project
=
projectsMap
.
get
(
contract
.
getEmpIdcard
());
project
=
projectsMap
.
get
(
contract
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
contract
.
getDeptNo
()
);
if
(
Common
.
isNotNull
(
project
))
{
if
(
Common
.
isNotNull
(
project
))
{
contract
.
setEmpId
(
project
.
getId
());
contract
.
setEmpId
(
project
.
getId
());
contract
.
setEmpNo
(
project
.
getEmpNo
());
contract
.
setEmpNo
(
project
.
getEmpNo
());
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
baeb4c0d
...
@@ -138,15 +138,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -138,15 +138,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List
<
UpdateInsuranceSettleParam
.
SettleData
>
settleData
=
param
.
getSettleData
();
List
<
UpdateInsuranceSettleParam
.
SettleData
>
settleData
=
param
.
getSettleData
();
List
<
TInsuranceSettle
>
list
=
new
ArrayList
<>();
List
<
TInsuranceSettle
>
list
=
new
ArrayList
<>();
for
(
UpdateInsuranceSettleParam
.
SettleData
settleDatum
:
settleData
)
{
for
(
UpdateInsuranceSettleParam
.
SettleData
settleDatum
:
settleData
)
{
TInsuranceSettle
settle
=
new
TInsuranceSettle
();
String
settleId
=
settleDatum
.
getSn
().
split
(
"_"
)[
1
];
String
settleId
=
settleDatum
.
getSn
().
split
(
"_"
)[
1
];
settle
.
setId
(
settleId
);
if
(
StringUtils
.
isNotBlank
(
settleId
)){
settle
.
setUpdateTime
(
pushTime
);
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
settleId
);
settle
.
setSettleHandleStatus
(
settleDatum
.
getSettleStatus
());
if
(!
Optional
.
ofNullable
(
byId
).
isPresent
()){
continue
;
}
byId
.
setUpdateTime
(
pushTime
);
byId
.
setSettleHandleStatus
(
settleDatum
.
getSettleStatus
());
if
(
CommonConstants
.
THREE_STRING
.
equals
(
settleDatum
.
getSettleStatus
())){
if
(
CommonConstants
.
THREE_STRING
.
equals
(
settleDatum
.
getSettleStatus
())){
settle
.
setSettleDoneTime
(
pushTime
);
byId
.
setSettleDoneTime
(
pushTime
);
}
list
.
add
(
byId
);
}
}
list
.
add
(
settle
);
}
}
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
tInsuranceSettleService
.
saveOrUpdateBatch
(
list
);
tInsuranceSettleService
.
saveOrUpdateBatch
(
list
);
...
@@ -2767,9 +2771,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2767,9 +2771,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
cancel
.
setCreateTime
(
LocalDateTime
.
now
());
cancel
.
setCreateTime
(
LocalDateTime
.
now
());
tInsuranceSettleCancelService
.
save
(
cancel
);
tInsuranceSettleCancelService
.
save
(
cancel
);
//推送EKP // TODO: 2022/8/2
//推送EKP // TODO: 2022/8/2
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
insuranceDetailId
);
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
defaultSettleId
);
//如果已经推送过实际保费,则先作废,再推送新的预估保费和实际保费
//如果已经推送过实际保费,则先作废,再推送新的预估保费和实际保费
if
(
byId
.
getIsActualPush
()
==
1
){
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ONE_INT
){
}
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
){
}
}
//新增新的结算数据
//新增新的结算数据
...
@@ -3196,11 +3204,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3196,11 +3204,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
eq
(
TInsuranceDetail
::
getEmpIdcardNo
,
empIdCardNo
).
eq
(
TInsuranceDetail
::
getInsuranceCompanyName
,
insuranceCompanyName
)
.
eq
(
TInsuranceDetail
::
getEmpIdcardNo
,
empIdCardNo
).
eq
(
TInsuranceDetail
::
getInsuranceCompanyName
,
insuranceCompanyName
)
.
eq
(
TInsuranceDetail
::
getInsuranceTypeName
,
insuranceTypeName
)
.
eq
(
TInsuranceDetail
::
getInsuranceTypeName
,
insuranceTypeName
)
.
eq
(
TInsuranceDetail
::
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
policyStart
))
.
eq
(
TInsuranceDetail
::
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
policyStart
))
.
eq
(
TInsuranceDetail
::
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
policyEnd
));
.
eq
(
TInsuranceDetail
::
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
policyEnd
)).
last
(
CommonConstants
.
LAST_ONE_SQL
);
//排除已减员的数据
queryWrapper
.
ne
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
FIVE_INT
);
//排除投保退回的数据
queryWrapper
.
ne
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
FOUR_INT
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
if
(
list
.
size
()>
1
){
if
(
list
.
size
()>
1
){
param
.
setErrorMessage
(
InsurancesConstants
.
MULTIPLE_RECORDS_UNDER_WARRANTY
);
param
.
setErrorMessage
(
InsurancesConstants
.
MULTIPLE_RECORDS_UNDER_WARRANTY
);
...
@@ -3458,10 +3462,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3458,10 +3462,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
eq
(
TInsuranceDetail
::
getDeptNo
,
deptNo
).
eq
(
TInsuranceDetail
::
getBuyStandard
,
buyStandard
)
.
eq
(
TInsuranceDetail
::
getDeptNo
,
deptNo
).
eq
(
TInsuranceDetail
::
getBuyStandard
,
buyStandard
)
.
eq
(
TInsuranceDetail
::
getInsuranceTypeName
,
insuranceTypeName
)
.
eq
(
TInsuranceDetail
::
getInsuranceTypeName
,
insuranceTypeName
)
.
eq
(
TInsuranceDetail
::
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
policyStart
)
)
.
eq
(
TInsuranceDetail
::
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
policyStart
)
)
.
eq
(
TInsuranceDetail
::
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
policyEnd
));
.
eq
(
TInsuranceDetail
::
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
policyEnd
)).
last
(
CommonConstants
.
LAST_ONE_SQL
);
//排除已减员的数据
queryWrapper
.
ne
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
FIVE_INT
);
queryWrapper
.
ne
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
FOUR_INT
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
if
(
list
.
size
()>
1
){
if
(
list
.
size
()>
1
){
param
.
setErrorMessage
(
InsurancesConstants
.
MULTIPLE_RECORDS_UNDER_WARRANTY
);
param
.
setErrorMessage
(
InsurancesConstants
.
MULTIPLE_RECORDS_UNDER_WARRANTY
);
...
@@ -3678,11 +3679,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3678,11 +3679,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
eq
(
TInsuranceDetail
::
getBuyStandard
,
buyStandard
).
eq
(
TInsuranceDetail:
:
getDeptNo
,
oldDeptNo
)
.
eq
(
TInsuranceDetail
::
getBuyStandard
,
buyStandard
).
eq
(
TInsuranceDetail:
:
getDeptNo
,
oldDeptNo
)
.
eq
(
TInsuranceDetail
::
getInsuranceCompanyName
,
insuranceCompanyName
)
.
eq
(
TInsuranceDetail
::
getInsuranceCompanyName
,
insuranceCompanyName
)
.
eq
(
TInsuranceDetail
::
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
policyStart
))
.
eq
(
TInsuranceDetail
::
getPolicyStart
,
LocalDateUtil
.
parseLocalDate
(
policyStart
))
.
eq
(
TInsuranceDetail
::
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
policyEnd
));
.
eq
(
TInsuranceDetail
::
getPolicyEnd
,
LocalDateUtil
.
parseLocalDate
(
policyEnd
)).
last
(
CommonConstants
.
LAST_ONE_SQL
);
//排除已减员的数据
queryWrapper
.
ne
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
FIVE_INT
);
//排除投保退回的数据
queryWrapper
.
ne
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
FOUR_INT
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
if
(
list
.
size
()>
1
){
if
(
list
.
size
()>
1
){
param
.
setErrorMessage
(
InsurancesConstants
.
MULTIPLE_RECORDS_UNDER_WARRANTY
);
param
.
setErrorMessage
(
InsurancesConstants
.
MULTIPLE_RECORDS_UNDER_WARRANTY
);
...
@@ -3837,17 +3834,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3837,17 +3834,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
StringUtils
.
isBlank
(
empIdcardNo
)){
if
(
StringUtils
.
isBlank
(
empIdcardNo
)){
return
R
.
failed
(
"身份证号为空"
);
return
R
.
failed
(
"身份证号为空"
);
}
}
//
员工身份 //
身份证号位数校验(18 位合法)
// 身份证号位数校验(18 位合法)
if
(!
ValidityUtil
.
validateIDCard
(
empIdcardNo
)){
if
(!
ValidityUtil
.
validateIDCard
(
empIdcardNo
)){
return
R
.
failed
(
"身份证格式不正确"
);
return
R
.
failed
(
"身份证格式不正确"
);
}
}
LambdaQueryWrapper
<
TInsuranceDetail
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
TInsuranceDetail
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
//查询所有在保,未出险,未过期,未失效,未减员的保单信息
//查询所有在保,未出险,未过期,未失效,未减员的保单信息
queryWrapper
.
eq
(
TInsuranceDetail
::
getEmpIdcardNo
,
empIdcardNo
).
eq
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
THREE_INT
)
queryWrapper
.
eq
(
TInsuranceDetail
::
getEmpIdcardNo
,
empIdcardNo
)
.
eq
(
TInsuranceDetail
::
getIsEffect
,
CommonConstants
.
ZERO_INT
).
eq
(
TInsuranceDetail
::
getIsUse
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail
::
getBuyHandleStatus
,
CommonConstants
.
THREE_INT
)
.
eq
(
TInsuranceDetail
::
getIsEffect
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail
::
getIsUse
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail
::
getIsOverdue
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail
::
getIsOverdue
,
CommonConstants
.
ZERO_INT
)
.
ne
(
TInsuranceDetail
::
getReduceHandleStatus
,
CommonConstants
.
ONE_INT
)
.
ne
(
TInsuranceDetail
::
getReduceHandleStatus
,
CommonConstants
.
ONE_INT
)
.
ne
(
TInsuranceDetail
::
getReduceHandleStatus
,
CommonConstants
.
TWO_INT
);
.
ne
(
TInsuranceDetail
::
getReduceHandleStatus
,
CommonConstants
.
TWO_INT
)
.
ne
(
TInsuranceDetail
::
getReduceHandleStatus
,
CommonConstants
.
FOUR_INT
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
List
<
TInsuranceDetail
>
list
=
list
(
queryWrapper
);
if
(
CollectionUtils
.
isEmpty
(
list
)){
if
(
CollectionUtils
.
isEmpty
(
list
)){
return
R
.
failed
(
"无可出险的保单"
);
return
R
.
failed
(
"无可出险的保单"
);
...
@@ -3865,6 +3865,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3865,6 +3865,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
}
}
/**
* 根据身份证查询商险列表
*
* @author huyc
* @param
* @return {@link R}
*/
@Override
@Override
public
IPage
<
InsuranceListByIdCardVo
>
getInsuranceListByIdCard
(
Page
<
TInsuranceDetail
>
page
,
String
idCard
)
{
public
IPage
<
InsuranceListByIdCardVo
>
getInsuranceListByIdCard
(
Page
<
TInsuranceDetail
>
page
,
String
idCard
)
{
IPage
<
InsuranceListByIdCardVo
>
insuranceListByIdCard
=
baseMapper
.
getInsuranceListByIdCard
(
page
,
idCard
);
IPage
<
InsuranceListByIdCardVo
>
insuranceListByIdCard
=
baseMapper
.
getInsuranceListByIdCard
(
page
,
idCard
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
baeb4c0d
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
service
.
impl
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
service
.
impl
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.util.ArrayUtil
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.context.AnalysisContext
;
import
com.alibaba.excel.context.AnalysisContext
;
...
@@ -1063,21 +1062,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1063,21 +1062,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 初始化项目档案
// 初始化项目档案
initProjectInfo
(
projects
,
excel
,
empVo
,
user
,
setInfoVo
,
socialSet
);
initProjectInfo
(
projects
,
excel
,
empVo
,
user
,
setInfoVo
,
socialSet
);
// 初始化合同
// 初始化合同
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
);
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
,
user
);
}
}
// 有档案无项目档案无合同
// 有档案无项目档案无合同
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isEmpty
(
empVo
.
getDeptNo
()))
{
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isEmpty
(
empVo
.
getDeptNo
()))
{
// 初始化项目档案
// 初始化项目档案
initProjectInfo
(
projects
,
excel
,
empVo
,
user
,
setInfoVo
,
socialSet
);
initProjectInfo
(
projects
,
excel
,
empVo
,
user
,
setInfoVo
,
socialSet
);
// 初始化合同
// 初始化合同
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
);
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
,
user
);
}
}
// 有档案有项目档案无合同
// 有档案有项目档案无合同
if
(
Common
.
isNotNull
(
empVo
)
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getDeptNo
())
&&
Common
.
isNotNull
(
empVo
.
getDeptNo
())
&&
Common
.
isEmpty
(
empVo
.
getContractType
()))
{
&&
Common
.
isEmpty
(
empVo
.
getContractType
()))
{
// 初始化合同
// 初始化合同
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
);
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
,
user
);
}
}
}
}
...
@@ -1118,15 +1117,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1118,15 +1117,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social
.
setWorkInjuryStart
(
ServiceUtil
.
ifNull
(
excel
.
getWorkInjuryStart
(),
excel
.
getPensionStart
()));
social
.
setWorkInjuryStart
(
ServiceUtil
.
ifNull
(
excel
.
getWorkInjuryStart
(),
excel
.
getPensionStart
()));
social
.
setBirthStart
(
ServiceUtil
.
ifNull
(
excel
.
getBirthStart
(),
excel
.
getPensionStart
()));
social
.
setBirthStart
(
ServiceUtil
.
ifNull
(
excel
.
getBirthStart
(),
excel
.
getPensionStart
()));
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())){
if
(
Common
.
isNotNull
(
socialSet
.
getProvince
())){
social
.
setSocialProvince
(
Integer
.
toString
(
socialSet
.
getProvince
()));
}
if
(
Common
.
isNotNull
(
socialSet
.
getCity
())){
social
.
setSocialCity
(
Integer
.
toString
(
socialSet
.
getCity
()));
}
if
(
Common
.
isNotNull
(
socialSet
.
getTown
())){
social
.
setSocialTown
(
Integer
.
toString
(
socialSet
.
getTown
()));
}
// 自定义各个基数起缴时间初试化
// 自定义各个基数起缴时间初试化
social
.
setPersonalPensionCardinal
(
excel
.
getPensionCardinal
());
social
.
setPersonalPensionCardinal
(
excel
.
getPensionCardinal
());
social
.
setPersonalMedicalCardinal
(
ServiceUtil
.
ifNull
(
excel
.
getMedicalCardinal
(),
excel
.
getPensionCardinal
()));
social
.
setPersonalMedicalCardinal
(
ServiceUtil
.
ifNull
(
excel
.
getMedicalCardinal
(),
excel
.
getPensionCardinal
()));
...
@@ -1140,6 +1130,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1140,6 +1130,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
// 获取到政策后封装相关数据
// 获取到政策后封装相关数据
if
(
Common
.
isNotNull
(
socialSet
)){
if
(
Common
.
isNotNull
(
socialSet
)){
if
(
Common
.
isNotNull
(
socialSet
.
getProvince
())){
social
.
setSocialProvince
(
Integer
.
toString
(
socialSet
.
getProvince
()));
}
if
(
Common
.
isNotNull
(
socialSet
.
getCity
())){
social
.
setSocialCity
(
Integer
.
toString
(
socialSet
.
getCity
()));
}
if
(
Common
.
isNotNull
(
socialSet
.
getTown
())){
social
.
setSocialTown
(
Integer
.
toString
(
socialSet
.
getTown
()));
}
social
.
setCanOverpay
(
socialSet
.
getCanOverpay
());
social
.
setCanOverpay
(
socialSet
.
getCanOverpay
());
social
.
setCardinalId
(
socialSet
.
getId
());
social
.
setCardinalId
(
socialSet
.
getId
());
social
.
setSocialHousehold
(
socialSet
.
getDepartId
());
social
.
setSocialHousehold
(
socialSet
.
getDepartId
());
...
@@ -1351,7 +1350,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1351,7 +1350,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
void
initContractInfo
(
Map
<
String
,
EmpContractDispatchVo
>
contracts
,
private
void
initContractInfo
(
Map
<
String
,
EmpContractDispatchVo
>
contracts
,
TDispatchImportVo
excel
,
TDispatchImportVo
excel
,
DispatchEmpVo
empVo
,
ProjectSetInfoVo
setInfoVo
)
{
DispatchEmpVo
empVo
,
ProjectSetInfoVo
setInfoVo
,
YifuUser
user
)
{
// 合同开始时间和截止时间一致直接跳过
// 合同开始时间和截止时间一致直接跳过
if
(
Common
.
isNotNull
(
excel
.
getContractStart
())
if
(
Common
.
isNotNull
(
excel
.
getContractStart
())
&&
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
)
...
@@ -1381,6 +1380,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1381,6 +1380,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
excel
.
getSocialHousehold
())
&&
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
if
(
Common
.
isEmpty
(
excel
.
getSocialHousehold
())
&&
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
contract
.
setContractParty
(
excel
.
getSocialHousehold
());
contract
.
setContractParty
(
excel
.
getSocialHousehold
());
}
}
if
(
Common
.
isNotNull
(
user
)){
contract
.
setCreateBy
(
user
.
getId
());
contract
.
setCreateName
(
user
.
getNickname
());
}
contract
.
setSettleDomain
(
setInfoVo
.
getId
());
contract
.
setSettleDomain
(
setInfoVo
.
getId
());
contract
.
setDeptNo
(
setInfoVo
.
getDepartNo
());
contract
.
setDeptNo
(
setInfoVo
.
getDepartNo
());
contract
.
setCustomerId
(
setInfoVo
.
getCustomerId
());
contract
.
setCustomerId
(
setInfoVo
.
getCustomerId
());
...
@@ -1733,10 +1736,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1733,10 +1736,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
// 校验公积金上下限和起缴日期
// 校验公积金上下限和起缴日期
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
if
(
Common
.
isNotNull
(
fundSet
)
if
(
Common
.
isNotNull
(
fundSet
)
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
Common
.
isNotNull
(
excel
.
getProvidentCardinal
())
&&
Common
.
isNotNull
(
excel
.
getProvidentCardinal
())
&&
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
){
||
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_FUND_LIMIT_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_FUND_LIMIT_ERROR
)));
return
true
;
return
true
;
}
}
...
@@ -1776,31 +1779,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1776,31 +1779,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
boolean
validSocialBaseInfo
(
List
<
ErrorMessage
>
errorMessageList
,
TDispatchImportVo
excel
,
DispatchEmpVo
empVo
,
SysBaseSetInfo
socialSet
)
{
private
boolean
validSocialBaseInfo
(
List
<
ErrorMessage
>
errorMessageList
,
TDispatchImportVo
excel
,
DispatchEmpVo
empVo
,
SysBaseSetInfo
socialSet
)
{
if
(
Common
.
isNotNull
(
socialSet
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
if
(
Common
.
isNotNull
(
socialSet
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
Common
.
isNotNull
(
excel
.
getPensionCardinal
())
&&
(
Common
.
isNotNull
(
excel
.
getPensionCardinal
())
&&
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
||
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getMedicalCardinal
())
||(
Common
.
isNotNull
(
excel
.
getMedicalCardinal
())
&&
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
||
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getUnemploymentCardinal
())
||(
Common
.
isNotNull
(
excel
.
getUnemploymentCardinal
())
&&
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
||
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getWorkInjuryCardinal
())
||(
Common
.
isNotNull
(
excel
.
getWorkInjuryCardinal
())
&&
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
||
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getBirthCardinal
())
||(
Common
.
isNotNull
(
excel
.
getBirthCardinal
())
&&
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
||
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getBigailmentCardinal
())
||(
Common
.
isNotNull
(
excel
.
getBigailmentCardinal
())
&&
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
(
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
||
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
){
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_LIMIT_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_LIMIT_ERROR
)));
return
true
;
return
true
;
}
}
// 备案基数和养老基数 养老起缴日期 必填在前面已必填校验,这里不重复校验
// 备案基数和养老基数 养老起缴日期 必填在前面已必填校验,这里不重复校验
if
(
Common
.
is
Empty
(
excel
.
getRecordBase
())
&&
Common
.
isEmpty
(
excel
.
getSocialHousehold
())){
if
(
Common
.
is
NotNull
(
excel
.
getRecordBase
())
&&
Common
.
isNotNull
(
excel
.
getSocialHousehold
())){
// 自定义 只要有一个不相当同的 日期或基数 就要提示
// 自定义 只要有一个不相当同的 日期或基数 就要提示
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
(
excel
.
getPensionCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
&&
(
excel
.
getPensionCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
excel
.
getMedicalCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
excel
.
getMedicalCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
excel
.
getUnemploymentCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
excel
.
getUnemploymentCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
...
@@ -1811,7 +1814,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1811,7 +1814,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
return
true
;
}
}
Date
temp
=
new
Date
()
;
Date
temp
;
if
(
Common
.
isEmpty
(
empVo
)){
if
(
Common
.
isEmpty
(
empVo
)){
temp
=
excel
.
getContractStart
();
temp
=
excel
.
getContractStart
();
}
else
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getContractStart
())){
}
else
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getContractStart
())){
...
@@ -1819,27 +1822,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1819,27 +1822,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
else
{
}
else
{
temp
=
excel
.
getContractStart
();
temp
=
excel
.
getContractStart
();
}
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
(
excel
.
getPensionStart
().
equals
(
temp
)
&&
(
!
temp
.
equals
(
excel
.
getPensionStart
()
)
||
excel
.
getMedicalStart
().
equals
(
temp
)
||
!
temp
.
equals
(
excel
.
getMedicalStart
()
)
||
excel
.
getUnemployStart
().
equals
(
temp
)
||
!
temp
.
equals
(
excel
.
getUnemployStart
()
)
||
excel
.
getWorkInjuryStart
().
equals
(
temp
)
||
!
temp
.
equals
(
excel
.
getWorkInjuryStart
()
)
||
excel
.
getBirthStart
().
equals
(
temp
)
||
!
temp
.
equals
(
excel
.
getBirthStart
()
)
||
excel
.
getBigailmentStart
().
equals
(
temp
)
||
!
temp
.
equals
(
excel
.
getBigailmentStart
()
)
)){
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR
)));
return
true
;
return
true
;
}
}
// 其他 只用判断对应养老基数和时间 与合同时间 即可
// 其他 只用判断对应养老基数和时间 与合同时间 即可
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
(
excel
.
getPensionStart
().
equals
(
temp
)
&&
!
temp
.
equals
(
excel
.
getPensionStart
()
)
)
)
{
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR
)));
return
true
;
return
true
;
}
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
excel
.
getPensionCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
){
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
(
Common
.
isEmpty
(
excel
.
getPensionCardinal
())
||
excel
.
getPensionCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
return
true
;
}
}
...
@@ -2651,6 +2656,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2651,6 +2656,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
providentFund
.
setHandleStatus
(
handleStatus
);
providentFund
.
setHandleStatus
(
handleStatus
);
providentFund
.
setHandleTime
(
now
);
providentFund
.
setHandleTime
(
now
);
providentFund
.
setHandleUser
(
user
.
getId
());
providentFund
.
setHandleUser
(
user
.
getId
());
dis
.
setFundHandleStatus
(
handleStatus
);
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())
&&
CommonConstants
.
ZERO_INT
==
flag
)
{
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())
&&
CommonConstants
.
ZERO_INT
==
flag
)
{
//派增办理通过 改成可派减状态
//派增办理通过 改成可派减状态
providentFund
.
setReduceCan
(
CommonConstants
.
dingleDigitStrArray
[
0
]);
providentFund
.
setReduceCan
(
CommonConstants
.
dingleDigitStrArray
[
0
]);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/ServiceUtil.java
View file @
baeb4c0d
...
@@ -173,7 +173,7 @@ public class ServiceUtil {
...
@@ -173,7 +173,7 @@ public class ServiceUtil {
LocalDateTime
temp
=
null
;
LocalDateTime
temp
=
null
;
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
canOverpay
)){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
canOverpay
)){
temp
=
socialStartDate
.
plusMonths
(
CommonConstants
.
ZERO_STRING
.
equals
(
haveThisMonth
)?(
long
)
overpayNumber:
(
long
)(
overpayNumber
+
1
));
temp
=
socialStartDate
.
plusMonths
(
CommonConstants
.
ZERO_STRING
.
equals
(
haveThisMonth
)?(
long
)
(
overpayNumber
-
1
):(
long
)(
overpayNumber
));
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
canOverpay
)){
}
else
if
(
CommonConstants
.
ONE_STRING
.
equals
(
canOverpay
)){
temp
=
socialStartDate
;
temp
=
socialStartDate
;
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
baeb4c0d
...
@@ -397,10 +397,10 @@
...
@@ -397,10 +397,10 @@
</if>
</if>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
AND s.SOCIAL_HOUSEHOLD_NAME
= #{tDispatchInfo.socialHouseholdName}
AND s.SOCIAL_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
</if>
</if>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
AND f.PROVIDENT_HOUSEHOLD_NAME
= #{tDispatchInfo.providentHouseholdName}
AND f.PROVIDENT_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
</if>
</if>
<if
test=
"tDispatchInfo.createTimeStart != null and tDispatchInfo.createTimeStart.trim() != ''"
>
<if
test=
"tDispatchInfo.createTimeStart != null and tDispatchInfo.createTimeStart.trim() != ''"
>
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
...
@@ -727,7 +727,7 @@
...
@@ -727,7 +727,7 @@
</if>
</if>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
AND a.SETTLE_DOMAIN_NAME
= #{tDispatchInfo.settleDomainName}
AND a.SETTLE_DOMAIN_NAME
like CONCAT(CONCAT(#{tDispatchInfo.settleDomainName}), '%')
</if>
</if>
<if
test=
"tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''"
>
<if
test=
"tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''"
>
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
...
@@ -739,7 +739,7 @@
...
@@ -739,7 +739,7 @@
AND a.CREATE_TIME
<![CDATA[>=]]>
#{tDispatchInfo.createTimeStart}
AND a.CREATE_TIME
<![CDATA[>=]]>
#{tDispatchInfo.createTimeStart}
</if>
</if>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"
>
AND b.SOCIAL_HOUSEHOLD_NAME
= #{tDispatchInfo.socialHouseholdName}
AND b.SOCIAL_HOUSEHOLD_NAME
like CONCAT(CONCAT(#{tDispatchInfo.socialHouseholdName}), '%')
</if>
</if>
</if>
</if>
...
@@ -825,7 +825,7 @@
...
@@ -825,7 +825,7 @@
</if>
</if>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
<if
test=
"tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''"
>
AND a.SETTLE_DOMAIN_NAME
= #{tDispatchInfo.settleDomainName}
AND a.SETTLE_DOMAIN_NAME
like CONCAT(CONCAT(#{tDispatchInfo.settleDomainName}), '%')
</if>
</if>
<if
test=
"tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''"
>
<if
test=
"tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''"
>
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
...
@@ -837,7 +837,7 @@
...
@@ -837,7 +837,7 @@
AND a.CREATE_TIME
<![CDATA[>=]]>
#{tDispatchInfo.createTimeStart}
AND a.CREATE_TIME
<![CDATA[>=]]>
#{tDispatchInfo.createTimeStart}
</if>
</if>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
<if
test=
"tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"
>
AND
b.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
AND
c.PROVIDENT_HOUSEHOLD_NAME like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
</if>
</if>
</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