Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
data-acquisition
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
竹天卫
data-acquisition
Commits
0e8893d7
Commit
0e8893d7
authored
Jun 10, 2021
by
罗贤顺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复问题
parent
4d6958d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
TProcessesBlastdesignHoleServiceImpl.java
...ss/service/impl/TProcessesBlastdesignHoleServiceImpl.java
+4
-0
application-dev.yml
acquisition-business/target/classes/application-dev.yml
+3
-2
No files found.
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
View file @
0e8893d7
...
...
@@ -108,6 +108,10 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
}
}
//判断是否添加了穿孔日期,如果已添加那么久不能修改,未添加则可以修改
if
(
query
.
getDrillingDate
()
!=
null
)
{
return
R
.
failed
(
"炮孔设计中->穿孔日期已存在不能修改: DrillingDate:"
+
query
.
getDrillingDate
());
}
//判断是否需要修改关联的 设计爆区爆破量
if
(
StringUtils
.
isNotBlank
(
query
.
getStepName
())
||
StringUtils
.
isNotBlank
(
query
.
getBlastAreaName
())
...
...
acquisition-business/target/classes/application-dev.yml
View file @
0e8893d7
...
...
@@ -19,8 +19,9 @@ spring:
connection-test-query
:
SELECT 1
redis
:
port
:
6379
host
:
localhost
# password: Wise_@123456
# host: localhost
host
:
192.168.110.85
# password: Wise_@123456
servlet
:
multipart
:
max-file-size
:
100MB
...
...
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