Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

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

 package com.zehong.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -106,6 +108,19 @@ public class TInsRecInfor extends BaseEntity
     @Excel(name = "描述")
     private String fRemark;
 
+    /**
+     * 上传状态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 taskName;
 
     /**
@@ -275,6 +290,22 @@ public class TInsRecInfor extends BaseEntity
         this.rectificationList = rectificationList;
     }
 
+    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/TInsRecInforMapper.xml

@@ -20,6 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fAnnex"    column="f_annex"    />
         <result property="fLastUpdateTime"    column="f_last_update_time"    />
         <result property="fRemark"    column="f_remark"    />
+
+        <result property="govUploadState"    column="f_gov_upload_state"    />
+        <result property="govUploadTime"    column="f_gov_upload_time"    />
     </resultMap>
 
     <sql id="selectTInsRecInforVo">
@@ -39,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rec.f_annex,
             rec.f_last_update_time,
             rec.f_remark,
+            rec.f_gov_upload_state,
+            rec.f_gov_upload_time
             task.f_name as taskName,
             (select f_name from t_county_level_region where f_county_code = rec.f_region_code) AS countyName
         FROM
@@ -79,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAnnex != null">f_annex,</if>
             <if test="fLastUpdateTime != null">f_last_update_time,</if>
             <if test="fRemark != null">f_remark,</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>
@@ -95,6 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAnnex != null">#{fAnnex},</if>
             <if test="fLastUpdateTime != null">#{fLastUpdateTime},</if>
             <if test="fRemark != null">#{fRemark},</if>
+
+            <if test="govUploadState != null">#{govUploadState},</if>
+            <if test="govUploadTime != null">#{govUploadTime},</if>
+
          </trim>
     </insert>
 
@@ -115,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAnnex != null">f_annex = #{fAnnex},</if>
             <if test="fLastUpdateTime != null">f_last_update_time = #{fLastUpdateTime},</if>
             <if test="fRemark != null">f_remark = #{fRemark},</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_rec_infor_id = #{fInsRecInforId}
     </update>