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
5e125b03
Commit
5e125b03
authored
Jul 30, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
缴费库 代码修改
parent
99796814
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
323 additions
and
302 deletions
+323
-302
TPaymentInfoMapper.java
.../cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
+0
-8
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+321
-262
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+1
-1
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+1
-31
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @
5e125b03
...
@@ -86,12 +86,4 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
...
@@ -86,12 +86,4 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* */
* */
List
<
TPaymentInfo
>
selectListForPaymentImport
(
@Param
(
"months"
)
List
<
String
>
months
,
@Param
(
"idcards"
)
List
<
String
>
idcards
);
List
<
TPaymentInfo
>
selectListForPaymentImport
(
@Param
(
"months"
)
List
<
String
>
months
,
@Param
(
"idcards"
)
List
<
String
>
idcards
);
/*
* 已存在社保缴费库数据 非删除状态
* @param months
* @param idcards
* @return
* */
List
<
TPaymentInfoVo
>
selectPaymentAllInfoByMonthAndIdCard
(
@Param
(
"months"
)
List
<
String
>
months
,
@Param
(
"idcards"
)
List
<
String
>
idcards
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
5e125b03
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
5e125b03
...
@@ -1190,7 +1190,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -1190,7 +1190,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
return
"公积金基数不可为空!"
;
return
"公积金基数不可为空!"
;
}
}
if
(
Common
.
isNullOrZero
(
tPreDispatchInfo
.
getFundCompanyPer
()))
{
if
(
Common
.
isNullOrZero
(
tPreDispatchInfo
.
getFundCompanyPer
()))
{
return
"公积金
单位
比例不可为空!"
;
return
"公积金
企业
比例不可为空!"
;
}
}
if
(
Common
.
isNullOrZero
(
tPreDispatchInfo
.
getFundPersonalPer
()))
{
if
(
Common
.
isNullOrZero
(
tPreDispatchInfo
.
getFundPersonalPer
()))
{
return
"公积个人比例不可为空!"
;
return
"公积个人比例不可为空!"
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
5e125b03
...
@@ -958,15 +958,10 @@
...
@@ -958,15 +958,10 @@
FROM t_payment_info a
FROM t_payment_info a
where 1=1
where 1=1
<if
test=
"months != null and months.size > 0"
>
<if
test=
"months != null and months.size > 0"
>
AND
(
a.SOCIAL_PAY_MONTH in
AND a.SOCIAL_PAY_MONTH in
<foreach
item=
"item"
index=
"index"
collection=
"months"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"item"
index=
"index"
collection=
"months"
open=
"("
separator=
","
close=
")"
>
#{item}
#{item}
</foreach>
</foreach>
or a.PROVIDENT_PAY_MONTH in
<foreach
item=
"item"
index=
"index"
collection=
"months"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
)
</if>
</if>
<if
test=
"idcards != null and idcards.size > 0"
>
<if
test=
"idcards != null and idcards.size > 0"
>
AND a.EMP_IDCARD IN
AND a.EMP_IDCARD IN
...
@@ -976,31 +971,6 @@
...
@@ -976,31 +971,6 @@
</if>
</if>
</select>
</select>
<!--tPaymentInfo 按ID查收缴费库包含社保和公积金明细的数据查询-->
<select
id=
"selectPaymentAllInfoByMonthAndIdCard"
resultMap=
"tPaymentAllInfoMap"
>
SELECT
<include
refid=
"base_column_list_all"
/>
,
FROM t_payment_info a
where 1=1
<if
test=
"months != null and months.size > 0"
>
AND (a.SOCIAL_PAY_MONTH in
<foreach
item=
"item"
index=
"index"
collection=
"months"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
or a.PROVIDENT_PAY_MONTH in
<foreach
item=
"item"
index=
"index"
collection=
"months"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
)
</if>
<if
test=
"idcards != null and idcards.size > 0"
>
AND A.EMP_IDCARD IN
<foreach
item=
"item"
index=
"index"
collection=
"idcards"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</select>
<!--tPaymentInfo 查询缴费库要删除的数据-->
<!--tPaymentInfo 查询缴费库要删除的数据-->
<select
id=
"selectListForDelete"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo"
>
<select
id=
"selectListForDelete"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo"
>
select
select
...
...
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