Merge remote-tracking branch 'origin/master'

portal-server/src/main/java/com/zq/portal/controller/admin/BzStatsAdminController.java

@@ -39,4 +39,10 @@ public class BzStatsAdminController {
     public ResultVo<Object> getCremationRateStats(@RequestBody StatsReqVo vo) {
     public ResultVo<Object> getCremationRateStats(@RequestBody StatsReqVo vo) {
         return ResultVo.success(bzStatsService.getCacheCremationRateStats(vo));
         return ResultVo.success(bzStatsService.getCacheCremationRateStats(vo));
     }
     }
+
+    @ApiOperation("殡葬搜索")
+    @PostMapping(value = "/cremationSearch")
+    public ResultVo cremationSearch(@RequestBody StatsReqVo vo) {
+        return ResultVo.success(bzStatsService.cremationSearch(vo.getKeyword()));
+    }
 }
 }

portal-server/src/main/java/com/zq/portal/dao/BzStatsDao.java

@@ -4,9 +4,11 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.zq.common.constant.DBName;
 import com.zq.common.constant.DBName;
 import com.zq.portal.vo.StatsReqVo;
 import com.zq.portal.vo.StatsReqVo;
 import com.zq.portal.vo.StatsVo;
 import com.zq.portal.vo.StatsVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @DS(DBName.GXBZ)
 @DS(DBName.GXBZ)
 @Repository
 @Repository
@@ -35,4 +37,12 @@ public interface BzStatsDao {
      * @return
      * @return
      */
      */
     List<StatsVo> getThreeYearDeadStats(StatsReqVo vo);
     List<StatsVo> getThreeYearDeadStats(StatsReqVo vo);
+
+    /**
+     * 搜索
+     *
+     * @param keyword
+     * @return
+     */
+    List<Map<String, Object>> search(@Param("keyword") String keyword);
 }
 }

portal-server/src/main/java/com/zq/portal/service/BzStatsService.java

@@ -151,5 +151,13 @@ public class BzStatsService {
         return returnData;
         return returnData;
     }
     }
 
 
-
+    /**
+     * 搜索
+     *
+     * @param keyword
+     * @return
+     */
+    public Object cremationSearch(String keyword) {
+        return bzStatsDao.search(keyword);
+    }
 }
 }

portal-server/src/main/resources/mapper/BzStatsMapper.xml

@@ -23,6 +23,14 @@
              (SELECT count(1) as c2 FROM fis_dead_info) rksum
              (SELECT count(1) as c2 FROM fis_dead_info) rksum
 
 
     </select>
     </select>
+    <select id="search" resultType="java.util.Map">
+        SELECT NAME '姓名' , CARD_TYPE '证件类型', ID_CARD '证件号码', POPULACE_NAME '户籍所在地',CREATE_ORGAN_NAME '殡仪馆' , CREMATION_TIME '火化时间' ,IF_RECEIVE '是否入馆',
+                DEATH_DATE '死亡时间'
+        FROM
+            fis_cremation_info_sum
+        WHERE NAME =#{keyword}
+           OR ID_CARD=#{keyword}
+    </select>
 
 
     <!--近三年死亡人口-->
     <!--近三年死亡人口-->
     <select id="getThreeYearDeadStats" resultType="com.zq.portal.vo.StatsVo">
     <select id="getThreeYearDeadStats" resultType="com.zq.portal.vo.StatsVo">