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
9ac0fb46
Commit
9ac0fb46
authored
Sep 14, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生成收入接口修改
parent
a6597bfb
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
154 additions
and
52 deletions
+154
-52
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+8
-0
TPaymentInfoController.java
...lus/v1/yifu/social/controller/TPaymentInfoController.java
+14
-0
TPaymentInfoService.java
...loud/plus/v1/yifu/social/service/TPaymentInfoService.java
+2
-0
TIncomeServiceImpl.java
.../plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
+8
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+122
-52
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
9ac0fb46
...
...
@@ -377,6 +377,14 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty
(
"推送状态 0已推送 1未推送"
)
private
String
pushStatus
;
/**
* 收入状态
*/
@ExcelAttribute
(
name
=
"收入状态 0已生成 1未生成"
)
@Schema
(
description
=
"收入状态 0已生成 1未生成"
)
@ExcelProperty
(
"收入状态 0已生成 1未生成"
)
private
String
incomeStatus
;
/**
* 单位社保补缴利息
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @
9ac0fb46
...
...
@@ -381,4 +381,18 @@ public class TPaymentInfoController {
public
TPaymentVo
getPaymentSocialAndFound
(
@RequestBody
TPaymentInfo
info
)
{
return
tPaymentInfoService
.
getPaymentSocialAndFound
(
info
);
}
/**
* @Description: 手动推送社保缴费库明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
@Operation
(
summary
=
"手动推送社保缴费库明细的数据"
,
description
=
"手动推送社保缴费库明细的数据"
)
@SysLog
(
"手动推送社保缴费库明细的数据"
)
@PostMapping
(
"/pushPaymentSocialFundInfo"
)
public
R
<
Boolean
>
pushPaymentSocialFundInfo
()
{
tPaymentInfoService
.
pushPaymentSocialFundInfo
();
return
R
.
ok
();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java
View file @
9ac0fb46
...
...
@@ -140,4 +140,6 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
TPaymentVo
getPaymentSocialAndFound
(
TPaymentInfo
info
);
void
pushPaymentSocialFundInfo
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
View file @
9ac0fb46
...
...
@@ -36,8 +36,10 @@ import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk;
import
com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TIncome
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService
;
...
...
@@ -74,6 +76,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
@Autowired
private
EkpIncomeUtil
ekpIncomeUtil
;
@Autowired
private
TPaymentInfoMapper
tPaymentInfoMapper
;
/**
* 收入明细表简单分页查询
*
...
...
@@ -299,6 +304,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
tIncomeDetail
.
setCreateTime
(
new
Date
());
tIncomeDetail
.
setDataCreateMonth
(
DateUtil
.
addMonth
(
0
));
tIncomeDetailService
.
save
(
tIncomeDetail
);
TPaymentInfo
paymentInfo
=
tPaymentInfoMapper
.
selectById
(
tIncomeDetail
.
getSourceId
());
paymentInfo
.
setIncomeStatus
(
CommonConstants
.
ZERO_STRING
);
tPaymentInfoMapper
.
updateById
(
paymentInfo
);
// 不存在,直接新增
if
(
incomeList
==
null
||
incomeList
.
isEmpty
())
{
BeanUtil
.
copyProperties
(
tIncomeDetail
,
income
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
9ac0fb46
This diff is collapsed.
Click to expand it.
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