diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java index d9a77c7a..faa33a78 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java @@ -6,6 +6,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.regulation.entity.LawsBasicInfo; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.tag.entity.LawsArea; import com.jero.modules.tag.service.ILawsAreaService; @@ -50,10 +51,12 @@ public class LawsAreaController extends JeroController queryPageList(@RequestBody Map params) { - IPage pageList= lawsAreaService.queryPageList(params); + @GetMapping(value = "/page") + public Result queryPageList(LawsArea lawsArea, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + IPage pageList= lawsAreaService.queryPageList(lawsArea, pageNo, pageSize, req); return Result.OK(pageList); } diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java index a8f9b988..7b7ae4e6 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java @@ -6,7 +6,10 @@ 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.jero.common.constant.enums.LanguageEnum; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.MessageUtils; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.laws.regulation.entity.LawsBasicInfo; import com.jero.modules.tag.entity.LawsArea; import com.jero.modules.tag.mapper.LawsAreaMapper; import com.jero.modules.tag.service.ILawsAreaService; @@ -14,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; import java.util.Map; @@ -206,21 +210,21 @@ public class LawsAreaServiceImpl extends ServiceImpl i * * @return */ + @Override public List selectShowAreaById(String id) { QueryWrapper list = new QueryWrapper().select(id, "showArea"); return list(list); } @Override - public IPage queryPageList(Map params) { - Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); - Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); - IPage page = new Page(pageNo, pageSize); - IPage result = lawsAreaMapper.queryPageList(page, params); + public IPage queryPageList(LawsArea lawsArea, Integer pageNo, Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsArea, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + Page result = page(page, queryWrapper); List records = result.getRecords(); - String cut = (String) params.get("cut"); + LanguageEnum language = MessageUtils.getLanguage(); //中英切换-所属模块 - if(LanguageEnum.EN.getValue().equals(cut)){ + if(LanguageEnum.EN.equals(language)){ for(LawsArea data:records){ data.setIsModelName(data.getIsModelEnName()); }