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
714878db
Commit
714878db
authored
Nov 08, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口屏蔽
parent
23e7929e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
24 deletions
+12
-24
TPaymentInfoController.java
...lus/v1/yifu/social/controller/TPaymentInfoController.java
+1
-1
TPaymentInfoService.java
...loud/plus/v1/yifu/social/service/TPaymentInfoService.java
+1
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+2
-14
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+8
-8
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @
714878db
...
@@ -149,7 +149,7 @@ public class TPaymentInfoController {
...
@@ -149,7 +149,7 @@ public class TPaymentInfoController {
@PostMapping
(
"/importListAdd"
)
@PostMapping
(
"/importListAdd"
)
@PreAuthorize
(
"@pms.hasPermission('social_tpaymentinfo_batchImport')"
)
@PreAuthorize
(
"@pms.hasPermission('social_tpaymentinfo_batchImport')"
)
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
@RequestParam
String
random
)
{
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
@RequestParam
String
random
)
{
return
tPaymentInfoService
.
importSocialDiy
(
file
.
getInputStream
()
,
random
);
return
tPaymentInfoService
.
importSocialDiy
(
file
.
getInputStream
());
}
}
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java
View file @
714878db
...
@@ -49,7 +49,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
...
@@ -49,7 +49,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
* @param inputStream
* @param inputStream
* @return
* @return
*/
*/
R
<
List
<
ErrorMessage
>>
importSocialDiy
(
InputStream
inputStream
,
String
random
);
R
<
List
<
ErrorMessage
>>
importSocialDiy
(
InputStream
inputStream
);
/**
/**
* 批量新增缴费库-合肥三险
* 批量新增缴费库-合肥三险
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
714878db
...
@@ -341,7 +341,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -341,7 +341,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List
<
TPaymentInfo
>
list
=
baseMapper
.
selectList
(
wrapper
);
List
<
TPaymentInfo
>
list
=
baseMapper
.
selectList
(
wrapper
);
List
<
String
>
idList
=
new
ArrayList
<>();
List
<
String
>
idList
=
new
ArrayList
<>();
b
oolean
delFlag
=
false
;
B
oolean
delFlag
=
false
;
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
for
(
TPaymentInfo
paymentInfo
:
list
)
{
for
(
TPaymentInfo
paymentInfo
:
list
)
{
if
((!
user
.
getId
().
equals
(
paymentInfo
.
getCreateBy
())
&&
if
((!
user
.
getId
().
equals
(
paymentInfo
.
getCreateBy
())
&&
...
@@ -396,7 +396,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -396,7 +396,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
@Override
@Override
public
R
<
List
<
ErrorMessage
>>
importSocialDiy
(
InputStream
inputStream
,
String
random
)
{
public
R
<
List
<
ErrorMessage
>>
importSocialDiy
(
InputStream
inputStream
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
ExcelUtil
<
TPaymentInfoVo
>
util1
=
new
ExcelUtil
<>(
TPaymentInfoVo
.
class
);
ExcelUtil
<
TPaymentInfoVo
>
util1
=
new
ExcelUtil
<>(
TPaymentInfoVo
.
class
);
...
@@ -1298,12 +1298,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1298,12 +1298,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
"的公积金数据(请查验公积金缴纳地)!"
));
+
"的公积金数据(请查验公积金缴纳地)!"
));
continue
;
continue
;
}
}
//查看是否有操作对应主体的权限
if
(!
Common
.
isNotNull
(
infoVo
.
getProvidentPayMonth
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
"必填项校验失败:公积金缴纳月份不可为空!"
));
continue
;
}
//计算公积金合计,个人金额和单位金额一致
//计算公积金合计,个人金额和单位金额一致
infoVo
.
setProvidentSum
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getUnitProvidentSum
(),
infoVo
.
getUnitProvidentSum
()));
infoVo
.
setProvidentSum
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getUnitProvidentSum
(),
infoVo
.
getUnitProvidentSum
()));
// 判重
// 判重
...
@@ -1703,12 +1697,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1703,12 +1697,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
continue
;
continue
;
}
}
//查看缴纳月是否为空
if
(!
Common
.
isNotNull
(
infoVo
.
getSocialPayMonth
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"必填项校验失败:社保缴纳月份不可为空!"
));
continue
;
}
//判断是否存在养老缴费数据
//判断是否存在养老缴费数据
if
(
PaymentConstants
.
PENSION_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
if
(
PaymentConstants
.
PENSION_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
payExists
=
paymentInfoPensionMap
.
get
(
infoVo
.
getSocialPayAddr
()
payExists
=
paymentInfoPensionMap
.
get
(
infoVo
.
getSocialPayAddr
()
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
714878db
...
@@ -269,7 +269,7 @@
...
@@ -269,7 +269,7 @@
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if>
</if>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD
like CONCAT(#{tPaymentInfo.socialHousehold},'%')
AND a.SOCIAL_HOUSEHOLD
= #{tPaymentInfo.socialHousehold}
</if>
</if>
<if
test=
"tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''"
>
<if
test=
"tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''"
>
AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
...
@@ -293,7 +293,7 @@
...
@@ -293,7 +293,7 @@
AND a.SUM_ALL = #{tPaymentInfo.sumAll}
AND a.SUM_ALL = #{tPaymentInfo.sumAll}
</if>
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD
like CONCAT(#{tPaymentInfo.providentHousehold},'%')
AND a.PROVIDENT_HOUSEHOLD
= #{tPaymentInfo.providentHousehold}
</if>
</if>
<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}
...
@@ -492,7 +492,7 @@
...
@@ -492,7 +492,7 @@
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if>
</if>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD
like CONCAT(#{tPaymentInfo.socialHousehold},'%')
AND a.SOCIAL_HOUSEHOLD
= #{tPaymentInfo.socialHousehold}
</if>
</if>
<if
test=
"tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''"
>
<if
test=
"tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''"
>
AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
...
@@ -507,7 +507,7 @@
...
@@ -507,7 +507,7 @@
AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
</if>
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD
like CONCAT(#{tPaymentInfo.providentHousehold},'%')
AND a.PROVIDENT_HOUSEHOLD
= #{tPaymentInfo.providentHousehold}
</if>
</if>
<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}
...
@@ -522,10 +522,10 @@
...
@@ -522,10 +522,10 @@
AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
</if>
</if>
<if
test=
"tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''"
>
<if
test=
"tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''"
>
AND
a.SOCIAL_PROVINCE = #{tPaymentInfo.socialProvince}
AND
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if>
</if>
<if
test=
"tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''"
>
<if
test=
"tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''"
>
AND
a.SOCIAL_CITY = #{tPaymentInfo.socialCity}
AND
(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if>
</if>
<if
test=
"tPaymentInfo.socialTown == null"
>
<if
test=
"tPaymentInfo.socialTown == null"
>
<if
test=
"tPaymentInfo.socialCity != null"
>
<if
test=
"tPaymentInfo.socialCity != null"
>
...
@@ -675,7 +675,7 @@
...
@@ -675,7 +675,7 @@
w.SETTLE_DOMAIN_CODE,
w.SETTLE_DOMAIN_CODE,
w.SETTLE_DOMAIN_NAME,
w.SETTLE_DOMAIN_NAME,
w.SOCIAL_HOUSEHOLD,
w.SOCIAL_HOUSEHOLD,
w.
SOCIAL_SECURITY_NO,
MAX( w.SOCIAL_SECURITY_NO ) AS
SOCIAL_SECURITY_NO,
w.SOCIAL_PAY_ADDR,
w.SOCIAL_PAY_ADDR,
w.SOCIAL_PAY_MONTH,
w.SOCIAL_PAY_MONTH,
w.SOCIAL_CREATE_MONTH,
w.SOCIAL_CREATE_MONTH,
...
@@ -732,7 +732,7 @@
...
@@ -732,7 +732,7 @@
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_HOUSEHOLD,
a.
SOCIAL_SECURITY_NO,
MAX( a.SOCIAL_SECURITY_NO ) AS
SOCIAL_SECURITY_NO,
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH,
a.SOCIAL_CREATE_MONTH,
...
...
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