diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java index e3ca8bd..ed246ec 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java @@ -239,5 +239,7 @@ public class BmCompanyInfo implements Serializable { //用户名 private String userName; + //上架数 + private Integer maCount; } \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 28b7b51..693d8f6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -142,6 +142,8 @@ public interface DevInfoMapper { */ List selectCompanyList(BmCompanyInfo obj); + List getMaCountByCompany(BmCompanyInfo obj); + int updateUpDown(@Param("maIds") List maIds, @Param("maStatus") Object maStatus); /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 63a193e..73ee4b9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -625,7 +625,18 @@ public class DevInfoServiceImpl implements DevInfoService { */ @Override public List selectCompanyList(BmCompanyInfo obj) { - return devInfoMapper.selectCompanyList(obj); + List companyInfos = devInfoMapper.selectCompanyList(obj); + List companyMaCountList = devInfoMapper.getMaCountByCompany(obj); + if (!CollectionUtils.isEmpty(companyInfos) && !CollectionUtils.isEmpty(companyMaCountList)) { + for (BmCompanyInfo bmInfo : companyInfos) { + for (BmCompanyInfo maCountList : companyMaCountList) { + if (bmInfo.getCompanyId().equals(maCountList.getCompanyId())) { + bmInfo.setMaCount(maCountList.getMaCount()); + } + } + } + } + return companyInfos; } /** diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 95582e3..0a4bf94 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -585,6 +585,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +