fix: mourn要返回烈士真名

gis_cms/src/main/java/com/gis/cms/entity/po/MournEntity.java

@@ -3,6 +3,7 @@ package com.gis.cms.entity.po;
 import com.gis.common.base.entity.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -36,5 +37,9 @@ public class MournEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "浏览量")
     private Integer visit;
 
+    @Transient
+    @ApiModelProperty(value = "烈士真实姓名")
+    private String martyRealName;
+
 
 }

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

@@ -1,13 +1,20 @@
 package com.gis.cms.mapper;
 
 
+import com.gis.cms.mapper.provider.MournProvider;
+import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.MournEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @Mapper
 public interface MournMapper extends IBaseMapper<MournEntity, Long> {
 
+    @SelectProvider(type = MournProvider.class, method = "search")
+    List<MournEntity> search(PageDateDto param, Integer display);
 }

gis_cms/src/main/java/com/gis/cms/mapper/provider/MournProvider.java

@@ -0,0 +1,52 @@
+package com.gis.cms.mapper.provider;
+
+import com.gis.common.base.entity.dto.PageDateDto;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+
+/**
+ * Created by owen on 2020/6/13 0013 10:56
+ */
+@Log4j2
+public class MournProvider {
+
+
+    public String search(PageDateDto param, Integer display) {
+        StringBuffer sql = new StringBuffer(
+                "select a.*, b.real_name as martyRealName from tb_mourn a left join tb_martyr b on b.id=a.martyr_id where a.is_delete = '0' ");
+
+        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
+
+            sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
+            sql.append(" and a.create_time <= ").append("'").append(param.getEndTime()).append("'");
+        }
+
+        String searchKey = param.getSearchKey();
+        if (!StringUtils.isAllBlank(searchKey)) {
+            searchKey = StringUtils.trim(searchKey);
+            sql.append(" and (");
+            sql.append( "a.real_name like '%").append(searchKey).append("%'");
+            sql.append( " or a.unit like '%").append(searchKey).append("%'");
+            sql.append(")");
+        }
+
+        if (display != null) {
+            sql.append(" and  a.display = ").append(display);
+        }
+
+
+
+
+
+
+        sql.append(" order by a.create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+
+
+}
+
+
+

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Condition;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -35,28 +36,36 @@ public class MournServiceImpl extends IBaseServiceImpl<MournEntity, Long> implem
         return this.entityMapper;
     }
 
+//    @Override
+//    public Result<MournEntity> search(PageDateDto param, Integer display) {
+//        startPage(param);
+//        Condition condition = new Condition(MournEntity.class);
+//        String searchKey = param.getSearchKey();
+//        if (StringUtils.isNotBlank(searchKey)) {
+//            searchKey = StringUtils.trim(searchKey);
+//            condition.and().orLike("realName", "%" + searchKey + "%")
+//                    .orLike("unit", "%" + searchKey + "%");
+//        }
+//        String startTime = param.getStartTime();
+//        String endTime = param.getEndTime();
+//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+//            condition.and().andBetween("createTime", startTime, endTime);
+//        }
+//
+//        if (display != null) {
+//            condition.and().andEqualTo("display", display);
+//        }
+//
+//        condition.orderBy("createTime").desc();
+//        PageInfo<MournEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
+//        return Result.success(pageInfo);
+//    }
+
     @Override
     public Result<MournEntity> search(PageDateDto param, Integer display) {
         startPage(param);
-        Condition condition = new Condition(MournEntity.class);
-        String searchKey = param.getSearchKey();
-        if (StringUtils.isNotBlank(searchKey)) {
-            searchKey = StringUtils.trim(searchKey);
-            condition.and().orLike("realName", "%" + searchKey + "%")
-                    .orLike("unit", "%" + searchKey + "%");
-        }
-        String startTime = param.getStartTime();
-        String endTime = param.getEndTime();
-        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
-            condition.and().andBetween("createTime", startTime, endTime);
-        }
-
-        if (display != null) {
-            condition.and().andEqualTo("display", display);
-        }
-
-        condition.orderBy("createTime").desc();
-        PageInfo<MournEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
+        List<MournEntity> list = entityMapper.search(param, display);
+        PageInfo<MournEntity> pageInfo = new PageInfo<>(list);
         return Result.success(pageInfo);
     }