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
26e8ebcb
Commit
26e8ebcb
authored
Mar 10, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.2' into MVP1.5.2
parents
4e47afe0
02166357
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+21
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+1
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
26e8ebcb
...
...
@@ -50,6 +50,7 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -427,6 +428,26 @@ public class TDispatchInfoController {
}
}
/**
* @Author huyc
* @Description 单个派减
* @Date 16:54 2023/3/9
* @Param
* @return
**/
@Operation
(
description
=
"单个派减"
)
@SysLog
(
"单个派减"
)
@PostMapping
(
"/reduceSocialAndFund"
)
public
R
<
List
<
ErrorMessage
>>
reduceSocialAndFund
(
@RequestBody
TDispatchReduceVo
excelVOList
,
@RequestParam
(
required
=
false
)
String
orderId
)
{
List
<
TDispatchReduceVo
>
list
=
new
ArrayList
<>();
list
.
add
(
excelVOList
);
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
tDispatchInfoService
.
batchReduceDispatch
(
list
,
errorMessageList
,
user
,
orderId
);
return
R
.
ok
(
errorMessageList
);
}
/**
* @Author fxj
* @Description 派单申请批量审核
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
26e8ebcb
...
...
@@ -326,7 +326,6 @@
a.UPDATE_TIME,
a.UPDATE_BY,
a.CREATE_NAME,
a.BPO_FLAG,
a.CREATE_TIME
</sql>
<sql
id=
"tPaymentInfo_where"
>
...
...
@@ -1520,6 +1519,7 @@
<!--tPaymentInfo公积金推送查询-->
<select
id=
"getTPaymentFundPushInfo"
resultMap=
"tPaymentInfoMap"
>
SELECT
a.BPO_FLAG,
<include
refid=
"Base_Column_List"
/>
FROM t_payment_info a
<where>
...
...
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