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

内部工作组导出bug

Browse Source
This commit is contained in:
caozhen
2023-09-19 15:53:42 +08:00
parent 39b63b4346
commit 38a423888b
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+16 -17
View File
@@ -208,13 +208,11 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@RequiresPermissions("sys:innerWorkingGroup:export") @RequiresPermissions("sys:innerWorkingGroup:export")
@AutoLog(value = "内部工作组人员关联表-导出") @AutoLog(value = "内部工作组人员关联表-导出")
@ApiOperation(value="内部工作组人员关联表-导出", notes="内部工作组人员关联表-导出") @ApiOperation(value="内部工作组人员关联表-导出", notes="内部工作组人员关联表-导出")
@RequestMapping(value = "/export", method = RequestMethod.GET) @GetMapping(value = "/export")
public Result<?> template(@RequestBody LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletResponse response) { public Result<?> template(@RequestParam(required = false) String workingGroupId, @RequestParam(required = false) String userName, @RequestParam(required = false) String userWorkNo, @RequestParam(required = false) String userRoleName, @RequestParam(required = false) String userPostName, HttpServletRequest request, HttpServletResponse response) {
String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId(); if (StringUtils.isBlank(workingGroupId)){
if (StringUtils.isBlank(workingGroupId)) { throw new JeroBootException(ResultCommon.PLEASE_SELECT_A_WORKGROUP_TO_EXPORT);
throw new JeroBootException(ResultCommon.PLEASE_SELECT_A_WORKGROUP_TO_EXPORT); }
}
String outFileName = "内部工作组人员表" + System.currentTimeMillis() + ".xlsx"; String outFileName = "内部工作组人员表" + System.currentTimeMillis() + ".xlsx";
String ENCODING = "UTF-8"; String ENCODING = "UTF-8";
ExcelWriter writer = ExcelUtil.getWriter(true); ExcelWriter writer = ExcelUtil.getWriter(true);
@@ -224,20 +222,21 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
//获取数据,分为三种情况：1、选中ID；2、没选ID且选了姓名、工号、角色、岗位四个筛选框；3、没选ID且没选四个筛选框 //获取数据,分为三种情况：1、选中ID；2、没选ID且选了姓名、工号、角色、岗位四个筛选框；3、没选ID且没选四个筛选框
List<LawsWorkingGroupUser> dos = null; List<LawsWorkingGroupUser> dos = null;
String userName = lawsWorkingGroupUser.getUserName(); //获取选中数据
String userWorkNo = lawsWorkingGroupUser.getUserWorkNo(); String selections = request.getParameter("selections");
String userRoleName = lawsWorkingGroupUser.getUserRoleName();
String userPostName = lawsWorkingGroupUser.getUserPostName(); if (StringUtils.isNotBlank(selections)){
if (StringUtils.isNotBlank(lawsWorkingGroupUser.getUserId())){ dos = this.queryDataByUserId(selections);
dos = this.queryDataByUserId(lawsWorkingGroupUser.getUserId());
} }
if (StringUtils.isBlank(lawsWorkingGroupUser.getUserId()) && !StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){ if (StringUtils.isBlank(selections) && !StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
dos = this.queryDataByConditions(userName, userWorkNo, userRoleName, userPostName, lawsWorkingGroupUser.getWorkingGroupId()); dos = this.queryDataByConditions(userName, userWorkNo, userRoleName, userPostName, workingGroupId);
} }
if (StringUtils.isBlank(lawsWorkingGroupUser.getUserId()) && StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){ if (StringUtils.isBlank(selections) && StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
dos = this.queryDataByTree(lawsWorkingGroupUser.getWorkingGroupId()); dos = this.queryDataByTree(workingGroupId);
} }
lawsWorkingGroupUserService.userAssignment(dos);
Collections.reverse(dos);
//导出表头只保留别名中的字段 //导出表头只保留别名中的字段
writer.setOnlyAlias(true); writer.setOnlyAlias(true);
//表格高度 //表格高度