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
2569d434
You need to sign in or sign up before continuing.
Commit
2569d434
authored
Apr 03, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.3-代发户
parent
4ca56db7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
TSalaryStandardIssueRes.java
...d/plus/v1/yifu/salary/entity/TSalaryStandardIssueRes.java
+2
-3
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+5
-1
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandardIssueRes.java
View file @
2569d434
...
@@ -67,10 +67,9 @@ public class TSalaryStandardIssueRes implements Serializable {
...
@@ -67,10 +67,9 @@ public class TSalaryStandardIssueRes implements Serializable {
@Schema
(
description
=
"薪资主表id"
)
@Schema
(
description
=
"薪资主表id"
)
private
String
salaryId
;
private
String
salaryId
;
/**
/**
* money
* money
2023-4-4 11:11:56 hgw 去掉了金额限制,mvp1.5.3版本
*/
*/
@ExcelAttribute
(
name
=
"money"
,
isNotEmpty
=
true
,
errorInfo
=
"money不能为空"
)
@ExcelAttribute
(
name
=
"money"
)
@NotBlank
(
message
=
"money不能为空"
)
@ExcelProperty
(
"money"
)
@ExcelProperty
(
"money"
)
@Schema
(
description
=
"money"
)
@Schema
(
description
=
"money"
)
private
BigDecimal
money
;
private
BigDecimal
money
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
2569d434
...
@@ -541,7 +541,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -541,7 +541,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
fd3b71f20933e0d2
.
add
(
""
);
fd3b71f20933e0d2
.
add
(
""
);
}
}
fd3b745c35ff27a8
.
add
(
res
.
getBankName
());
fd3b745c35ff27a8
.
add
(
res
.
getBankName
());
fd3b73a736cc9cc8
.
add
(
String
.
valueOf
(
res
.
getMoney
()));
if
(
Common
.
isNotNull
(
res
.
getMoney
()))
{
fd3b73a736cc9cc8
.
add
(
String
.
valueOf
(
res
.
getMoney
()));
}
else
{
fd3b73a736cc9cc8
.
add
(
""
);
}
}
}
sendMap
.
put
(
"fd_3b71f1f4fd40ac.fd_3b71f207c0cfd0"
,
fd3b71f207c0cfd0
);
sendMap
.
put
(
"fd_3b71f1f4fd40ac.fd_3b71f207c0cfd0"
,
fd3b71f207c0cfd0
);
sendMap
.
put
(
"fd_3b71f1f4fd40ac.fd_3b71f20883301a"
,
fd3b71f20883301a
);
sendMap
.
put
(
"fd_3b71f1f4fd40ac.fd_3b71f20883301a"
,
fd3b71f20883301a
);
...
...
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