| @@ -27,6 +27,8 @@ public class WxFeesStandards extends TenantEntity { | |||||
| private Date createTime; | private Date createTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "名称", name = "createtime") | @io.swagger.annotations.ApiModelProperty(value = "名称", name = "createtime") | ||||
| private String name; | private String name; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "单价", name = "price") | |||||
| private String price; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "类型EnumFeesStandardsType", name = "type") | @io.swagger.annotations.ApiModelProperty(value = "类型EnumFeesStandardsType", name = "type") | ||||
| private Integer type; | private Integer type; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是否一次性费用EnumYesOrNo", name = "fixedPrice") | @io.swagger.annotations.ApiModelProperty(value = "是否一次性费用EnumYesOrNo", name = "fixedPrice") | ||||
| @@ -8,7 +8,8 @@ package com.iformall.enums; | |||||
| public enum EnumFeesStandardsCalcuteUnit { | public enum EnumFeesStandardsCalcuteUnit { | ||||
| MM(1, "平米(㎡)"), | MM(1, "平米(㎡)"), | ||||
| DIAN_DU(2, "度(KWh)"), | DIAN_DU(2, "度(KWh)"), | ||||
| SHUI_DUN(3,"吨(立方米)(m³)"); | |||||
| SHUI_DUN(3,"吨(立方米)(m³)"), | |||||
| HU(4,"户"); | |||||
| public static EnumFeesStandardsCalcuteUnit getEnum(Integer code) { | public static EnumFeesStandardsCalcuteUnit getEnum(Integer code) { | ||||
| for (EnumFeesStandardsCalcuteUnit value : values()) { | for (EnumFeesStandardsCalcuteUnit value : values()) { | ||||
| @@ -40,6 +40,7 @@ public enum EnumFeesStandardsType { | |||||
| List<EnumFeesStandardsCalcuteUnit> retList = new ArrayList<EnumFeesStandardsCalcuteUnit>(); | List<EnumFeesStandardsCalcuteUnit> retList = new ArrayList<EnumFeesStandardsCalcuteUnit>(); | ||||
| if (type.intValue() == PROPERTY_CONTRACT.getCode().intValue()) { | if (type.intValue() == PROPERTY_CONTRACT.getCode().intValue()) { | ||||
| retList.add(EnumFeesStandardsCalcuteUnit.MM); | retList.add(EnumFeesStandardsCalcuteUnit.MM); | ||||
| retList.add(EnumFeesStandardsCalcuteUnit.HU); | |||||
| return retList; | return retList; | ||||
| }else if (type.intValue() == DAILY_BILL.getCode().intValue()) { | }else if (type.intValue() == DAILY_BILL.getCode().intValue()) { | ||||
| retList.add(EnumFeesStandardsCalcuteUnit.DIAN_DU); | retList.add(EnumFeesStandardsCalcuteUnit.DIAN_DU); | ||||
| @@ -9,6 +9,7 @@ | |||||
| <result column="name" jdbcType="VARCHAR" property="name"/> | <result column="name" jdbcType="VARCHAR" property="name"/> | ||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | ||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | ||||
| <result column="price" jdbcType="VARCHAR" property="price"/> | |||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="fixed_price" jdbcType="INTEGER" property="fixedPrice"/> | <result column="fixed_price" jdbcType="INTEGER" property="fixedPrice"/> | ||||
| <result column="calcute_unit" jdbcType="INTEGER" property="calcuteUnit"/> | <result column="calcute_unit" jdbcType="INTEGER" property="calcuteUnit"/> | ||||
| @@ -16,7 +17,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`is_del`,`name`,`update_time`,`create_time`,`type`,`fixed_price`,`calcute_unit`,`time_unit` | |||||
| `id`,`tenant_id`,`parent_tenant_id`,`is_del`,`name`,`update_time`,`create_time`,`price`,`type`,`fixed_price`,`calcute_unit`,`time_unit` | |||||
| </sql> | </sql> | ||||