Browse Source

更新- 文物搜索添加日期功能

wuweihao 4 years ago
parent
commit
1952d7660f

+ 4 - 4
gis_application/src/main/resources/application-dev.properties

@@ -2,11 +2,11 @@
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.password=root
 spring.datasource.druid.username=root
-spring.datasource.druid.password=root
-#spring.datasource.druid.url=jdbc:mysql://192.168.0.44:3306/army_cms?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.password=4dkk2020test%
+spring.datasource.druid.url=jdbc:mysql://192.168.0.44:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.password=4dkk2020test%
 
 
 # \u521D\u59CB\u8FDE\u63A5\u6570

+ 1 - 1
gis_domain/src/main/java/com/gis/domain/dto/FodderPageDto.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
  * Created by owen on 2020/5/9 0009 12:20
  */
 @Data
-public class FodderPageDto extends PageDto{
+public class FodderPageDto extends PageDateDto{
 
 //    @NotBlank(message = "类型不能为空")
     @ApiModelProperty(value = "类型:1:图片, 2:视频, 3: 模型")

+ 10 - 0
gis_mapper/src/main/java/com/gis/mapper/provider/FodderProvider.java

@@ -21,6 +21,16 @@ public class FodderProvider {
             sql.append(" and ( name like '%").append(searchKey).append("%' )");
         }
 
+        if(StringUtils.isNotBlank(param.getStartTime()) ){
+
+            sql.append(" and create_time >= ").append("'").append(param.getStartTime()).append("'");
+
+        }
+
+        if (StringUtils.isNotBlank(param.getEndTime())) {
+            sql.append(" and create_time <= ").append("'").append(param.getEndTime()).append("'");
+        }
+
         Integer type = param.getType();
         if (type != null){
             sql.append(" and type = ").append(type);