Commit 0e8893d7 authored by 罗贤顺's avatar 罗贤顺

修复问题

parent 4d6958d8
...@@ -108,6 +108,10 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -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()) if (StringUtils.isNotBlank(query.getStepName())
|| StringUtils.isNotBlank(query.getBlastAreaName()) || StringUtils.isNotBlank(query.getBlastAreaName())
......
...@@ -19,8 +19,9 @@ spring: ...@@ -19,8 +19,9 @@ spring:
connection-test-query: SELECT 1 connection-test-query: SELECT 1
redis: redis:
port: 6379 port: 6379
host: localhost # host: localhost
# password: Wise_@123456 host: 192.168.110.85
# password: Wise_@123456
servlet: servlet:
multipart: multipart:
max-file-size: 100MB max-file-size: 100MB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment