e邦人 期望时间bug调整

suishenbang-admin/src/main/resources/application-dev.yml

@@ -10,7 +10,6 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/home
-  logPath: D:/home/log/
   # 获取ip地址开关
   addressEnabled: true
   cloudPath: http://10.32.2.212:8000/
@@ -42,6 +41,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: D:/home/logs/
 
 
 

suishenbang-admin/src/main/resources/application-prod.yml

@@ -10,7 +10,6 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /data/project/file
-  logPath: /data/project/logs/
   # 获取ip地址开关
   addressEnabled: false
   cloudPath: http://127.0.0.1:8000
@@ -42,6 +41,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: /data/project/logs/
 
 # 用户配置
 user:

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

@@ -10,7 +10,6 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/suishenbang/file
-  logPath: /home/suishenbang/logs/
   # 获取ip地址开关
   addressEnabled: true
   cloudPath: http://10.32.2.212:8000/
@@ -42,6 +41,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: /home/suishenbang/logs/
 
 # 用户配置
 user:

suishenbang-admin/src/main/resources/application-uat.yml

@@ -10,7 +10,6 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/admin/project/file
-  logPath: /home/admin/project/logs/
   # 获取ip地址开关
   addressEnabled: false
   cloudPath: http://127.0.0.1:8000
@@ -42,6 +41,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: /home/admin/project/logs/
 
 # 用户配置
 user:

suishenbang-admin/src/main/resources/logback.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <springProperty scope="context" name="logPath" source="ruoyi.logPath" defaultValue="/home/admin/project"/>
     <!-- 日志存放路径 -->
-    <property name="log.path"  value="${logPath}"/>
+    <property name="log.path"  value="${LOG_PATH:-.}"/>
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

suishenbang-api/src/main/resources/application-dev.yml

@@ -8,7 +8,6 @@ ruoyi:
   copyrightYear: 2020
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/home
-  logPath: D:/home/logs/
   # 获取ip地址开关
   addressEnabled: true
   #是否开启swagger
@@ -45,6 +44,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: D:/home/logs/
 # Spring配置
 spring:
   jackson:

suishenbang-api/src/main/resources/application-prod.yml

@@ -8,7 +8,6 @@ ruoyi:
   copyrightYear: 2020
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /data/project/file
-  logPath: /data/project/logs/
   # 获取ip地址开关
   addressEnabled: false
   #是否开启swagger
@@ -44,6 +43,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: /data/project/logs/
 # Spring配置
 spring:
   jackson:

suishenbang-api/src/main/resources/application-test.yml

@@ -8,7 +8,6 @@ ruoyi:
   copyrightYear: 2020
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/suishenbang/file
-  logPath: /home/suishenbang/logs/
   # 获取ip地址开关
   addressEnabled: true
   #是否开启swagger
@@ -44,6 +43,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: /home/suishenbang/logs/
 # Spring配置
 spring:
   jackson:

suishenbang-api/src/main/resources/application-uat.yml

@@ -8,7 +8,6 @@ ruoyi:
   copyrightYear: 2020
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/admin/project/file
-  logPath: /home/admin/project/logs/
   # 获取ip地址开关
   addressEnabled: false
   #是否开启swagger
@@ -44,6 +43,7 @@ logging:
   level:
     com.dgtly: debug
     org.springframework: warn
+  path: /home/admin/project/logs/
 # Spring配置
 spring:
   jackson:

suishenbang-api/src/main/resources/logback.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <springProperty scope="context" name="logPath" source="ruoyi.logPath" defaultValue="/home/admin/project"/>
     <!-- 日志存放路径 -->
-    <property name="log.path"  value="${logPath}"/>
+    <property name="log.path"  value="${LOG_PATH:-.}"/>
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

suishenbang-order/src/main/resources/mapper/order/MetaHanaSalesOrderMapper.xml

@@ -63,9 +63,7 @@
     <select id="selectDistinctMetaHanaSalesOrder1" parameterType="MetaHanaSalesOrder" resultMap="MetaHanaSalesResult">
         select distinct mhso.DOC_NUMBER, mhso.CUSTOMER_CODE, mhso.CUSTOMER_NAME,
         mhso.CREATE_DATE, mhso.CREDIT_DATE, mhso.CREDIT_STATUS, mhso.REJECT_REASON
-        <if test="expectedTimeStr != null  and expectedTimeStr != ''">
             ,sob.expected_time as expectedTime
-        </if>
 
         from meta_hana_sales_order mhso
         LEFT JOIN sales_order_base sob
@@ -78,7 +76,6 @@
             <if test="customerName != null  and customerName != ''"> and mhso.CUSTOMER_NAME like concat('%', #{customerName}, '%')</if>
             <if test="docType != null  and docType != ''"> and mhso.DOC_TYPE = #{docType}</if>
             <if test="creditStatus != null  and creditStatus != ''"> and mhso.CREDIT_STATUS = #{creditStatus}</if>
-            <if test="expectedTimeStr != null  and expectedTimeStr != ''"> and sob.expected_time like concat('%', #{expectedTimeStr}, '%')</if>
             <if test="params.start_expectedTime != null and params.start_expectedTime != ''"><!-- 开始时间检索 -->
                 and date_format(expected_time,'%y%m%d') &gt;= date_format(#{params.start_expectedTime},'%y%m%d')
             </if>