diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java index a6606f3..cc5155f 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java @@ -167,6 +167,19 @@ public class WxUserInstrumentController extends BaseController @Log(title = "批量导出", businessType = BusinessType.EXPORT) @PostMapping("/batchExport") public void batchExport(HttpServletResponse response, WxUserInstrument wxUserInstrument) { + // 用户相关信息 + WxUserMemberVm wxUserMemberVm = new WxUserMemberVm(); + wxUserMemberVm.setNickname(wxUserInstrument.getNickName()); + if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) { + wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(","))); + } + wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone()); + List wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); + if(wxUserMemberList != null && wxUserMemberList.size() > 0) { + String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(",")); + wxUserInstrument.setUserIds(collect); + } + List userInstrumentExportData = wxUserInstrumentService.findUserInstrumentExportData(wxUserInstrument); ExcelUtil util = new ExcelUtil(WxUserInstrumentExportVm.class); util.exportExcel(response, userInstrumentExportData, "用户仪器绑定数据", wxUserInstrument.getExportFields());