修改导出功能

Yijia-SaaS/yijia-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: develop
                 password: 1234.Abcd
             # 从库数据源

Yijia-SaaS/yijia-admin/src/main/resources/application.yml

@@ -9,10 +9,13 @@ yijia:
   # 实例演示开关
   demoEnabled: true
   # 文件路径
-  profile: E:/img
+  #profile: /home/testDemo/img
+  profile: /home/demoJar/img
+  #profile: /home/testJar/img
+  #profile: E:/img
   # 获取ip地址开关
   addressEnabled: false
-  # 验证码开关
+  # 验证码开关vue-treeselect
   captchaEnabled: false
   # 验证码类型 math 数组计算 char 字符
   captchaType: char

Yijia-SaaS/yijia-admin/src/main/resources/logback.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/testJar/logs" />
+    <property name="log.path" value="/home/demoJar/logs" />
+<!--    <property name="log.path" value="/home/testJar/logs" />-->
+<!--    <property name="log.path" value="/home/testDemo/logs" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

Yijia-SaaS/yijia-admin/target/classes/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: Admin@123#
+                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: develop
+                password: 1234.Abcd
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

Yijia-SaaS/yijia-admin/target/classes/application.yml

@@ -9,10 +9,13 @@ yijia:
   # 实例演示开关
   demoEnabled: true
   # 文件路径
-  profile: D:/img
+  #profile: /home/testDemo/img
+  profile: /home/demoJar/img
+  #profile: /home/testJar/img
+  #profile: E:/img
   # 获取ip地址开关
   addressEnabled: false
-  # 验证码开关
+  # 验证码开关vue-treeselect
   captchaEnabled: false
   # 验证码类型 math 数组计算 char 字符
   captchaType: char

Yijia-SaaS/yijia-admin/target/classes/logback.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/Users/suxinghua/Documents/yijia/logs" />
+    <property name="log.path" value="/home/demoJar/logs" />
+<!--    <property name="log.path" value="/home/testJar/logs" />-->
+<!--    <property name="log.path" value="/home/testDemo/logs" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -167,6 +167,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
         </where>
         order by order_id desc
     </select>