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
8884f294
Commit
8884f294
authored
Nov 27, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
32bceb3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
CostDao.java
.../src/main/java/com/blt/other/module/cost/dao/CostDao.java
+1
-5
AbstractCostService.java
...er/module/cost/service/impl/cost/AbstractCostService.java
+1
-0
No files found.
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dao/CostDao.java
View file @
8884f294
...
@@ -15,7 +15,6 @@ import java.util.List;
...
@@ -15,7 +15,6 @@ import java.util.List;
public
interface
CostDao
extends
BaseMapper
<
CostDomain
>
{
public
interface
CostDao
extends
BaseMapper
<
CostDomain
>
{
/**
/**
* 获取费用单列表
* 获取费用单列表
*/
*/
...
@@ -29,10 +28,8 @@ public interface CostDao extends BaseMapper<CostDomain> {
...
@@ -29,10 +28,8 @@ public interface CostDao extends BaseMapper<CostDomain> {
*/
*/
CostDomain
selectByCostNo
(
String
costNo
);
CostDomain
selectByCostNo
(
String
costNo
);
List
<
CostDomain
>
selectByKeys
(
CostDomain
costDomain
);
List
<
CostDomain
>
selectByKeys
(
CostDomain
costDomain
);
List
<
CostDomain
>
selectByCostPlanNo
(
String
costPlanNo
);
List
<
CostDomain
>
selectByCostPlanNo
(
String
costPlanNo
);
/**
/**
...
@@ -103,13 +100,12 @@ public interface CostDao extends BaseMapper<CostDomain> {
...
@@ -103,13 +100,12 @@ public interface CostDao extends BaseMapper<CostDomain> {
*/
*/
List
<
CostDomain
>
selectBalanceSheetCost
(
@Param
(
"startDate"
)
Date
startDate
,
@Param
(
"endDate"
)
Date
endDate
);
List
<
CostDomain
>
selectBalanceSheetCost
(
@Param
(
"startDate"
)
Date
startDate
,
@Param
(
"endDate"
)
Date
endDate
);
List
<
String
>
listCostNoAll
(
CostExportVo
costExportVo
);
List
<
String
>
listCostNoAll
(
CostExportVo
costExportVo
);
/**
/**
* 审核列表查询
* 审核列表查询
*
*
* @param page
page
* @param page page
* @return
* @return
*/
*/
IPage
<
CostDomain
>
checkCostList
(
@Param
(
"page"
)
IPage
<
CostDomain
>
page
,
IPage
<
CostDomain
>
checkCostList
(
@Param
(
"page"
)
IPage
<
CostDomain
>
page
,
...
...
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java
View file @
8884f294
...
@@ -101,6 +101,7 @@ public abstract class AbstractCostService implements CostService {
...
@@ -101,6 +101,7 @@ public abstract class AbstractCostService implements CostService {
projectTypeList
=
Lists
.
newArrayList
(
projectTypes
.
split
(
","
)).
stream
().
filter
(
str
->
!
StringUtils
.
isEmpty
(
str
)).
collect
(
Collectors
.
toList
());
projectTypeList
=
Lists
.
newArrayList
(
projectTypes
.
split
(
","
)).
stream
().
filter
(
str
->
!
StringUtils
.
isEmpty
(
str
)).
collect
(
Collectors
.
toList
());
}
}
List
<
CostDomain
>
costDomains
=
costDao
.
selectAll
(
userId
,
projectTypeList
);
List
<
CostDomain
>
costDomains
=
costDao
.
selectAll
(
userId
,
projectTypeList
);
this
.
setPrimaryDepartment
(
costDomains
);
CostPageResult
result
=
new
CostPageResult
();
CostPageResult
result
=
new
CostPageResult
();
result
.
setCosts
(
costDomains
.
stream
().
map
(
CostDomain:
:
castToDto
).
collect
(
Collectors
.
toList
()));
result
.
setCosts
(
costDomains
.
stream
().
map
(
CostDomain:
:
castToDto
).
collect
(
Collectors
.
toList
()));
...
...
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