王公峰：PC常用语查询

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java

@@ -25,7 +25,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity;
 import com.elink.esua.epdc.modules.phrases.excel.ActPhraseExcel;
 import com.elink.esua.epdc.modules.phrases.service.ActPhraseService;
 import com.elink.esua.epdc.phrases.ActPhraseDTO;
@@ -52,7 +51,8 @@ public class ActPhraseController {
 
     @GetMapping("page")
     public Result<PageData<ActPhraseDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<ActPhraseDTO> page = actPhraseService.page(params);
+        //PageData<ActPhraseDTO> page = actPhraseService.page(params);
+        PageData<ActPhraseDTO> page = actPhraseService.getPhrasePage(params);
         return new Result<PageData<ActPhraseDTO>>().ok(page);
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java

@@ -20,10 +20,12 @@ package com.elink.esua.epdc.modules.phrases.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity;
 import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity;
+import com.elink.esua.epdc.phrases.ActPhraseDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 常用语表
@@ -41,4 +43,11 @@ public interface ActPhraseDao extends BaseDao<ActPhraseEntity> {
     List<ActPhraseRedisEntity> selectListPhraseInOrder();
 
     void updateUsagenumAddOne(@Param("id")String id);
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<ActPhraseDTO> getPhrasePage(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java

@@ -44,6 +44,13 @@ public interface ActPhraseService extends BaseService<ActPhraseEntity> {
      */
     PageData<ActPhraseDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<ActPhraseDTO> getPhrasePage(Map<String, Object> params);
+
     /**
      * 默认查询
      *

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java

@@ -65,6 +65,18 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
         return getPageData(page, ActPhraseDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<ActPhraseDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<ActPhraseDTO> page = getPage(params);
+        List<ActPhraseDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<ActPhraseDTO> list(Map<String, Object> params) {
         List<ActPhraseEntity> entityList = baseDao.selectList(getWrapper(params));

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml

@@ -24,5 +24,33 @@
         update epdc_act_phrase set USAGE_NUM = USAGE_NUM + 1 where id = #{id}
     </update>
 
+    <select id="getPhrasePage" resultType="com.elink.esua.epdc.phrases.ActPhraseDTO">
+        select
+            ID,
+            PHRASE,
+            SORT,
+            SHOW_FLAG,
+            USAGE_NUM,
+            REVISION,
+            DEL_FLAG,
+            CREATED_BY,
+            CREATED_TIME,
+            UPDATED_BY,
+            UPDATED_TIME,
+            CODE
+        from epdc_act_phrase
+        where DEL_FLAG = '0'
+        <if test="id != null and id != ''">
+            and ID like '%' #{id} '%'
+        </if>
+        <if test="phrase != null and phrase != ''">
+            and PHRASE like '%' #{phrase} '%'
+        </if>
+        <if test="code != null and code != ''">
+            and CODE like '%' #{code} '%'
+        </if>
+        order by sort,USAGE_NUM desc
+    </select>
+
 
 </mapper>