314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

会员导出功能增加仪器名称

Browse Source
master
382696293@qq.com 2 years ago
parent ce3b61f7e8
commit 152edd7673
5 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File

8
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java
Unescape Escape View File

@ -74,8 +74,8 @@ public class WxUserMemberExport {
@Excel(name = "仪器数量")
private Integer devicesNum;
// @Excel(name = "仪器名称")
private List<String> devicesName;
@Excel(name = "仪器名称")
private String devicesName;
/**
* 创建时间
@ -220,11 +220,11 @@ public class WxUserMemberExport {
this.miniProgramTags = miniProgramTags;
}
public List<String> getDevicesName() {
public String getDevicesName() {
return devicesName;
}
public void setDevicesName(List<String> devicesName) {
public void setDevicesName(String devicesName) {
this.devicesName = devicesName;
}
}

23
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java
Unescape Escape View File

@ -1,13 +1,7 @@
package com.flossom.common.core.domain.ret;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.flossom.common.core.annotation.Excel;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.entity.WxUserRemark;
import com.flossom.common.core.domain.entity.WxUserTag;
import com.flossom.common.core.web.domain.BaseEntity;
import java.util.Date;
import com.flossom.common.core.domain.entity.*;
import java.util.List;
/**
@ -28,6 +22,11 @@ public class WxUserMemberRet extends WxUserMember {
*/
private List<WxUserTag> wecomTags;
/**
* 仪器列表
*/
private List<WxUserInstrument> instrumentList;
public List<WxUserTag> getMiniProgramTags() {
return miniProgramTags;
@ -44,4 +43,12 @@ public class WxUserMemberRet extends WxUserMember {
public void setWecomTags(List<WxUserTag> wecomTags) {
this.wecomTags = wecomTags;
}
public List<WxUserInstrument> getInstrumentList() {
return instrumentList;
}
public void setInstrumentList(List<WxUserInstrument> instrumentList) {
this.instrumentList = instrumentList;
}
}

3
flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml
Unescape Escape View File

@ -443,7 +443,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
`wx_user_instrument` ui
WHERE
ui.instrument_id IN
ui.binding_status = 0
AND ui.instrument_id IN
<foreach item="instrumentId" collection="devicesIdList" open="(" separator="," close=")">
#{instrumentId}
</foreach>

5
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.controller;
import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.entity.WxUserInstrument;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.entity.WxUserTag;
import com.flossom.common.core.domain.export.WxUserMemberExport;
@ -104,6 +105,10 @@ public class WxUserMemberController extends BaseController {
if (wecomTags != null && wecomTags.size() > 0) {
export.setWecomTags(wecomTags.stream().map(WxUserTag::getTagName).collect(Collectors.joining(",")));
}
List<WxUserInstrument> instrumentList = wxUserMemberRet.getInstrumentList();
if (instrumentList != null && instrumentList.size() > 0) {
export.setDevicesName(instrumentList.stream().map(WxUserInstrument::getInstrumentName).collect(Collectors.joining(",")));
}
exportList.add(export);
}
ExcelUtil<WxUserMemberExport> util = new ExcelUtil(WxUserMemberExport.class);

14
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.flossom.common.core.domain.req.WxUserMemberReq;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import com.flossom.common.core.domain.ret.WxUserMemberRet;
import com.flossom.common.core.domain.vo.WxUserMemberVo;
import com.flossom.common.core.enums.BindingStatusEnums;
import com.flossom.common.core.enums.IntegralChangeTypeEnum;
import com.flossom.common.core.enums.Status;
import com.flossom.common.core.enums.TagTypeStatusEnum;
@ -60,6 +61,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
@Autowired
private SysRegionMapper sysRegionMapper;
@Autowired
private WxUserInstrumentMapper wxUserInstrumentMapper;
/**
* 查询用户
*
@ -389,6 +393,11 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
wxUserTag.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
WxUserInstrument wxUserInstrument = new WxUserInstrument();
wxUserInstrument.setUserId(wxUserMemberRet.getId());
wxUserInstrument.setBindingStatus(BindingStatusEnums.BINDED.getCode());
wxUserInstrument.setStatus(Status.OK.getCode().longValue());
wxUserMemberRet.setInstrumentList(wxUserInstrumentMapper.selectWxUserInstrumentList(wxUserInstrument));
}
}
return wxUserMemberRetList;
@ -406,6 +415,11 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
wxUserTag.setType(TagTypeStatusEnum.ENTERPRISE_WECHAT.getCode());
wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag));
WxUserInstrument wxUserInstrument = new WxUserInstrument();
wxUserInstrument.setUserId(wxUserMemberRet.getId());
wxUserInstrument.setBindingStatus(BindingStatusEnums.BINDED.getCode());
wxUserInstrument.setStatus(Status.OK.getCode().longValue());
wxUserMemberRet.setInstrumentList(wxUserInstrumentMapper.selectWxUserInstrumentList(wxUserInstrument));
list.add(wxUserMemberRet);
}
}

Write Preview
Loading…
Cancel
Save