From 94ff186671fcbb6d7b70656140f817560f3f0d98 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 10 Sep 2024 14:15:30 +0800 Subject: [PATCH] fix --- .../controller/basic/WxMerchantController.java | 18 ++++++++++++++++++ .../com/iformall/domain/po/WxEnergyMeter.java | 4 ++++ .../resources/mapper/WxEnergyMeterMapper.xml | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 39bbfc7f7..e9722f026 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -168,6 +168,12 @@ public class WxMerchantController extends BaseController { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchant.setFloorForRule(dataRule.getFloorIds()); + wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); + } final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -191,6 +197,12 @@ public class WxMerchantController extends BaseController { } wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchant.setFloorForRule(dataRule.getFloorIds()); + wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); + } final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -246,6 +258,12 @@ public class WxMerchantController extends BaseController { wxMerchant.setType(type); wxMerchant.setCarVendorType(0); wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchant.setFloorForRule(dataRule.getFloorIds()); + wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); + } return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java index da391354d..a967ba200 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java @@ -118,6 +118,10 @@ public class WxEnergyMeter extends TenantEntity { @TableField(exist = false) private String aliseName; + @Excel(name = "备注", width = 20, orderNum = "13") + @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") + private String remark; + @TableField(exist = false) private String treeType="meter"; @TableField(exist = false) diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml index 666d5e83f..097dcf786 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml @@ -18,11 +18,12 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`type`,`rate`,`physics_type`,`shop_type`, - `has_fee`,`electri_type`,`trans_name`,`ratio`,`address` + `has_fee`,`electri_type`,`trans_name`,`ratio`,`address`,`remark`