ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 标签管理

Browse Source
This commit is contained in:
lijiarao
2023-08-21 16:57:06 +08:00
parent dd5eeeb86e
commit cf05ffd068
6 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsAreaController.java
+2 -2
View File
@@ -83,8 +83,8 @@ public class LawsAreaController extends JeroController<LawsArea, ILawsAreaServic
@AutoLog(value = "区域管理表-查询展示区域")
@ApiOperation(value="区域管理表-查询展示区域", notes="区域管理表-查询展示区域")
@GetMapping(value = "/queryShowArea")
public Result<List<LawsArea>> queryShowArea(@RequestParam(name = "cut") String cut, LawsArea lawsArea){
List<LawsArea> list = lawsAreaService.queryShowArea(cut, lawsArea);
public Result<List<LawsArea>> queryShowArea(HttpServletRequest req, LawsArea lawsArea){
List<LawsArea> list = lawsAreaService.queryShowArea(req, lawsArea);
return Result.OK(list);
}
/**
jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java
+7 -3
View File
@@ -55,9 +55,13 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
@AutoLog(value = "标签管理-分页列表查询")
@ApiOperation(value="标签管理-分页列表查询", notes="标签管理-分页列表查询")
@RequiresPermissions("tag:page")
@PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<LawsTag> pageList= lawsTagService.queryPageList(params);
@GetMapping(value = "/page")
public Result<?> queryPageList(@RequestBody LawsTag lawsTag,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
IPage<LawsTag> pageList= lawsTagService.queryPageList(lawsTag, pageNo, pageSize, req);
return Result.OK(pageList);
}
jero-boot-modules/src/main/java/com/jero/modules/tag/service/ILawsAreaService.java
+1 -1
View File
@@ -68,7 +68,7 @@ public interface ILawsAreaService extends IService<LawsArea> {
*
* @return
*/
List<LawsArea> queryShowArea(String cut, LawsArea lawsArea);
List<LawsArea> queryShowArea(HttpServletRequest req, LawsArea lawsArea);
/**
* 展示区域查询
jero-boot-modules/src/main/java/com/jero/modules/tag/service/ILawsTagService.java
+2 -1
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.tag.entity.LawsArea;
import com.jero.modules.tag.entity.LawsTag;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -61,7 +62,7 @@ public interface ILawsTagService extends IService<LawsTag> {
*
* @return
*/
IPage<LawsTag> queryPageList(Map<String, Object> params);
IPage<LawsTag> queryPageList(LawsTag lawsTag, Integer pageNo, Integer pageSize, HttpServletRequest req);
/**
* 修改delFlag
jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java
+6 -17
View File
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -299,25 +301,12 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
/**
* 分页查询
*
* @param params
* @return
*/
@Override
public IPage<LawsTag> 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<LawsTag> result = lawsTagMapper.queryPageList(page, params);
List<LawsTag> records = result.getRecords();
String cut = (String) params.get("cut");
//中英切换-属性类型+展示区域列
if(LanguageEnum.EN.getValue().equals(cut)){
for(LawsTag data:records){
data.setFieldShowTypeName(data.getFieldShowTypeEnName());
data.setShowAreaName(data.getShowAreaEnName());
}
}
public IPage<LawsTag> queryPageList(LawsTag lawsTag, Integer pageNo, Integer pageSize, HttpServletRequest req) {
QueryWrapper<LawsTag> queryWrapper = QueryGenerator.initQueryWrapper(lawsTag, req.getParameterMap());
Page<LawsTag> page = new Page<>(pageNo, pageSize);
IPage<LawsTag> result = page(page, queryWrapper);
return result;
}
jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java
+5 -4
View File
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
@@ -37,7 +38,7 @@ public class LawsAreaServiceImpl extends ServiceImpl<LawsAreaMapper, LawsArea> i
@Autowired
private LawsAreaServiceImpl onlCgformAreaService;
@Autowired
@Resource
private LawsAreaMapper lawsAreaMapper;
/**
@@ -192,9 +193,9 @@ public class LawsAreaServiceImpl extends ServiceImpl<LawsAreaMapper, LawsArea> i
* @return
*/
@Override
public List<LawsArea> queryShowArea(String cut, LawsArea lawsArea) {
QueryWrapper<LawsArea> queryWrapper = new QueryWrapper<>();
if (LanguageEnum.CN.getValue().equals(cut)) {
public List<LawsArea> queryShowArea(HttpServletRequest req, LawsArea lawsArea) {
QueryWrapper<LawsArea> queryWrapper = QueryGenerator.initQueryWrapper(lawsArea,req.getParameterMap());
if (LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
queryWrapper.select("id", "show_area").orderByAsc("sort");
return list(queryWrapper);
} else {