1 供需平衡-停气监管-增加 企业端上传时间字段

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalStopSup.java

@@ -65,6 +65,12 @@ public class TSupBalStopSup extends BaseEntity
     @Excel(name = "上报状态 0-未上报，1-已上报")
     private String fRepStatus;
 
+    /**
+     * 企业端上传时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String entRepTime;
+
     /** 停气区域 */
     @Excel(name = "停气区域")
     private String fGasStopArea;
@@ -237,6 +243,14 @@ public class TSupBalStopSup extends BaseEntity
         this.fGovUploadTime = fGovUploadTime;
     }
 
+    public String getEntRepTime() {
+        return entRepTime;
+    }
+
+    public void setEntRepTime(String entRepTime) {
+        this.entRepTime = entRepTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zh-baseversion-system/src/main/resources/mapper/system/TSupBalStopSupMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fStopProgress"    column="f_stop_progress"    />
         <result property="fRecoveryGasTime"    column="f_recovery_gas_time"    />
         <result property="fRepStatus"    column="f_rep_status"    />
+        <result property="entRepTime"    column="f_ent_rep_time"    />
         <result property="fGasStopArea"    column="f_gas_stop_area"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             st.f_stop_progress,
             st.f_recovery_gas_time,
             st.f_rep_status,
+            st.f_ent_rep_time,
             st.f_gas_stop_area,
             st.create_by,
             st.create_time,
@@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fStopProgress != null and fStopProgress != ''">f_stop_progress,</if>
             <if test="fRecoveryGasTime != null">f_recovery_gas_time,</if>
             <if test="fRepStatus != null and fRepStatus != ''">f_rep_status,</if>
+            <if test="entRepTime != null and entRepTime != ''">f_ent_rep_time,</if>
             <if test="fGasStopArea != null">f_gas_stop_area,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -107,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fStopProgress != null and fStopProgress != ''">#{fStopProgress},</if>
             <if test="fRecoveryGasTime != null">#{fRecoveryGasTime},</if>
             <if test="fRepStatus != null and fRepStatus != ''">#{fRepStatus},</if>
+            <if test="entRepTime != null and entRepTime != ''">#{entRepTime},</if>
             <if test="fGasStopArea != null">#{fGasStopArea},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -132,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fStopProgress != null and fStopProgress != ''">f_stop_progress = #{fStopProgress},</if>
             <if test="fRecoveryGasTime != null">f_recovery_gas_time = #{fRecoveryGasTime},</if>
             <if test="fRepStatus != null and fRepStatus != ''">f_rep_status = #{fRepStatus},</if>
+            <if test="entRepTime != null and entRepTime != ''">f_ent_rep_time = #{entRepTime},</if>
             <if test="fGasStopArea != null">f_gas_stop_area = #{fGasStopArea},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>