shi'sen'yuan 3 years ago
parent
commit
b07369ee86

+ 6 - 0
master/src/main/java/com/ruoyi/project/aspen/domain/TDashboardday.java

@@ -66,6 +66,9 @@ public class TDashboardday extends BaseEntity
     @Excel(name = "数据日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dataDate;
 
+    /** 抓取数据日 */
+    private String dataDay;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -174,6 +177,9 @@ public class TDashboardday extends BaseEntity
     {
         return dataDate;
     }
+    public String getDataDay() { return dataDay; }
+
+    public void setDataDay(String dataDay) { this.dataDay = dataDay; }
 
     @Override
     public String toString() {

+ 2 - 2
master/src/main/resources/mybatis/aspen/TDashboarddayMapper.xml

@@ -17,11 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="energyConsumption"    column="energy_consumption"    />
         <result property="productPutput"    column="product_putput"    />
         <result property="dataDate"    column="data_date"    />
-        <result property="deptName" column="dept_name" />
+        <result property="dataDay"    column="data_day"    />
     </resultMap>
 
     <sql id="selectTDashboarddayVo">
-        select id, del_flag, creater_code, createdate, updater_code, updatedate, daily_yixi, daily_bingxi, loss_rate, energy_consumption, product_putput, data_date from t_dashboardday
+        select id, del_flag, creater_code, createdate, updater_code, updatedate, daily_yixi, daily_bingxi, loss_rate, energy_consumption, product_putput, data_date, data_day from t_dashboardday
     </sql>
 
     <select id="selectTDashboarddayList" parameterType="TDashboardday" resultMap="TDashboarddayResult">