Browse Source

no message

ly 1 năm trước cách đây
mục cha
commit
62c4176b95

+ 3 - 0
src/main/java/cn/ezhizao/project/business/collection/domain/BizCollection.java

@@ -200,6 +200,9 @@ public class BizCollection extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @TableField(exist = false)
+    private List<String> dateFilter;
+
     public String getRemark()
     {
         return remark;

+ 12 - 8
src/main/resources/application-dev.yml

@@ -1,17 +1,21 @@
 # 数据源配置
 spring:
+    cloud:
+        nacos:
+            discovery:
+                server-addr: 82.156.209.15:8848 # Nacos服务器地址
     application:
-        name: ezhizao-yzbh-financial-zx      # 配置微服务名(服务名不能用下划线)
+        name: ezhizao-yzbh-financial      # 配置微服务名(服务名不能用下划线)
     # redis 配置
     redis:
         # 地址
-        host: 120.46.159.163
+        host: 62.234.54.84
         # 端口,默认为6379
-        port: 6379
+        port: 16379
         # 数据库索引
         database: 8
         # 密码
-        password: ezhizao.cn123456
+        password: yuchang@2023
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -30,9 +34,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://120.46.159.163:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
-                username: root
-                password: ezhizao.cn123456
+                url: jdbc:mysql://82.156.209.15:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                username: admin
+                password: admin
 #                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: 123456
@@ -84,4 +88,4 @@ spring:
                         multi-statement-allow: true
 # 文件上传
 ruoyi:
-    profile: D:/Ezhizao/yzbh/
+    profile: /home/ruoyi/yzbh/

+ 8 - 0
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -89,6 +89,14 @@
                 DATE_FORMAT(a.arrive_date,'%Y-%m-%d') &lt;= #{endDate}
                 ) AND
             </if>
+            <if test="dateFilter != null">
+                (
+                DATE_FORMAT(a.verify_date,'%Y-%m-%d') &gt;= #{dateFilter[0]}
+                AND
+                DATE_FORMAT(a.verify_date,'%Y-%m-%d') &lt;= #{dateFilter[1]}
+                ) AND
+            </if>
+
             <if test="arriveTime != null  and arriveTime != '' ">
                 a.arrive_time = #{arriveTime} AND
             </if>