Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zentao
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
zentao
zentao
Commits
2a2d9a6e
Commit
2a2d9a6e
authored
Mar 12, 2021
by
liming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 项目成本表
parent
14aa8584
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
ProjectChargeBusinessMapper.xml
.../resources/mapper/project/ProjectChargeBusinessMapper.xml
+0
-2
application-common-prod.yaml
constants/src/main/resources/application-common-prod.yaml
+3
-3
No files found.
admin-control/src/main/resources/mapper/project/ProjectChargeBusinessMapper.xml
View file @
2a2d9a6e
...
@@ -17,8 +17,6 @@
...
@@ -17,8 +17,6 @@
FROM zt_project t1
FROM zt_project t1
left join project_charge t3 on t3.project_id = t1.id
left join project_charge t3 on t3.project_id = t1.id
where deleted= '0'
where deleted= '0'
AND
status not like 'closed'
<if
test=
"param.status!=null and param.status!=''and param.status!='overDate'"
>
<if
test=
"param.status!=null and param.status!=''and param.status!='overDate'"
>
and t1.status like '${param.status}' and t1.end
>
= NOW()
and t1.status like '${param.status}' and t1.end
>
= NOW()
</if>
</if>
...
...
constants/src/main/resources/application-common-prod.yaml
View file @
2a2d9a6e
...
@@ -15,9 +15,9 @@ spring:
...
@@ -15,9 +15,9 @@ spring:
# 数据源配置
# 数据源配置
datasource
:
datasource
:
url
:
jdbc:mysql://
rm-m5el21b60amix441t.mysql.rds.aliyuncs.com:3306/jinhua${project.mysql-url-params}
url
:
jdbc:mysql://
39.96.84.51:3307/zentao${project.mysql-url-params}&zeroDateTimeBehavior=convertToNull
username
:
jinhua
username
:
root
password
:
ENC(LA3IJTsrIrBUZvlh8N5BGU8Wpgt6PwuW)
password
:
root
hikari
:
hikari
:
minimum-idle
:
10
minimum-idle
:
10
maximum-pool-size
:
100
maximum-pool-size
:
100
...
...
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