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
880a7968
Commit
880a7968
authored
Feb 27, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保优化修改
parent
00f55c45
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
13 deletions
+27
-13
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+2
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+10
-8
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+1
-2
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+14
-3
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @
880a7968
...
...
@@ -63,6 +63,8 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
List
<
TSocialFundInfoExportVo
>
exportList
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfoSearchVo
tSocialFundInfo
);
Integer
exportListCount
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfoSearchVo
tSocialFundInfo
);
void
updateSocialAndFoundInfo
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
void
updateSocialAndFoundInfoF
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
880a7968
...
...
@@ -1710,7 +1710,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TProvidentFund:
:
getFundCity
,
infoVo
.
getSocialCity
()));
if
(!
fundlist
.
isEmpty
())
{
for
(
TProvidentFund
providentFund
:
fundlist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
get
SocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocial
Town
())
&&
if
((
Common
.
isEmpty
(
infoVo
.
get
FundTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getFund
Town
())
&&
infoVo
.
getFundTown
().
equals
(
providentFund
.
getFundTown
())))
&&
DateUtil
.
dateToString
(
providentFund
.
getProvidentStart
(),
"yyyyMM"
).
compareTo
(
infoVo
.
getProvidentPayMonth
())
<=
0
&&
(
Common
.
isEmpty
(
providentFund
.
getFundReduceDate
())
||
(
Common
.
isNotNull
(
providentFund
.
getFundReduceDate
())
&&
...
...
@@ -1727,6 +1727,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
"的公积金数据(请查验公积金缴纳地)!"
));
continue
;
}
}
else
{
tProvidentFund
=
null
;
}
//计算公积金合计,个人金额和单位金额一致
infoVo
.
setProvidentSum
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getUnitProvidentSum
(),
infoVo
.
getUnitProvidentSum
()));
...
...
@@ -2657,18 +2659,18 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
areaArray
.
length
>=
CommonConstants
.
TWO_INT
)
{
temp
=
areaMap2
.
get
(
areaArray
[
0
]
+
CommonConstants
.
DOWN_LINE_STRING
+
"null"
);
if
(
Common
.
isNotNull
(
temp
))
{
infoVo
.
set
Social
Province
(
temp
);
infoVo
.
set
Fund
Province
(
temp
);
}
temp
=
areaMap2
.
get
(
areaArray
[
1
]
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
infoVo
.
get
Social
Province
()
?
"null"
:
infoVo
.
get
Social
Province
()));
temp
=
areaMap2
.
get
(
areaArray
[
1
]
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
infoVo
.
get
Fund
Province
()
?
"null"
:
infoVo
.
get
Fund
Province
()));
if
(
Common
.
isNotNull
(
temp
))
{
infoVo
.
set
Social
City
(
temp
);
infoVo
.
set
Fund
City
(
temp
);
}
if
(
areaArray
.
length
>=
CommonConstants
.
THREE_INT
)
{
temp
=
areaMap2
.
get
(
areaArray
[
2
]
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
infoVo
.
get
Social
City
()
?
"null"
:
infoVo
.
get
Social
City
()));
temp
=
areaMap2
.
get
(
areaArray
[
2
]
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
infoVo
.
get
Fund
City
()
?
"null"
:
infoVo
.
get
Fund
City
()));
if
(
Common
.
isNotNull
(
temp
))
{
infoVo
.
set
Social
Town
(
temp
);
infoVo
.
set
Fund
Town
(
temp
);
}
}
if
(
null
!=
s
.
getFundProvince
())
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
880a7968
...
...
@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
...
...
@@ -103,7 +102,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
String
fileName
=
"社保公积金批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
//获取要导出的列表
List
<
TSocialFundInfoExportVo
>
list
=
new
ArrayList
<>();
long
count
=
noPageCountDiy
(
searchVo
);
long
count
=
baseMapper
.
exportListCount
(
searchVo
);
ServletOutputStream
out
=
null
;
try
{
out
=
response
.
getOutputStream
();
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
880a7968
...
...
@@ -941,6 +941,17 @@
</where>
</select>
<!--导出-->
<select
id=
"exportListCount"
resultType=
"java.lang.Integer"
>
select
count(1)
from t_social_fund_info a
<where>
1=1
<include
refid=
"tSocialFundInfo_where"
/>
</where>
</select>
<!--导出-->
<select
id=
"exportList"
resultMap=
"exportMap"
>
select
...
...
@@ -1111,9 +1122,9 @@
LEFT JOIN sys_area s1 on a.SOCIAL_PROVINCE=s1.id
LEFT JOIN sys_area s2 on a.SOCIAL_CITY=s2.id
LEFT JOIN sys_area s3 on a.SOCIAL_TOWN=s3.id
LEFT JOIN sys_area f1 on
d
.FUND_PROVINCE=f1.id
LEFT JOIN sys_area f2 on
d
.FUND_CITY=f2.id
LEFT JOIN sys_area f3 on
d
.FUND_TOWN=f3.id
LEFT JOIN sys_area f1 on
a
.FUND_PROVINCE=f1.id
LEFT JOIN sys_area f2 on
a
.FUND_CITY=f2.id
LEFT JOIN sys_area f3 on
a
.FUND_TOWN=f3.id
LEFT JOIN sys_area d1 on d.FILE_PROVINCE=d1.id
LEFT JOIN sys_area d2 on d.FILE_CITY=d2.id
LEFT JOIN sys_area d3 on d.FILE_TOWN=d3.id
...
...
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