Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
f0731b0b
You need to sign in or sign up before continuing.
Commit
f0731b0b
authored
Mar 03, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.2' into MVP1.5.2
parents
700047ec
a58022e4
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
119 additions
and
43 deletions
+119
-43
ContractAlertSearchVo.java
...cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
+11
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+18
-2
TPaymentInfoSearchVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPaymentInfoSearchVo.java
+8
-0
TPaymentInfoMapper.java
.../cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
+1
-1
TPaymentInfoService.java
...loud/plus/v1/yifu/social/service/TPaymentInfoService.java
+1
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+9
-6
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+1
-1
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+70
-32
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
View file @
f0731b0b
...
@@ -36,4 +36,15 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
...
@@ -36,4 +36,15 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
* 查询数据止
* 查询数据止
**/
**/
private
int
limitEnd
;
private
int
limitEnd
;
/**
* @Author fxj
* 合同截止时间区间查询--开始
**/
private
LocalDateTime
contractEndStart
;
/**
* @Author fxj
* 合同截止时间区间查询--截止
**/
private
LocalDateTime
contractEndEnd
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
f0731b0b
...
@@ -70,6 +70,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -70,6 +70,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}
else
{
}
else
{
wrapper
.
orderByDesc
(
BaseEntity:
:
getCreateTime
);
wrapper
.
orderByDesc
(
BaseEntity:
:
getCreateTime
);
}
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndStart
())){
wrapper
.
ge
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndStart
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndEnd
())){
wrapper
.
le
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndEnd
());
}
return
baseMapper
.
selectPage
(
page
,
wrapper
);
return
baseMapper
.
selectPage
(
page
,
wrapper
);
}
}
...
@@ -80,7 +86,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -80,7 +86,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
if
(
Common
.
isNotNull
(
idList
)){
if
(
Common
.
isNotNull
(
idList
)){
wrapper
.
in
(
TEmpContractAlert:
:
getId
,
idList
);
wrapper
.
in
(
TEmpContractAlert:
:
getId
,
idList
);
}
}
wrapper
.
ne
(
TEmpContractAlert:
:
getId
,
CommonConstants
.
ZERO_STRING
);
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndStart
())){
wrapper
.
ge
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndStart
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndEnd
())){
wrapper
.
le
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndEnd
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
"a."
))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
"a."
))
{
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
"a."
,
" "
));
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
"a."
,
" "
));
...
@@ -96,6 +107,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -96,6 +107,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
if
(
Common
.
isNotNull
(
idList
)){
if
(
Common
.
isNotNull
(
idList
)){
wrapper
.
in
(
TEmpContractAlert:
:
getId
,
idList
);
wrapper
.
in
(
TEmpContractAlert:
:
getId
,
idList
);
}
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndStart
())){
wrapper
.
ge
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndStart
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndEnd
())){
wrapper
.
le
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndEnd
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
"a."
))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
"a."
))
{
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
"a."
,
" "
));
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
"a."
,
" "
));
...
@@ -171,7 +188,6 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -171,7 +188,6 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
private
LambdaQueryWrapper
buildQueryWrapper
(
ContractAlertSearchVo
entity
){
private
LambdaQueryWrapper
buildQueryWrapper
(
ContractAlertSearchVo
entity
){
LambdaQueryWrapper
<
TEmpContractAlert
>
wrapper
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
TEmpContractAlert
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
ne
(
TEmpContractAlert:
:
getId
,
CommonConstants
.
ZERO_STRING
);
if
(
ArrayUtil
.
isNotEmpty
(
entity
.
getCreateTimes
()))
{
if
(
ArrayUtil
.
isNotEmpty
(
entity
.
getCreateTimes
()))
{
wrapper
.
ge
(
TEmpContractAlert:
:
getCreateTime
,
entity
.
getCreateTimes
()[
0
])
wrapper
.
ge
(
TEmpContractAlert:
:
getCreateTime
,
entity
.
getCreateTimes
()[
0
])
.
le
(
TEmpContractAlert:
:
getCreateTime
,
.
le
(
TEmpContractAlert:
:
getCreateTime
,
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoSearchVo.java
View file @
f0731b0b
...
@@ -70,4 +70,12 @@ public class TPaymentInfoSearchVo extends TPaymentInfo {
...
@@ -70,4 +70,12 @@ public class TPaymentInfoSearchVo extends TPaymentInfo {
@Schema
(
description
=
"查询limit 数据条数"
)
@Schema
(
description
=
"查询limit 数据条数"
)
private
int
limitEnd
;
private
int
limitEnd
;
/**
* @Author fxj
* 区域查询辅助字段:0 不包含下级 1 包含下级
**/
@Schema
(
description
=
"0 不包含下级 1 包含下级"
)
private
String
areaFlag
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @
f0731b0b
...
@@ -44,7 +44,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
...
@@ -44,7 +44,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* @param tPaymentInfo 缴费库
* @param tPaymentInfo 缴费库
* @return
* @return
*/
*/
IPage
<
TPaymentInfo
>
getTPaymentInfoPage
(
Page
<
TPaymentInfo
>
page
,
@Param
(
"tPaymentInfo"
)
TPaymentInfo
tPaymentInfo
);
IPage
<
TPaymentInfo
>
getTPaymentInfoPage
(
Page
<
TPaymentInfo
>
page
,
@Param
(
"tPaymentInfo"
)
TPaymentInfo
SearchVo
tPaymentInfo
);
/**
/**
* 缴费库简单分页查询
* 缴费库简单分页查询
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java
View file @
f0731b0b
...
@@ -42,7 +42,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
...
@@ -42,7 +42,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
* @param tPaymentInfo 缴费库
* @param tPaymentInfo 缴费库
* @return
* @return
*/
*/
IPage
<
TPaymentInfo
>
getTPaymentInfoPage
(
Page
<
TPaymentInfo
>
page
,
TPaymentInfo
tPaymentInfo
);
IPage
<
TPaymentInfo
>
getTPaymentInfoPage
(
Page
<
TPaymentInfo
>
page
,
TPaymentInfo
SearchVo
tPaymentInfo
);
/**
/**
* 缴费库批量导入社保
* 缴费库批量导入社保
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
f0731b0b
...
@@ -2500,13 +2500,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2500,13 +2500,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2
)));
return
true
;
return
true
;
}
}
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getPaymentType
())){
excel
.
setPensionCardinal
(
socialSet
.
getLowerLimit
());
}
if
(
CommonConstants
.
TWO_STRING
.
equals
(
excel
.
getPaymentType
())){
excel
.
setPensionCardinal
(
socialSet
.
getUpperLimit
());
}
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
)){
&&
(
Common
.
isEmpty
(
excel
.
getPensionCardinal
())
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
||
excel
.
getPensionCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
)){
return
true
;
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
f0731b0b
...
@@ -142,7 +142,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -142,7 +142,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
* @return
* @return
*/
*/
@Override
@Override
public
IPage
<
TPaymentInfo
>
getTPaymentInfoPage
(
Page
<
TPaymentInfo
>
page
,
TPaymentInfo
tPaymentInfo
)
{
public
IPage
<
TPaymentInfo
>
getTPaymentInfoPage
(
Page
<
TPaymentInfo
>
page
,
TPaymentInfo
SearchVo
tPaymentInfo
)
{
return
baseMapper
.
getTPaymentInfoPage
(
page
,
tPaymentInfo
);
return
baseMapper
.
getTPaymentInfoPage
(
page
,
tPaymentInfo
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
f0731b0b
...
@@ -390,25 +390,48 @@
...
@@ -390,25 +390,48 @@
<if
test=
"tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''"
>
<if
test=
"tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''"
>
AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
</if>
</if>
<if
test=
"tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''"
>
<if
test=
"tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''"
>
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
</if>
<if
test=
"tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''"
>
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
</if>
<if
test=
"tPaymentInfo.socialTown == null"
>
<if
test=
"tPaymentInfo.socialCity != null"
>
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
<if
test=
"tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == '0'"
>
</if>
<if
test=
"tPaymentInfo.socialTown == null"
>
<if
test=
"tPaymentInfo.socialCity == null"
>
<if
test=
"tPaymentInfo.socialCity != null"
>
<if
test=
"tPaymentInfo.socialProvince != null"
>
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
<if
test=
"tPaymentInfo.socialCity == null"
>
<if
test=
"tPaymentInfo.socialProvince != null"
>
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
</if>
</if>
</if>
</if>
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
</if>
</if>
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
<if
test=
"tPaymentInfo.areaFlag == '1'"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
<if
test=
"tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null"
>
AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
or
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and a.FUND_CITY is null)
)
</if>
<if
test=
"tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null"
>
AND (
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and a.SOCIAL_TOWN is null )
or
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and a.FUND_TOWN is null)
)
</if>
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
</if>
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if
test=
"tPaymentInfo.socialId != null and tPaymentInfo.socialId.trim() != ''"
>
<if
test=
"tPaymentInfo.socialId != null and tPaymentInfo.socialId.trim() != ''"
>
AND a.SOCIAL_ID = #{tPaymentInfo.socialId}
AND a.SOCIAL_ID = #{tPaymentInfo.socialId}
</if>
</if>
...
@@ -607,28 +630,43 @@
...
@@ -607,28 +630,43 @@
<if
test=
"tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''"
>
<if
test=
"tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''"
>
AND a.FUND_CITY = #{tPaymentInfo.fundCity}
AND a.FUND_CITY = #{tPaymentInfo.fundCity}
</if>
</if>
<if
test=
"tPaymentInfo.fundTown != null and tPaymentInfo.fundTown.trim() != ''"
>
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
<if
test=
"tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == '0'"
>
</if>
<if
test=
"tPaymentInfo.socialTown == null"
>
<if
test=
"tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''"
>
<if
test=
"tPaymentInfo.socialCity != null"
>
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
<if
test=
"tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''"
>
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
<if
test=
"tPaymentInfo.socialTown == null"
>
<if
test=
"tPaymentInfo.socialCity != null"
>
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
<if
test=
"tPaymentInfo.socialCity == null"
>
<if
test=
"tPaymentInfo.socialProvince != null"
>
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
</if>
<if
test=
"tPaymentInfo.socialCity == null"
>
<if
test=
"tPaymentInfo.socialProvince != null"
>
AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
</if>
</if>
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
</if>
</if>
</if>
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
<if
test=
"tPaymentInfo.areaFlag == '1'"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
<if
test=
"tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null"
>
AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
or
(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and a.FUND_CITY is null)
)
</if>
<if
test=
"tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null"
>
AND (
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' and a.SOCIAL_TOWN is null )
or
(a.FUND_CITY = '${tPaymentInfo.socialCity}' and a.FUND_TOWN is null)
)
</if>
<if
test=
"tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''"
>
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if>
</if>
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 结束 2023-03-02 fxj -->
<if
test=
"tPaymentInfo.providentNo != null and tPaymentInfo.providentNo.trim() != ''"
>
<if
test=
"tPaymentInfo.providentNo != null and tPaymentInfo.providentNo.trim() != ''"
>
AND a.PROVIDENT_NO = #{tPaymentInfo.providentNo}
AND a.PROVIDENT_NO = #{tPaymentInfo.providentNo}
</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