导出excel 加入搜索功能

gis_cms/src/main/java/com/gis/cms/mapper/DonateMapper.java

@@ -1,7 +1,6 @@
 package com.gis.cms.mapper;
 
 
-import com.gis.cms.entity.vo.BarrageVoExcel;
 import com.gis.cms.entity.vo.DonateVoExcel;
 import com.gis.cms.mapper.provider.BaseProvider;
 import com.gis.common.base.mapper.IBaseMapper;

gis_cms/src/main/java/com/gis/cms/service/impl/BarrageServiceImpl.java

@@ -118,6 +118,13 @@ public class BarrageServiceImpl extends IBaseServiceImpl<BarrageEntity, Long> im
         sql.append("select * from tb_barrage where is_delete=0 ");
         sql.append(" and create_time >= ").append("'").append(startTime).append("'");
         sql.append(" and create_time <= ").append("'").append(endTime).append("'");
+
+        String searchKey = param.getSearchKey();
+        if (StringUtils.isNotBlank(searchKey)) {
+            searchKey = StringUtils.trim(searchKey);
+            sql.append("  and content like '%").append(searchKey).append("%'");
+        }
+
         sql.append(" order by create_time desc");
         String sqlStr = sql.toString();
         log.info("sql: {}", sqlStr);

gis_cms/src/main/java/com/gis/cms/service/impl/CommentServiceImpl.java

@@ -142,6 +142,13 @@ public class CommentServiceImpl extends IBaseServiceImpl<CommentEntity, Long> im
         sql.append("select * from tb_comment where is_delete=0 ");
         sql.append(" and create_time >= ").append("'").append(startTime).append("'");
         sql.append(" and create_time <= ").append("'").append(endTime).append("'");
+
+        String searchKey = param.getSearchKey();
+        if (StringUtils.isNotBlank(searchKey)) {
+            searchKey = StringUtils.trim(searchKey);
+            sql.append("  and content like '%").append(searchKey).append("%'");
+        }
+
         sql.append(" order by create_time desc");
         String sqlStr = sql.toString();
         log.info("sql: {}", sqlStr);

gis_cms/src/main/java/com/gis/cms/service/impl/DonateServiceImpl.java

@@ -81,10 +81,21 @@ public class DonateServiceImpl extends IBaseServiceImpl<DonateEntity, Long> impl
             throw new BaseRuntimeException("日期不能为空");
         }
 
+
+
+
+
         StringBuffer sql = new StringBuffer();
         sql.append("select * from tb_donate where is_delete=0 ");
         sql.append(" and create_time >= ").append("'").append(startTime).append("'");
         sql.append(" and create_time <= ").append("'").append(endTime).append("'");
+
+        String searchKey = param.getSearchKey();
+        if (StringUtils.isNotBlank(searchKey)) {
+            searchKey = StringUtils.trim(searchKey);
+            sql.append("  and name like '%").append(searchKey).append("%'");
+        }
+
         sql.append(" order by create_time desc");
         String sqlStr = sql.toString();
         log.info("sql: {}", sqlStr);

gis_common/src/main/java/com/gis/common/base/entity/dto/DateDto.java

@@ -19,4 +19,7 @@ public class DateDto {
 
     @ApiModelProperty(value = "结束时间, yyyy-mm-dd 23:59:59", name = "endTime")
     private String endTime;
+
+    @ApiModelProperty(value = "搜索条件", name = "searchKey")
+    private String searchKey;
 }