更改基本参数

module_base/src/main/java/org/jeecg/modules/elecfeeAdd/entity/ElecfeeAdd.java

@@ -59,10 +59,12 @@ public class ElecfeeAdd implements Serializable {
 	/**部门ID*/
 	@Excel(name = "部门ID", width = 15)
     @ApiModelProperty(value = "部门ID")
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String deptid;
 	/**费用类别*/
 	@Excel(name = "费用类别", width = 15)
     @ApiModelProperty(value = "费用类别")
+    @Dict(dicCode ="elecfee_add_addtype")
     private String addtype;
 	/**电价(元/kw)*/
 	@Excel(name = "电价(元/kw)", width = 15)

module_base/src/main/java/org/jeecg/modules/elecfeeBase/entity/ElecfeeBase.java

@@ -58,11 +58,13 @@ public class ElecfeeBase implements Serializable {
     private String remark;
 	/**部门ID*/
 	@Excel(name = "部门ID", width = 15)
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     @ApiModelProperty(value = "部门ID")
     private String deptid;
 	/**计费类型：按变压器容量计费、按合同最大需量计费、按实际最大需量计费*/
-	@Excel(name = "计费类型：按变压器容量计费、按合同最大需量计费、按实际最大需量计费", width = 15)
-    @ApiModelProperty(value = "计费类型：按变压器容量计费、按合同最大需量计费、按实际最大需量计费")
+	@Excel(name = "计费类型", width = 15)
+    @Dict(dicCode = "elecfee_base_feetype")
+    @ApiModelProperty(value = "计费类型")
     private String feetype;
 	/**变压器容量/合同最大需量(kVA)*/
 	@Excel(name = "变压器容量/合同最大需量(kVA)", width = 15)

module_base/src/main/java/org/jeecg/modules/elecfeeDegree/entity/ElecfeeDegree.java

@@ -58,10 +58,12 @@ public class ElecfeeDegree implements Serializable {
     private String remark;
 	/**部门ID*/
 	@Excel(name = "部门ID", width = 15)
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     @ApiModelProperty(value = "部门ID")
     private String deptid;
 	/**计费类型：售电、光伏*/
 	@Excel(name = "计费类型：售电、光伏", width = 15)
+    @Dict(dicCode = "elecfee_degree_feetype")
     @ApiModelProperty(value = "计费类型：售电、光伏")
     private String feetype;
 	/**目录电价(元/kw)*/

module_base/src/main/java/org/jeecg/modules/elecfeeRatio/entity/ElecfeeRatio.java

@@ -59,6 +59,7 @@ public class ElecfeeRatio implements Serializable {
 	/**部门ID*/
 	@Excel(name = "部门ID", width = 15)
     @ApiModelProperty(value = "部门ID")
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String deptid;
 	/**功率因数*/
 	@Excel(name = "功率因数", width = 15)

module_base/src/main/java/org/jeecg/modules/energyPlan/entity/EnergyPlan.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -54,6 +55,7 @@ public class EnergyPlan implements Serializable {
 	/**设备ID*/
 	@Excel(name = "设备ID", width = 15)
     @ApiModelProperty(value = "设备ID")
+    @Dict(dictTable ="tpm_equipment",dicText = "equipmentname",dicCode = "id")
     private String equipmentid;
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)
@@ -68,6 +70,7 @@ public class EnergyPlan implements Serializable {
 	/**能源分类ID*/
 	@Excel(name = "能源分类ID", width = 15)
     @ApiModelProperty(value = "能源分类ID")
+    @Dict(dictTable ="base_energy_type",dicText = "name",dicCode = "id")
     private String energytypeid;
 	/**计划值*/
 	@Excel(name = "计划值", width = 15)

module_base/src/main/java/org/jeecg/modules/energyRate/entity/EnergyRate.java

@@ -48,19 +48,21 @@ public class EnergyRate implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+	@Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称")
     @ApiModelProperty(value = "名称")
     private java.lang.String name;
 	/**能源分类ID*/
-	@Excel(name = "能源分类ID", width = 15)
+	@Excel(name = "能源分类ID")
+    @Dict(dictTable ="base_energy_type",dicText = "name",dicCode = "id")
     @ApiModelProperty(value = "能源分类ID")
     private String energytypeid;
 	/**费率类型：分时费率、阶梯费率*/
 	@Excel(name = "费率类型：分时费率、阶梯费率", width = 15)
+    @Dict(dicCode = "energy_rate_type")
     @ApiModelProperty(value = "费率类型：分时费率、阶梯费率")
     private java.lang.String ratetype;
 	/**单位*/

module_base/src/main/java/org/jeecg/modules/energyRate/entity/EnergyRateDetail.java

@@ -35,19 +35,20 @@ public class EnergyRateDetail implements Serializable {
     @ApiModelProperty(value = "能源费率ID")
     private String energyrateid;
 	/**分时开始时间*/
-	@Excel(name = "分时开始时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "分时开始时间", width = 15, format = "HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "分时开始时间")
     private java.util.Date begintime;
 	/**分时结束时间*/
-	@Excel(name = "分时结束时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "分时结束时间", width = 15, format = "HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "分时结束时间")
     private java.util.Date endtime;
 	/**峰平谷：尖、峰、谷、平*/
 	@Excel(name = "峰平谷：尖、峰、谷、平", width = 15)
+    @Dict(dicCode = "ems_pandv")
     @ApiModelProperty(value = "峰平谷：尖、峰、谷、平")
     private java.lang.String pandv;
 	/**价格*/

module_base/src/main/java/org/jeecg/modules/energyRate/vo/EnergyRatePage.java

@@ -24,7 +24,7 @@ public class EnergyRatePage {
 	/**能源费率ID*/
 	@Excel(name = "能源费率ID", width = 15)
 	@ApiModelProperty(value = "能源费率ID")
-    private java.lang.Integer energyrateid;
+    private java.lang.String id;
 	/**创建者*/
 	@ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
@@ -52,7 +52,7 @@ public class EnergyRatePage {
 	/**能源分类ID*/
 	@Excel(name = "能源分类ID", width = 15)
 	@ApiModelProperty(value = "能源分类ID")
-    private java.lang.Integer energytypeid;
+    private java.lang.String energytypeid;
 	/**费率类型：分时费率、阶梯费率*/
 	@Excel(name = "费率类型：分时费率、阶梯费率", width = 15)
 	@ApiModelProperty(value = "费率类型：分时费率、阶梯费率")