Merge branch 'feat-1002448' into 'master'

技能查询

See merge request rays/pcloud-book!482

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/PcloudSkillBiz.java

@@ -10,7 +10,7 @@ public interface PcloudSkillBiz {
 
     PcloudSkill getPcloudSkill(Long id);
 
-    PageBeanNew<PcloudSkill> getPcloudSkillList(Integer skillType, Integer currentPage, Integer numPerPage);
+    PageBeanNew<PcloudSkill> getPcloudSkillList(Integer skillType, Integer currentPage, Integer numPerPage, String name);
 
     void deletePcloudSkill(Long id);
 

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudSkillBizImpl.java

@@ -122,7 +122,7 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz  {
 
     @ParamLog("获取技能列表")
     @Override
-    public PageBeanNew<PcloudSkill> getPcloudSkillList(Integer skillType, Integer currentPage, Integer numPerPage) {
+    public PageBeanNew<PcloudSkill> getPcloudSkillList(Integer skillType, Integer currentPage, Integer numPerPage, String name) {
         if (currentPage == null || currentPage < 0) {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "当前页不能为空且不能小于0！");
         }
@@ -131,6 +131,7 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz  {
         }
         Map<String ,Object> map=new HashMap<>();
         map.put("skillType",skillType);
+        map.put("name", name);
         PageBeanNew<PcloudSkill> page = pcloudSkillDao.listPageNew(new PageParam(currentPage, numPerPage), map, "getPcloudSkillList");
         if (ListUtils.isEmpty(page.getRecordList())){
             return page;

pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/PcloudSkillFacade.java

@@ -58,10 +58,11 @@ public class PcloudSkillFacade {
             @RequestHeader("token") @ApiParam("token信息") String token,
             @RequestParam(value = "skillType", required = false) @ApiParam("技能类型：1时间管理，2共读活动，3配套资料，4教辅书单，5配套老师，6音乐") Integer skillType,
             @RequestParam("currentPage") @ApiParam("当前页") Integer currentPage,
-            @RequestParam("numPerPage") @ApiParam("每页条数") Integer numPerPage
+            @RequestParam("numPerPage") @ApiParam("每页条数") Integer numPerPage,
+            @RequestParam(value = "name", required = false) @ApiParam("名称搜索")String name
     ) throws BizException, PermissionException {
         SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        return new ResponseDto<>(pcloudSkillBiz.getPcloudSkillList(skillType,currentPage,numPerPage));
+        return new ResponseDto<>(pcloudSkillBiz.getPcloudSkillList(skillType,currentPage,numPerPage,name));
     }
 
     @ApiOperation("获取技能列表-关联关键词选择")

pcloud-service-book/src/main/resources/mapper/skill/PcloudSkilll.xml

@@ -68,13 +68,33 @@
     </update>
 
     <select id="getPcloudSkillList" parameterType="map" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List"/>
-        from pcloud_skill
-        where 1=1
-        <if test="skillType!=null">
-            and skill_type = #{skillType}
+        SELECT
+        s.id,
+        s.skill_type,
+        s.rel_skill_id,
+        s.skill_fuse_reply,
+        s.seq_num,
+        s.create_time
+        FROM
+        pcloud_skill s
+        LEFT JOIN time_control_task t ON s.rel_skill_id = t.task_id
+        AND s.skill_type = 1
+        LEFT JOIN pcloud_group_activity a ON s.rel_skill_id = a.id
+        AND s.skill_type = 2
+        LEFT JOIN pcloud_resource r ON s.rel_skill_id = r.id
+        AND s.skill_type = 3
+        WHERE  1=1
+        <if test="skillType != null">
+            and s.skill_type=#{skillType}
+        </if>
+        <if test="name != null">
+            and (
+            t.task_name like concat('%', #{name}, '%') or
+            a.`name` like concat('%', #{name}, '%') or
+            r.`name` like concat('%', #{name}, '%')
+            )
         </if>
-        order by seq_num
+        order by s.seq_num
     </select>
 
     <update id="updateSeqNum" parameterType="map">