1 监督检查-调研结果-增加 上传状态和上传时间字段。

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

@@ -63,6 +63,19 @@ public class TInsSpotRecInfor extends BaseEntity
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
     private Date fUpdateTime;
 
+    /**
+     * 上传状态0-未上传，1-已上传
+     */
+    @Excel(name = "上传状态",readConverterExp = "1=已上传,0=未上传")
+    private String govUploadState;
+
+    /**
+     * 上传时间
+     */
+    @Excel(name = "上传时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date govUploadTime;
+
     private String taskCode;
 
     private String taskName;
@@ -147,6 +160,22 @@ public class TInsSpotRecInfor extends BaseEntity
         this.taskName = taskName;
     }
 
+    public String getGovUploadState() {
+        return govUploadState;
+    }
+
+    public void setGovUploadState(String govUploadState) {
+        this.govUploadState = govUploadState;
+    }
+
+    public Date getGovUploadTime() {
+        return govUploadTime;
+    }
+
+    public void setGovUploadTime(Date govUploadTime) {
+        this.govUploadTime = govUploadTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -12,6 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fMethod"    column="f_method"    />
         <result property="fResult"    column="f_result"    />
         <result property="fUpdateTime"    column="f_update_time"    />
+
+        <result property="govUploadState"    column="f_gov_upload_state"    />
+        <result property="govUploadTime"    column="f_gov_upload_time"    />
     </resultMap>
 
     <sql id="selectTInsSpotRecInforVo">
@@ -23,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             spot.f_method,
             spot.f_result,
             spot.f_update_time,
+            spot.f_gov_upload_state,
+            spot.f_gov_upload_time,
             rec.f_check_task_code AS taskCode,
             task.f_name AS taskName
         FROM
@@ -37,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCheckCode != null  and fCheckCode != ''"> and spot.f_check_code like concat('%', #{fCheckCode}, '%')</if>
             <if test="fName != null  and fName != ''"> and spot.f_name like concat('%', #{fName}, '%')</if>
             <if test="fMethod != null  and fMethod != ''"> and spot.f_method = #{fMethod}</if>
+            <if test="govUploadState != null  and govUploadState != ''"> and spot.f_gov_upload_state = #{govUploadState}</if>
         </where>
     </select>
     
@@ -54,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fMethod != null and fMethod != ''">f_method,</if>
             <if test="fResult != null">f_result,</if>
             <if test="fUpdateTime != null">f_update_time,</if>
+
+            <if test="govUploadState != null">f_gov_upload_state,</if>
+            <if test="govUploadTime != null">f_gov_upload_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fCheckCode != null and fCheckCode != ''">#{fCheckCode},</if>
@@ -62,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fMethod != null and fMethod != ''">#{fMethod},</if>
             <if test="fResult != null">#{fResult},</if>
             <if test="fUpdateTime != null">#{fUpdateTime},</if>
+
+            <if test="govUploadState != null">#{govUploadState},</if>
+            <if test="govUploadTime != null">#{govUploadTime},</if>
          </trim>
     </insert>
 
@@ -74,6 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fMethod != null and fMethod != ''">f_method = #{fMethod},</if>
             <if test="fResult != null">f_result = #{fResult},</if>
             <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+
+            <if test="govUploadState != null">f_gov_upload_state = #{govUploadState},</if>
+            <if test="govUploadTime != null">f_gov_upload_time = #{govUploadTime},</if>
         </trim>
         where f_ins_spot_rec_infor_id = #{fInsSpotRecInforId}
     </update>