From 152edd76736935041e54c8c4467bbc796b1ca35f Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 25 Jan 2024 11:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E4=BB=AA=E5=99=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/export/WxUserMemberExport.java | 8 +++---- .../core/domain/ret/WxUserMemberRet.java | 23 ++++++++++++------- .../resources/mapper/WxUserMemberMapper.xml | 3 ++- .../controller/WxUserMemberController.java | 5 ++++ .../service/impl/WxUserMemberServiceImpl.java | 14 +++++++++++ 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java index 5a744e4..a529523 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java @@ -74,8 +74,8 @@ public class WxUserMemberExport { @Excel(name = "仪器数量") private Integer devicesNum; -// @Excel(name = "仪器名称") - private List devicesName; + @Excel(name = "仪器名称") + private String devicesName; /** * 创建时间 @@ -220,11 +220,11 @@ public class WxUserMemberExport { this.miniProgramTags = miniProgramTags; } - public List getDevicesName() { + public String getDevicesName() { return devicesName; } - public void setDevicesName(List devicesName) { + public void setDevicesName(String devicesName) { this.devicesName = devicesName; } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java index daebb2a..aad5b0c 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java @@ -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 wecomTags; + /** + * 仪器列表 + */ + private List instrumentList; + public List getMiniProgramTags() { return miniProgramTags; @@ -44,4 +43,12 @@ public class WxUserMemberRet extends WxUserMember { public void setWecomTags(List wecomTags) { this.wecomTags = wecomTags; } + + public List getInstrumentList() { + return instrumentList; + } + + public void setInstrumentList(List instrumentList) { + this.instrumentList = instrumentList; + } } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index d32aa1a..9374677 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -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 #{instrumentId} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java index f8cff8c..b8f9241 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java @@ -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 instrumentList = wxUserMemberRet.getInstrumentList(); + if (instrumentList != null && instrumentList.size() > 0) { + export.setDevicesName(instrumentList.stream().map(WxUserInstrument::getInstrumentName).collect(Collectors.joining(","))); + } exportList.add(export); } ExcelUtil util = new ExcelUtil(WxUserMemberExport.class); diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index 029f25e..8e05c6c 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -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); } }