修改查询汇总模版的page方法增加模版类别条件 新增方法获取所有的模版类别
This commit is contained in:
parent
a3710a37b5
commit
40021d637f
@ -80,6 +80,12 @@ public class InspectTemplateController {
|
||||
PageResult<InspectTemplateDO> pageResult = templateService.getTemplatePage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, InspectTemplateRespVO.class));
|
||||
}
|
||||
@GetMapping("/getAllCategories")
|
||||
@Operation(summary = "获得汇总模板所有的模版类别")
|
||||
public CommonResult<List<String>> getAllCategories() {
|
||||
List<String> category = templateService.getAllCategories();
|
||||
return success(category);
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出汇总模板 Excel")
|
||||
|
@ -26,6 +26,7 @@ public interface InspectTemplateMapper extends BaseMapperX<InspectTemplateDO> {
|
||||
.eqIfPresent(InspectTemplateDO::getStatus, reqVO.getStatus())
|
||||
.eqIfPresent(InspectTemplateDO::getContent, reqVO.getContent())
|
||||
.eqIfPresent(InspectTemplateDO::getOrderNum, reqVO.getOrderNum())
|
||||
.eqIfPresent(InspectTemplateDO::getCategory, reqVO.getCategory())
|
||||
.likeIfPresent(InspectTemplateDO::getContentName, reqVO.getContentName())
|
||||
.orderByDesc(InspectTemplateDO::getId));
|
||||
}
|
||||
|
@ -48,6 +48,10 @@ public interface InspectTemplateService {
|
||||
* 根据模版类型查询所属模版类别
|
||||
* */
|
||||
List<String> getcategory(String type);
|
||||
/*
|
||||
* 返回所有的模版类别字段
|
||||
* */
|
||||
List<String> getAllCategories();
|
||||
|
||||
/**
|
||||
* 获得汇总模板分页
|
||||
|
@ -75,6 +75,18 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
|
||||
}
|
||||
return list1;
|
||||
}
|
||||
@Override
|
||||
public List<String> getAllCategories() {
|
||||
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.select("DISTINCT category");
|
||||
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
|
||||
List<String> categories = new ArrayList<>();
|
||||
for (InspectTemplateDO inspectTemplateDO : doList) {
|
||||
categories.add(inspectTemplateDO.getCategory());
|
||||
}
|
||||
return categories;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public PageResult<InspectTemplateDO> getTemplatePage(InspectTemplatePageReqVO pageReqVO) {
|
||||
|
Loading…
Reference in New Issue
Block a user