From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java
index 4758142..bb0d7df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.service_community.dao;
 
+import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -11,16 +12,28 @@
 import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
 import com.panzhihua.service_community.model.dos.ComActWorkGuideDO;
 
+import java.util.List;
+
 /**
  * @description: 办事指南
  **/
 @Mapper
 public interface ComActWorkGuideDAO extends BaseMapper<ComActWorkGuideDO> {
-    @Select("<script> " + "select id ,title,content,time_at,address,phone,create_at from com_act_work_guide "
+    @Select("<script> " + "select id ,title,content,classify,time_at,address,phone,create_at from com_act_work_guide "
         + " <where>"
+        + "<if test='pageActWorkGuideDTO.classify != null'>"
+        + "and classify = #{pageActWorkGuideDTO.classify} " + " </if> "
         + "<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != &quot;&quot;'>"
-        + "title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at asc"
+        + "and title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at desc"
         + "</script>")
     IPage<ComActWorkGuideVO> pageWorkGuide(Page page,
         @Param("pageActWorkGuideDTO") PageActWorkGuideDTO pageActWorkGuideDTO);
+
+    /**
+     * 根据办事指南分类id查询办事指南
+     * @param classifyId    办事指南分类id
+     * @param pageSize    默认展示条数
+     * @return  办事指南列表
+     */
+    List<ComActWorkGuideDetailAppletsVO> getWorkGuideListByClassifyId(@Param("classifyId") Long classifyId,@Param("pageSize") Long pageSize);
 }

--
Gitblit v1.7.1