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
c1fbe378
Commit
c1fbe378
authored
Dec 26, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.4' into MVP1.7.4
parents
a6d6490b
c47480cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
EkpBankCodeSet.java
...ava/com/yifu/cloud/plus/v1/ekp/entity/EkpBankCodeSet.java
+1
-1
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+2
-0
TSalaryAccountPhoneController.java
...yifu/salary/controller/TSalaryAccountPhoneController.java
+1
-1
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankCodeSet.java
View file @
c1fbe378
...
...
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank;
import
java.time.LocalDateTime
;
/**
* 银企付款查询卡号所属行号记录表
* 银企付款查询卡号所属行号记录表
——有可能重复
*
* @author hgw
* @date 2024-11-18 17:04:20
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
c1fbe378
...
...
@@ -90,6 +90,7 @@
<select
id=
"getEkpBankExcelVoByIdAndMain"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo"
>
<include
refid=
"Base_Excel_Sql"
/>
(a.fd_handle_status is null or a.fd_handle_status = '待发放') and a.fd_parent_id = #{fdParentId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
...
...
@@ -97,6 +98,7 @@
<select
id=
"getEkpBankExcelVoByIdAndDetail"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo"
>
<include
refid=
"Base_Excel_Sql"
/>
a.fd_handle_status = '待发放' and a.fd_id = #{fdId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountPhoneController.java
View file @
c1fbe378
...
...
@@ -65,7 +65,7 @@ public class TSalaryAccountPhoneController {
**/
@Operation
(
description
=
"获取工资报账信息"
)
@GetMapping
(
"/getSalaryAccount"
)
public
R
<
AccountForWxVo
>
getSalaryAccount
(
@RequestParam
String
idNumber
,
String
year
,
String
openId
)
{
public
R
<
AccountForWxVo
>
getSalaryAccount
(
@RequestParam
(
required
=
false
)
String
idNumber
,
String
year
,
String
openId
)
{
if
(
Common
.
isEmpty
(
idNumber
)
||
Common
.
isEmpty
(
openId
)){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
...
...
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