瀏覽代碼

fix

release_toaliyun_real
winter 1 年之前
父節點
當前提交
cb87bb18b4
共有 5 個文件被更改,包括 35 次插入39 次删除
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java
  3. +0
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxEnergyService.java
  5. +31
    -33
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java 查看文件

@@ -415,7 +415,7 @@ public class WxMallAdminController extends BaseController {
}
}
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxEnergyMeterShopFloor> page = wxEnergyService.meterFloorShopListAsPage(record, 1, 1000,true);
PageInfo<WxEnergyMeter> page = wxEnergyService.meterCopyListAsPage(record, 1, 1000);
return new ResultData(page);
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java 查看文件

@@ -106,5 +106,7 @@ public class WxEnergyMeter extends TenantEntity {
private Integer isValid;
@TableField(exist = false)
private Integer hasShop;
@TableField(exist = false)
private String aliseName;
}

+ 0
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java 查看文件

@@ -46,15 +46,11 @@ public class WxEnergyMeterShopFloor extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="表编号",name="meterId")
private Long meterId;
@TableField(exist = false)
private String name;
@io.swagger.annotations.ApiModelProperty(value = "关联的编号", name = "aliseId")
private Long aliseId;
@TableField(exist = false)
private List<Long> aliseIdList;
@TableField(exist = false)
private String aliseName;
@TableField(exist = false)
private List<Long> shopIds;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxEnergyService.java 查看文件

@@ -40,7 +40,7 @@ public interface WxEnergyService {
Map<Long,WxEnergyMeter> getMeterMap(WxEnergyMeter record);
List<Long> getMeterIdList(WxEnergyMeterShopFloor record);
List<Long> getChildMeterIdList(WxEnergyMeterChild record);
PageInfo<WxEnergyMeterShopFloor> meterFloorShopListAsPage(WxEnergyMeterShopFloor record, Integer pageIndex, Integer pageSize,boolean replaceId);
PageInfo<WxEnergyMeter> meterCopyListAsPage(WxEnergyMeterShopFloor record, Integer pageIndex, Integer pageSize);
//费用区间
PageInfo<WxEnergyFeesTime> timeListAsPage(WxEnergyFeesTime record, Integer pageIndex, Integer pageSize);


+ 31
- 33
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java 查看文件

@@ -295,13 +295,13 @@ public class WxEnergyServiceImpl implements WxEnergyService {
}
@Override
public PageInfo<WxEnergyMeterShopFloor> meterFloorShopListAsPage(WxEnergyMeterShopFloor record, Integer pageIndex, Integer pageSize,boolean replaceId) {
PageInfo<WxEnergyMeterShopFloor> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyMeterShopFloorMapper.findList(record));
if (null != page && null != page.getList() && page.getList().size() > 0 ) {
public PageInfo<WxEnergyMeter> meterCopyListAsPage(WxEnergyMeterShopFloor record, Integer pageIndex, Integer pageSize) {
List<WxEnergyMeterShopFloor> sflist = wxEnergyMeterShopFloorMapper.findList(record);
if (null != sflist && sflist.size() > 0 ) {
List<Long> meterIdList = new ArrayList<Long>();
List<Long> shopIdList = new ArrayList<Long>();
for (int i = 0 ; i < page.getList().size(); i++) {
WxEnergyMeterShopFloor sf = page.getList().get(i);
for (int i = 0 ; i < sflist.size(); i++) {
WxEnergyMeterShopFloor sf = sflist.get(i);
meterIdList.add(sf.getMeterId());
if (sf.getType() == EnumEnergyMeterShopFloorType.SHOP.getCode()) {
shopIdList.add(sf.getAliseId());
@@ -313,51 +313,49 @@ public class WxEnergyServiceImpl implements WxEnergyService {
sq.updateTenantInfo(record);
sq.setIds(shopIdList);
Map<Long, WxShop> shopMap = wxShopService.findShopMap(sq);
WxEnergyMeter mq = new WxEnergyMeter();
mq.updateTenantInfo(record);
mq.setIds(meterIdList);
List<WxEnergyMeter> meterList = wxEnergyMeterMapper.findList(mq);
Map<Long,WxEnergyMeter> meterMap = new HashMap<Long,WxEnergyMeter>();
if (null != meterList && meterList.size() > 0 ) {
for (int i = 0 ; i < meterList.size(); i++) {
WxEnergyMeter m = meterList.get(i);
meterMap.put(m.getId(), m);
}
}
for (int i = 0 ; i < page.getList().size(); i++) {
WxEnergyMeterShopFloor sf = page.getList().get(i);
if (null != meterMap ) {
WxEnergyMeter meter = meterMap.get(sf.getMeterId());
if (null != meter) {
sf.setName(meter.getName());
if (replaceId) {
sf.setId(meter.getId());
}
}
}
Map<Long,String> meterAliasMap = new HashMap<Long,String>();
for (int i = 0 ; i < sflist.size(); i++) {
WxEnergyMeterShopFloor sf = sflist.get(i);
String alias = meterAliasMap.get(sf.getMeterId());
alias = StringUtils.trimToEmpty(alias);
if (sf.getType() == EnumEnergyMeterShopFloorType.SHOP.getCode()) {
if (null != shopMap ) {
WxShop shop = shopMap.get(sf.getAliseId());
if (null != shop) {
sf.setAliseName("["+EnumEnergyMeterShopFloorType.SHOP.getMessage()+"]"+shop.getShopNumber());
alias = alias +"["+EnumEnergyMeterShopFloorType.SHOP.getMessage()+"]"+shop.getShopNumber()+",";
}
}
}else if (sf.getType() == EnumEnergyMeterShopFloorType.BUILDING.getCode()) {
if (null != buildingMap ) {
String build = buildingMap.get(sf.getAliseId());
sf.setAliseName("["+EnumEnergyMeterShopFloorType.BUILDING.getMessage()+"]"+build);
alias = alias +"["+EnumEnergyMeterShopFloorType.BUILDING.getMessage()+"]"+build+",";
}
}else if (sf.getType() == EnumEnergyMeterShopFloorType.FLOOR.getCode()) {
if (null != floorMap ) {
String floor = floorMap.get(sf.getAliseId());
sf.setAliseName("["+EnumEnergyMeterShopFloorType.FLOOR.getMessage()+"]"+floor);
alias = alias +"["+EnumEnergyMeterShopFloorType.FLOOR.getMessage()+"]"+floor+",";
}
}
meterAliasMap.put(sf.getMeterId(), alias);
}
WxEnergyMeter mq = new WxEnergyMeter();
mq.updateTenantInfo(record);
mq.setIds(meterIdList);
PageInfo<WxEnergyMeter> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEnergyMeterMapper.findList(mq));
if (null != page && null != page.getList() && page.getList().size() > 0 ) {
for (int i = 0 ; i < page.getList().size(); i++) {
WxEnergyMeter sf = page.getList().get(i);
if (null != meterAliasMap) {
String aliase = meterAliasMap.get(sf.getId());
sf.setAliseName(aliase);
}
}
}
return page;
}
return page;
return new PageInfo<WxEnergyMeter>(new ArrayList<WxEnergyMeter>());
}
@Override


Loading…
取消
儲存