winter 1 год назад
Родитель
Сommit
94ff186671
3 измененных файлов: 24 добавлений и 1 удалений
  1. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml

+ 18
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -168,6 +168,12 @@ public class WxMerchantController extends BaseController {
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC);
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); 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<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }
@@ -191,6 +197,12 @@ public class WxMerchantController extends BaseController {
} }
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC);
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); 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<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }
@@ -246,6 +258,12 @@ public class WxMerchantController extends BaseController {
wxMerchant.setType(type); wxMerchant.setType(type);
wxMerchant.setCarVendorType(0); wxMerchant.setCarVendorType(0);
wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); 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)); return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant));
} }




+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java Просмотреть файл

@@ -118,6 +118,10 @@ public class WxEnergyMeter extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private String aliseName; private String aliseName;
@Excel(name = "备注", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="备注",name="remark")
private String remark;
@TableField(exist = false) @TableField(exist = false)
private String treeType="meter"; private String treeType="meter";
@TableField(exist = false) @TableField(exist = false)


+ 2
- 1
mallinkService/src/main/resources/mapper/WxEnergyMeterMapper.xml Просмотреть файл

@@ -18,11 +18,12 @@
<result column="trans_name" jdbcType="VARCHAR" property="transName"/> <result column="trans_name" jdbcType="VARCHAR" property="transName"/>
<result column="ratio" jdbcType="VARCHAR" property="ratio"/> <result column="ratio" jdbcType="VARCHAR" property="ratio"/>
<result column="address" jdbcType="VARCHAR" property="address"/> <result column="address" jdbcType="VARCHAR" property="address"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`type`,`rate`,`physics_type`,`shop_type`, `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`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить