|
|
|
|
@ -56,6 +56,8 @@ public class WxUserInstrumentController extends BaseController
|
|
|
|
|
public TableDataInfo list(WxUserInstrument wxUserInstrument)
|
|
|
|
|
{
|
|
|
|
|
// 用户相关信息
|
|
|
|
|
if(!(wxUserInstrument.getNickName() == null && wxUserInstrument.getUserIdArray() == null
|
|
|
|
|
&& wxUserInstrument.getUserPhone() == null)) {
|
|
|
|
|
WxUserMemberVm wxUserMemberVm = new WxUserMemberVm();
|
|
|
|
|
wxUserMemberVm.setNickname(wxUserInstrument.getNickName());
|
|
|
|
|
if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) {
|
|
|
|
|
@ -66,6 +68,9 @@ public class WxUserInstrumentController extends BaseController
|
|
|
|
|
if(wxUserMemberList != null && wxUserMemberList.size() > 0) {
|
|
|
|
|
String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(","));
|
|
|
|
|
wxUserInstrument.setUserIds(collect);
|
|
|
|
|
} else {
|
|
|
|
|
wxUserInstrument.setUserIds("0L");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
startPage();
|
|
|
|
|
@ -167,7 +172,8 @@ public class WxUserInstrumentController extends BaseController
|
|
|
|
|
@Log(title = "批量导出", businessType = BusinessType.EXPORT)
|
|
|
|
|
@PostMapping("/batchExport")
|
|
|
|
|
public void batchExport(HttpServletResponse response, WxUserInstrument wxUserInstrument) {
|
|
|
|
|
// 用户相关信息
|
|
|
|
|
if(!(wxUserInstrument.getNickName() == null && wxUserInstrument.getUserIdArray() == null
|
|
|
|
|
&& wxUserInstrument.getUserPhone() == null)) {
|
|
|
|
|
WxUserMemberVm wxUserMemberVm = new WxUserMemberVm();
|
|
|
|
|
wxUserMemberVm.setNickname(wxUserInstrument.getNickName());
|
|
|
|
|
if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) {
|
|
|
|
|
@ -178,6 +184,9 @@ public class WxUserInstrumentController extends BaseController
|
|
|
|
|
if(wxUserMemberList != null && wxUserMemberList.size() > 0) {
|
|
|
|
|
String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(","));
|
|
|
|
|
wxUserInstrument.setUserIds(collect);
|
|
|
|
|
} else {
|
|
|
|
|
wxUserInstrument.setUserIds("0L");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<WxUserInstrumentExportVm> userInstrumentExportData = wxUserInstrumentService.findUserInstrumentExportData(wxUserInstrument);
|
|
|
|
|
|