后台

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -23,7 +23,9 @@
             fbs_workshop_dispatch_list
         WHERE
             del_flag = '0'
-            AND date_format( date, '%Y-%m-%d' ) = DATE_FORMAT( #{date}, '%Y-%m-%d' )
+            and DATE_FORMAT( #{date},'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(planned_start_time,'%Y-%m-%d')
+            and DATE_FORMAT( #{date},'%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(planned_end_time,'%Y-%m-%d')
+            <!--AND date_format( date, '%Y-%m-%d' ) = DATE_FORMAT( #{date}, '%Y-%m-%d' )-->
         GROUP BY
             product
     </select>

src/main/resources/application-prod.yml

@@ -88,26 +88,26 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
           master:
-            url: jdbc:mysql://127.0.0.1:3306/fbs_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false
+            url: jdbc:mysql://103.40.192.17:3306/fbs_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false
             username: root
-            password: abc123!@#
+            password: CuiDian1234
 #            type: com.alibaba.druid.pool.DruidDataSource
             driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           multi-datasource1:
-#            url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-#            username: root
-#            password: admin
-#            driver-class-name: com.mysql.jdbc.Driver
-#            url: jdbc:sqlserver://103.40.192.17:43110;DatabaseName=UFDATA_006_2019
-             url: jdbc:sqlserver://10.1.191.191;DatabaseName=UFDATA_900_2019
-#            url: jdbc:sqlserver://47.103.119.148;DatabaseName=UFDATA_900_2019
-             username: sa
- #           password: admin
-             password: Wakeup@123
-            #使用druid数据源
-#            type: com.alibaba.druid.pool.DruidDataSource
-            driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          #            url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
+          #            username: root
+          #            password: admin
+          #            driver-class-name: com.mysql.jdbc.Driver
+          #            url: jdbc:sqlserver://103.40.192.17:43110;DatabaseName=UFDATA_006_2019
+          #            url: jdbc:sqlserver://10.1.191.191;DatabaseName=UFDATA_900_2019
+                      url: jdbc:sqlserver://47.103.119.148;DatabaseName=UFDATA_100_2019
+                      username: sa
+          #            password: admin
+                      password: Wakeup@123
+                      #使用druid数据源
+          #            type: com.alibaba.druid.pool.DruidDataSource
+                      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
      database: 0
@@ -128,9 +128,9 @@ mybatis-plus:
 jeecg :
   path :
     #文件上传根目录 设置
-    upload: D://VsCodeWork/FBS_VIEW/upFiles/
-    upvedio: D://VsCodeWork/FBS_VIEW/upVedio
-    uppersonnel: D://VsCodeWork/FBS_VIEW/upPersonnel/
+    upload: D:/phoebus-web/board/upFiles/
+    upvedio: D:/phoebus-web/board/upVedio
+    uppersonnel: D:/phoebus-web/board/upPersonnel/
     #webapp文件路径
     webapp: D://webapp
 logging: