Commit b02d7b5e by zhangkb

修改标签导出,增加系统和维度单独导出功能

parent c1722b1c
...@@ -46,10 +46,13 @@ public class TagFileCtrl { ...@@ -46,10 +46,13 @@ public class TagFileCtrl {
return tagExportService.exportTagMetadataExcel(idPath, dimensionType, tagType, response); return tagExportService.exportTagMetadataExcel(idPath, dimensionType, tagType, response);
} }
@ApiOperation(value = "(2020-2-12)导出标签excel文件(isSys:0 系统 1 维度)", notes = "(2020-2-12)导出标签excel文件(isSys:0 系统 1 维度)")
@GetMapping("/exportTag") @GetMapping("/exportTag")
public int export(HttpServletResponse response, @RequestParam(required = false , value = "deptIdPath") String deptIdPath) { public int export(HttpServletResponse response,
@RequestParam(required = false , value = "deptIdPath") String deptIdPath,
@RequestParam(required = false , value = "isSys") String isSys) {
deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg()); deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
return tagExportService.exportExcel(deptIdPath, response); return tagExportService.exportExcel(deptIdPath, isSys, response);
} }
@PostMapping("/importTag") @PostMapping("/importTag")
......
...@@ -153,9 +153,16 @@ public class TagFileService { ...@@ -153,9 +153,16 @@ public class TagFileService {
return toExportTagMeta.size(); return toExportTagMeta.size();
} }
public int exportExcel(String dept, HttpServletResponse response) { public int exportExcel(String dept, String isSys, HttpServletResponse response) {
List<Tag> toExportTags = mongoOperations.find(Query.query(Criteria.where("dept").is(dept) List<Tag> toExportTags = null;
.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE)), Tag.class); if(StringUtils.isBlank(isSys)) {
toExportTags = mongoOperations.find(Query.query(Criteria.where("dept").is(dept)
.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE)), Tag.class);
}else {
toExportTags = mongoOperations.find(Query.query(Criteria.where("dept").is(dept)
.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE).and("tagType").is(isSys)),
Tag.class);
}
// 导出操作 // 导出操作
ExcelUtils.exportExcel(toExportTags, null , "sheet1", Tag.class, "标签.xlsx", response); ExcelUtils.exportExcel(toExportTags, null , "sheet1", Tag.class, "标签.xlsx", response);
return toExportTags.size(); return toExportTags.size();
......
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