1

ruoyi-admin/src/main/resources/application-test.yml

@@ -0,0 +1,57 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.101.10:3306/zhaoshang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: Boman123
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url:
+                username:
+                password:
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username:
+                login-password:
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

ruoyi-ui/src/settings.js

@@ -1,6 +1,5 @@
 module.exports = {
   title: '招商引资管理系统',
-  // urls: 'http://192.168.101.11:8010',
   urls: 'http://47.99.82.249:80',
 
   /**

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -1362,22 +1362,27 @@ export default {
                 this.msgSuccess("请上传施工许可证");
                 return  false
               }
+              if(this.queryParamstwr.isConstruction == "Y"){
+                console.log(this.queryParamstwr.isConstruction)
+                if(this.queryParamstwr.constructionEnddate == null){
+                  this.msgSuccess("请选择预计完工日期");
+                  return  false
+                }
+                if(this.queryParamstwr.constructionStartdate == null){
+                  this.msgSuccess("请选择开工日期");
+                  return  false
+                }
+              }
               if(this.queryParamstwr.constructionDoc == null){
                 this.msgSuccess("请上传施工施工合同");
                 return  false
               }
+
               if(this.queryParamstwr.constructionPhoto == null){
                 this.msgSuccess("请上传开工合同");
                 return  false
               }
-              if(this.queryParamstwr.constructionEnddate == null){
-                this.msgSuccess("请选择预计完工日期");
-                return  false
-              }
-              if(this.queryParamstwr.constructionStartdate == null){
-                this.msgSuccess("请选择开工日期");
-                return  false
-              }
+
               //修改
               updateConfigatruction(this.queryParamstwr).then((response) => {
                 this.msgSuccess("修改成功");
@@ -1386,6 +1391,16 @@ export default {
                 this.$router.go(-1);
               });
             } else if (this.modify == 0) {
+              if(this.queryParamstwr.isConstruction == "Y"){
+                if(this.queryParamstwr.constructionEnddate == undefined){
+                  this.msgSuccess("请选择预计完工日期");
+                  return  false
+                }
+                if(this.queryParamstwr.constructionStartdate == undefined){
+                  this.msgSuccess("请选择开工日期");
+                  return  false
+                }
+              }
               if(this.queryParamstwr.constructionCode == undefined){
                 this.msgSuccess("请上传施工许可证");
                 return  false
@@ -1398,14 +1413,8 @@ export default {
                 this.msgSuccess("请上传开工合同");
                 return  false
               }
-              if(this.queryParamstwr.constructionEnddate == undefined){
-                this.msgSuccess("请选择预计完工日期");
-                return  false
-              }
-              if(this.queryParamstwr.constructionStartdate == undefined){
-                this.msgSuccess("请选择开工日期");
-                return  false
-              }
+              
+
               //新增
               this.queryParamstwr.bmProjectId = this.bmProjectId;
               addConfigtherction(this.queryParamstwr).then((response) => {