1

chaunyi_opc/opc_da/src/main/resources/mapper/ReportTableDao.xml

@@ -31,7 +31,7 @@
 
     <sql id="reportTable">
         id
-        , report_table_type, table_template_id, user_id, report_table_name, report_table_data, start_time, end_time, current_num, version, create_time, is_delete
+        , report_table_type, table_template_id, user_id, report_table_name, report_table_data, start_time, current_num, version, create_time, is_delete
     </sql>
 
     <sql id="reportTableItem">
@@ -41,17 +41,17 @@
 
     <sql id="reportTableNoData">
         id
-        , report_table_type, table_template_id, user_id, report_table_name, start_time, end_time, current_num, version, create_time, is_delete
+        , report_table_type, table_template_id, user_id, report_table_name, start_time, current_num, version, create_time, is_delete
     </sql>
 
     <sql id="reportTableCron">
         id
-        , report_table_type, table_template_id, user_id, report_table_name, report_table_data, start_time, end_time, current_num, version, cron_id, cron , run_state, create_time, is_delete
+        , report_table_type, table_template_id, user_id, report_table_name, report_table_data, start_time, current_num, version, cron_id, cron , run_state, create_time, is_delete
     </sql>
 
     <sql id="reportTableCronNoData">
         id
-        , report_table_type, table_template_id, user_id, report_table_name, start_time, end_time, current_num, version, cron_id, cron , run_state, create_time, is_delete
+        , report_table_type, table_template_id, user_id, report_table_name, start_time, current_num, version, cron_id, cron , run_state, create_time, is_delete
     </sql>
 
     <sql id="reportChart">
@@ -94,9 +94,9 @@
     <insert id="addReportTable" parameterType="com.example.opc_common.entity.ReportTable" useGeneratedKeys="true"
             keyProperty="id">
         insert into t_report_table(report_table_type, table_template_id, user_id, report_table_name,
-                                   report_table_data, start_time, end_time, current_num, version, cron_id, cron,
+                                   report_table_data, start_time, current_num, version, cron_id, cron,
                                    create_time, is_delete) VALUE
-            (#{reportTableType},#{tableTemplateId}, #{userId}, #{reportTableName}, #{reportTableData}, #{startTime}, #{endTime}, #{currentNum}, #{version},
+            (#{reportTableType},#{tableTemplateId}, #{userId}, #{reportTableName}, #{reportTableData}, #{startTime}, #{currentNum}, #{version},
             #{cronId}, #{cron}, #{createTime}, #{isDelete})
     </insert>
 
@@ -244,7 +244,6 @@
         update t_report_table
         set report_table_name=#{reportTableName},
             start_time=#{startTime},
-            end_time=#{endTime},
             cron_id=#{cronId},
             cron=#{cron}
         where id = #{id}
@@ -435,7 +434,6 @@
                trt.user_id,
                trt.report_table_name,
                trt.start_time,
-               trt.end_time,
                trt.value_condition,
                trt.report_table_type,
                trt.version,
@@ -571,7 +569,6 @@
         su.user_name,
         trt.report_table_name,
         trt.start_time,
-        trt.end_time,
         trt.current_num,
         trt.version,
         trt.cron_id,
@@ -643,7 +640,6 @@
         trt.user_id,
         trt.report_table_name,
         trt.start_time,
-        trt.end_time,
         trt.report_table_type,
         trt.version,
         trt.cron_id,