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
99bbc8e1
Commit
99bbc8e1
authored
Jan 04, 2021
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
bd6bdbeb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
AbstractCostService.java
...er/module/cost/service/impl/cost/AbstractCostService.java
+8
-0
application-prod.yml
bailuntec-cost-core/src/main/resources/application-prod.yml
+2
-2
CostListSearchMapper.xml
...t-core/src/main/resources/mapper/CostListSearchMapper.xml
+1
-5
No files found.
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java
View file @
99bbc8e1
...
@@ -95,8 +95,16 @@ public abstract class AbstractCostService implements CostService {
...
@@ -95,8 +95,16 @@ public abstract class AbstractCostService implements CostService {
if
(!
StringUtils
.
isEmpty
(
projectTypes
))
{
if
(!
StringUtils
.
isEmpty
(
projectTypes
))
{
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
());
}
}
long
time
=
System
.
currentTimeMillis
();
System
.
out
.
println
(
System
.
currentTimeMillis
()
-
time
);
time
=
System
.
currentTimeMillis
();
List
<
CostDomain
>
costDomains
=
costDao
.
selectAll
(
userId
,
projectTypeList
);
List
<
CostDomain
>
costDomains
=
costDao
.
selectAll
(
userId
,
projectTypeList
);
System
.
out
.
println
(
System
.
currentTimeMillis
()
-
time
);
time
=
System
.
currentTimeMillis
();
this
.
setPrimaryDepartment
(
costDomains
);
this
.
setPrimaryDepartment
(
costDomains
);
System
.
out
.
println
(
System
.
currentTimeMillis
()
-
time
);
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
()));
...
...
bailuntec-cost-core/src/main/resources/application-prod.yml
View file @
99bbc8e1
...
@@ -2,8 +2,8 @@ spring:
...
@@ -2,8 +2,8 @@ spring:
# 数据源配置
# 数据源配置
datasource
:
datasource
:
driver-class-name
:
com.mysql.jdbc.Driver
driver-class-name
:
com.mysql.jdbc.Driver
#
url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
url
:
jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
url
:
jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
#
url: jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true
username
:
root
username
:
root
password
:
"
#7kfnymAM$Y9-Ntf"
password
:
"
#7kfnymAM$Y9-Ntf"
hikari
:
hikari
:
...
...
bailuntec-cost-core/src/main/resources/mapper/CostListSearchMapper.xml
View file @
99bbc8e1
...
@@ -23,11 +23,7 @@
...
@@ -23,11 +23,7 @@
or type_name LIKE CONCAT('%',#{key},'%')
or type_name LIKE CONCAT('%',#{key},'%')
</if>
</if>
</foreach>
</foreach>
<foreach
collection=
"keys"
item=
"key"
index=
"index"
>
<if
test=
"key != null and key != '' "
>
or kind_name LIKE CONCAT('%',#{key},'%')
</if>
</foreach>
<foreach
collection=
"keys"
item=
"key"
index=
"index"
>
<foreach
collection=
"keys"
item=
"key"
index=
"index"
>
<if
test=
"key != null and key != '' "
>
<if
test=
"key != null and key != '' "
>
or company_name LIKE CONCAT('%',#{key},'%')
or company_name LIKE CONCAT('%',#{key},'%')
...
...
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