Commit f409e3a8 authored by liqin's avatar liqin 💬

bug fixed

parent 3dbc684e
package cn.wisenergy.chnmuseum.party.mapper; package cn.wisenergy.chnmuseum.party.mapper;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
import cn.wisenergy.chnmuseum.party.model.LearningContentBoard; import cn.wisenergy.chnmuseum.party.model.LearningContentBoard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
...@@ -19,4 +22,12 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -19,4 +22,12 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
@Select("SELECT lcb.*, eb.`name` as exhibition_board_name FROM learning_content_board lcb, exhibition_board eb WHERE lcb.learning_content_id=eb.id and lcb.learning_content_id = #{learningContentId}") @Select("SELECT lcb.*, eb.`name` as exhibition_board_name FROM learning_content_board lcb, exhibition_board eb WHERE lcb.learning_content_id=eb.id and lcb.learning_content_id = #{learningContentId}")
List<LearningContentBoard> selectBoardListByLearningContentId(String learningContentId); List<LearningContentBoard> selectBoardListByLearningContentId(String learningContentId);
@Select("<script>" + "SELECT eb.* FROM learning_content_board lcb, exhibition_board eb "
+ "WHERE lcb.learning_content_id=eb.id "
+ "<if test='learningContentId!=null'> and lcb.learning_content_id = #{learningContentId} </if>"
+ "<if test='nameOrCode!=null'> and eb.name like CONCAT('%',#{nameOrCode},'%')</if>"
+ "</script>"
)
IPage<ExhibitionBoard> selectBoardPageByLearningContentId(Page<?> page, String learningContentId, String nameOrCode);
} }
package cn.wisenergy.chnmuseum.party.service; package cn.wisenergy.chnmuseum.party.service;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
import cn.wisenergy.chnmuseum.party.model.LearningContentBoard; import cn.wisenergy.chnmuseum.party.model.LearningContentBoard;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
...@@ -17,4 +20,5 @@ public interface LearningContentBoardService extends IService<LearningContentBoa ...@@ -17,4 +20,5 @@ public interface LearningContentBoardService extends IService<LearningContentBoa
List<LearningContentBoard> getBoardListByLearningContentId(String learningContentId); List<LearningContentBoard> getBoardListByLearningContentId(String learningContentId);
IPage<ExhibitionBoard> getBoardPageByLearningContentId(Page<ExhibitionBoard> page, String learningContentId, String nameOrCode);
} }
package cn.wisenergy.chnmuseum.party.service.impl; package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.mapper.LearningContentBoardMapper; import cn.wisenergy.chnmuseum.party.mapper.LearningContentBoardMapper;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
import cn.wisenergy.chnmuseum.party.model.LearningContentBoard; import cn.wisenergy.chnmuseum.party.model.LearningContentBoard;
import cn.wisenergy.chnmuseum.party.service.LearningContentBoardService; import cn.wisenergy.chnmuseum.party.service.LearningContentBoardService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -28,4 +31,9 @@ public class LearningContentBoardServiceImpl extends ServiceImpl<LearningContent ...@@ -28,4 +31,9 @@ public class LearningContentBoardServiceImpl extends ServiceImpl<LearningContent
return learningContentBoardMapper.selectBoardListByLearningContentId(learningContentId); return learningContentBoardMapper.selectBoardListByLearningContentId(learningContentId);
} }
@Override
public IPage<ExhibitionBoard> getBoardPageByLearningContentId(Page<ExhibitionBoard> page, String learningContentId, String nameOrCode) {
return learningContentBoardMapper.selectBoardPageByLearningContentId(page, learningContentId, nameOrCode);
}
} }
...@@ -17,6 +17,7 @@ import com.alibaba.fastjson.TypeReference; ...@@ -17,6 +17,7 @@ import com.alibaba.fastjson.TypeReference;
import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -599,13 +600,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -599,13 +600,7 @@ public class ChinaMobileRestApiController extends BaseController {
@RequiresPermissions("learning:content:board:page") @RequiresPermissions("learning:content:board:page")
@ApiOperation(value = "获取学习内容展板分页列表", notes = "获取学习内容展板分页列表") @ApiOperation(value = "获取学习内容展板分页列表", notes = "获取学习内容展板分页列表")
public Map<String, Object> getLearningContentBoardPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningContentId", required = false) String learningContentId) { public Map<String, Object> getLearningContentBoardPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningContentId", required = false) String learningContentId) {
LambdaQueryWrapper<LearningContentBoard> queryWrapper = new LambdaQueryWrapper<>(); IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, genericPageParam.getNameOrCode());
// 设置查询内容
queryWrapper.select(
LearningContentBoard::getId,
LearningContentBoard::getLearningContentId,
LearningContentBoard::getExhibitionBoardId);
Page<LearningContentBoard> page = this.learningContentBoardService.page(getPage(), queryWrapper);
return getResult(page); return getResult(page);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment