update 区域管理表-分页列表查询

This commit is contained in:
lijiarao
2023-08-21 11:32:50 +08:00
parent 7e08f3df4b
commit f28a357e6d
2 changed files with 18 additions and 11 deletions
@@ -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<LawsArea, ILawsAreaServic
*/
@AutoLog(value = "区域管理表-分页列表查询")
@ApiOperation(value="区域管理表-分页列表查询", notes="区域管理表-分页列表查询")
@PostMapping(value = "/page")
//@RequiresPermissions("area:page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<LawsArea> 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<LawsArea> pageList= lawsAreaService.queryPageList(lawsArea, pageNo, pageSize, req);
return Result.OK(pageList);
}
@@ -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<LawsAreaMapper, LawsArea> i
*
* @return
*/
@Override
public List<LawsArea> selectShowAreaById(String id) {
QueryWrapper<LawsArea> list = new QueryWrapper<LawsArea>().select(id, "showArea");
return list(list);
}
@Override
public IPage<LawsArea> queryPageList(Map<String, Object> params) {
Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
IPage page = new Page(pageNo, pageSize);
IPage<LawsArea> result = lawsAreaMapper.queryPageList(page, params);
public IPage<LawsArea> queryPageList(LawsArea lawsArea, Integer pageNo, Integer pageSize, HttpServletRequest req) {
QueryWrapper<LawsArea> queryWrapper = QueryGenerator.initQueryWrapper(lawsArea, req.getParameterMap());
Page<LawsArea> page = new Page<>(pageNo, pageSize);
Page<LawsArea> result = page(page, queryWrapper);
List<LawsArea> 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());
}