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
b9044a17
Commit
b9044a17
authored
Aug 03, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量办理 100%
parent
624b9fb1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
51 deletions
+76
-51
EmpContractDispatchVo.java
...cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java
+19
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
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 @
b9044a17
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.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -224,4 +227,20 @@ public class EmpContractDispatchVo implements Serializable {
@Schema
(
description
=
"合同年限"
,
name
=
"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 @
b9044a17
...
...
@@ -2150,7 +2150,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contract
=
new
TEmployeeContractInfo
();
BeanUtil
.
copyProperties
(
contractAdd
,
contract
);
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
))
{
contract
.
setEmpId
(
project
.
getId
());
contract
.
setEmpNo
(
project
.
getEmpNo
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
b9044a17
...
...
@@ -17,7 +17,6 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
service
.
impl
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.util.ArrayUtil
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.context.AnalysisContext
;
...
...
@@ -1063,21 +1062,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 初始化项目档案
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
()))
{
// 初始化项目档案
initProjectInfo
(
projects
,
excel
,
empVo
,
user
,
setInfoVo
,
socialSet
);
// 初始化合同
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
);
initContractInfo
(
contracts
,
excel
,
empVo
,
setInfoVo
,
user
);
}
// 有档案有项目档案无合同
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getDeptNo
())
&&
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
social
.
setWorkInjuryStart
(
ServiceUtil
.
ifNull
(
excel
.
getWorkInjuryStart
(),
excel
.
getPensionStart
()));
social
.
setBirthStart
(
ServiceUtil
.
ifNull
(
excel
.
getBirthStart
(),
excel
.
getPensionStart
()));
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
.
setPersonalMedicalCardinal
(
ServiceUtil
.
ifNull
(
excel
.
getMedicalCardinal
(),
excel
.
getPensionCardinal
()));
...
...
@@ -1140,6 +1130,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 获取到政策后封装相关数据
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
.
setCardinalId
(
socialSet
.
getId
());
social
.
setSocialHousehold
(
socialSet
.
getDepartId
());
...
...
@@ -1351,7 +1350,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
void
initContractInfo
(
Map
<
String
,
EmpContractDispatchVo
>
contracts
,
TDispatchImportVo
excel
,
DispatchEmpVo
empVo
,
ProjectSetInfoVo
setInfoVo
)
{
DispatchEmpVo
empVo
,
ProjectSetInfoVo
setInfoVo
,
YifuUser
user
)
{
// 合同开始时间和截止时间一致直接跳过
if
(
Common
.
isNotNull
(
excel
.
getContractStart
())
&&
Common
.
isNotNull
(
empVo
)
...
...
@@ -1381,6 +1380,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
excel
.
getSocialHousehold
())
&&
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
contract
.
setContractParty
(
excel
.
getSocialHousehold
());
}
if
(
Common
.
isNotNull
(
user
)){
contract
.
setCreateBy
(
user
.
getId
());
contract
.
setCreateName
(
user
.
getNickname
());
}
contract
.
setSettleDomain
(
setInfoVo
.
getId
());
contract
.
setDeptNo
(
setInfoVo
.
getDepartNo
());
contract
.
setCustomerId
(
setInfoVo
.
getCustomerId
());
...
...
@@ -1733,10 +1736,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 校验公积金上下限和起缴日期
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
if
(
Common
.
isNotNull
(
fundSet
)
if
(
Common
.
isNotNull
(
fundSet
)
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
Common
.
isNotNull
(
excel
.
getProvidentCardinal
())
&&
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
){
&&
(
excel
.
getProvidentCardinal
().
compareTo
(
fundSet
.
getUpperLimit
())
>
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
)));
return
true
;
}
...
...
@@ -1776,31 +1779,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
boolean
validSocialBaseInfo
(
List
<
ErrorMessage
>
errorMessageList
,
TDispatchImportVo
excel
,
DispatchEmpVo
empVo
,
SysBaseSetInfo
socialSet
)
{
if
(
Common
.
isNotNull
(
socialSet
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
Common
.
isNotNull
(
excel
.
getPensionCardinal
())
&&
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
&&
(
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
||
excel
.
getPensionCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getMedicalCardinal
())
&&
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
&&
(
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
||
excel
.
getMedicalCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getUnemploymentCardinal
())
&&
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
&&
(
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
||
excel
.
getUnemploymentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getWorkInjuryCardinal
())
&&
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
&&
(
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
||
excel
.
getWorkInjuryCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getBirthCardinal
())
&&
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
&&
(
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
||
excel
.
getBirthCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
)
||(
Common
.
isNotNull
(
excel
.
getBigailmentCardinal
())
&&
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
CommonConstants
.
ZERO_INT
&&
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getLowerLimit
())<
CommonConstants
.
ZERO_INT
)
&&
(
excel
.
getBigailmentCardinal
().
compareTo
(
socialSet
.
getUpperLimit
())
>
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
)));
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
.
getMedicalCardinal
().
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
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
}
Date
temp
=
new
Date
()
;
Date
temp
;
if
(
Common
.
isEmpty
(
empVo
)){
temp
=
excel
.
getContractStart
();
}
else
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getContractStart
())){
...
...
@@ -1819,27 +1822,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
else
{
temp
=
excel
.
getContractStart
();
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
excel
.
getPensionStart
().
equals
(
temp
)
||
excel
.
getMedicalStart
().
equals
(
temp
)
||
excel
.
getUnemployStart
().
equals
(
temp
)
||
excel
.
getWorkInjuryStart
().
equals
(
temp
)
||
excel
.
getBirthStart
().
equals
(
temp
)
||
excel
.
getBigailmentStart
().
equals
(
temp
)
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
(
!
temp
.
equals
(
excel
.
getPensionStart
()
)
||
!
temp
.
equals
(
excel
.
getMedicalStart
()
)
||
!
temp
.
equals
(
excel
.
getUnemployStart
()
)
||
!
temp
.
equals
(
excel
.
getWorkInjuryStart
()
)
||
!
temp
.
equals
(
excel
.
getBirthStart
()
)
||
!
temp
.
equals
(
excel
.
getBigailmentStart
()
)
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR
)));
return
true
;
}
// 其他 只用判断对应养老基数和时间 与合同时间 即可
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
excel
.
getPensionStart
().
equals
(
temp
)
)
)
{
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
!
temp
.
equals
(
excel
.
getPensionStart
()
)
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR
)));
return
true
;
}
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
)));
return
true
;
}
...
...
@@ -2651,6 +2656,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
providentFund
.
setHandleStatus
(
handleStatus
);
providentFund
.
setHandleTime
(
now
);
providentFund
.
setHandleUser
(
user
.
getId
());
dis
.
setFundHandleStatus
(
handleStatus
);
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())
&&
CommonConstants
.
ZERO_INT
==
flag
)
{
//派增办理通过 改成可派减状态
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 @
b9044a17
...
...
@@ -173,7 +173,7 @@ public class ServiceUtil {
LocalDateTime
temp
=
null
;
LocalDateTime
now
=
LocalDateTime
.
now
();
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
)){
temp
=
socialStartDate
;
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
b9044a17
...
...
@@ -395,10 +395,10 @@
</if>
<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
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
test=
"tDispatchInfo.createTimeStart != null and tDispatchInfo.createTimeStart.trim() != ''"
>
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
...
...
@@ -725,7 +725,7 @@
</if>
<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
test=
"tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''"
>
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
...
...
@@ -737,7 +737,7 @@
AND a.CREATE_TIME
<![CDATA[>=]]>
#{tDispatchInfo.createTimeStart}
</if>
<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>
...
...
@@ -823,7 +823,7 @@
</if>
<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
test=
"tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''"
>
AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
...
...
@@ -835,7 +835,7 @@
AND a.CREATE_TIME
<![CDATA[>=]]>
#{tDispatchInfo.createTimeStart}
</if>
<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>
...
...
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