Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
Overview
Overview
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
bltdc
dc-cost-system
Commits
c0c11e02
Commit
c0c11e02
authored
Apr 28, 2020
by
yinyong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
借支单冲销日志-冲销金额+归还金额
parent
647aab1c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
CostCheckLendController.java
.../other/other_cost/controller/CostCheckLendController.java
+2
-2
CostListController.java
...m/blt/other/other_cost/controller/CostListController.java
+1
-4
No files found.
cost-core/src/main/java/com/blt/other/other_cost/controller/CostCheckLendController.java
View file @
c0c11e02
...
...
@@ -181,12 +181,12 @@ public class CostCheckLendController {
}
costLogService
.
save
(
costNo
,
Integer
.
valueOf
(
updateuserid
),
"财务审核费用单通过"
);
costLogService
.
save
(
supCost
.
getCostNo
(),
Integer
.
valueOf
(
updateuserid
),
"借还单【"
+
costNo
+
"】冲销借支单【"
+
supCost
.
getCostNo
()
+
"】成功,
金额为"
+
costDomainByNo
.
getCounteract
()
+
costDomainByNo
.
getDic
());
"】成功,
冲销金额为"
+
costDomainByNo
.
getCounteract
()
+
costDomainByNo
.
getDic
()
+
",归还金额为"
+
costDomainByNo
.
getLendBalance
()
+
costDomainByNo
.
getDic
());
return
map
;
}
costLogService
.
save
(
costNo
,
Integer
.
valueOf
(
updateuserid
),
"财务审核费用单通过"
);
costLogService
.
save
(
supCost
.
getCostNo
(),
Integer
.
valueOf
(
updateuserid
),
"借还单【"
+
costNo
+
"】冲销借支单【"
+
supCost
.
getCostNo
()
+
"】成功,
金额为"
+
costDomainByNo
.
getCounteract
()
+
costDomainByNo
.
getDic
());
"】成功,
冲销金额为"
+
costDomainByNo
.
getCounteract
()
+
costDomainByNo
.
getDic
()
+
",归还金额为"
+
costDomainByNo
.
getLendBalance
()
+
costDomainByNo
.
getDic
());
return
map
;
}
...
...
cost-core/src/main/java/com/blt/other/other_cost/controller/CostListController.java
View file @
c0c11e02
...
...
@@ -309,10 +309,7 @@ public class CostListController {
if
(
null
!=
cost
)
{
filePath
=
cost
.
getCashierFilePath
();
if
(
null
!=
filePath
){
String
[]
split
=
filePath
.
split
(
"."
);
if
(
null
!=
split
&&
split
.
length
>=
1
){
fileName
=
split
[
split
.
length
-
1
];
}
fileName
=
filePath
.
substring
(
filePath
.
lastIndexOf
(
"/"
)+
1
);
}
}
else
{
return
null
;
...
...
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