Просмотр исходного кода

新增 计算研发预算完成进度

anderx 1 год назад
Родитель
Сommit
adbaef4499

+ 48 - 15
src/main/java/com/goafanti/common/mapper/TaskFeatureLogMapper.xml

@@ -9,11 +9,14 @@
         <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
         <result property="depName" column="dep_name" jdbcType="VARCHAR"/>
         <result property="yearFeature" column="year_feature" jdbcType="VARCHAR"/>
+        <result property="inspectWay" column="inspect_way" jdbcType="INTEGER"/>
         <result property="type" column="type" jdbcType="INTEGER"/>
-        <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
+        <result property="typeOther" column="type_other" jdbcType="VARCHAR"/>
+        <result property="inspectionItems" column="inspection_items" jdbcType="INTEGER"/>
+        <result property="inspectionItemsOther" column="inspection_items_other" jdbcType="VARCHAR"/>
         <result property="enterpriseProblems" column="enterprise_problems" jdbcType="VARCHAR"/>
         <result property="solution" column="solution" jdbcType="VARCHAR"/>
-        <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="VARCHAR"/>
+        <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="INTEGER"/>
         <result property="remindFollow" column="remind_follow" jdbcType="VARCHAR"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
@@ -22,7 +25,7 @@
     </resultMap>
     
     <sql id="TaskFeatureLogAllSql">
-id, tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time        
+id, tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time        
     </sql>
 
     <!--查询单个-->
@@ -35,23 +38,23 @@ id, tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
-        values (#{tdlId}, #{startTime}, #{endTime}, #{depName}, #{yearFeature}, #{type}, #{inspectionItems}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{aid}, #{aname}, #{createTime})
+        insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
+        values (#{tdlId}, #{startTime}, #{endTime}, #{depName}, #{yearFeature}, #{inspectWay}, #{type}, #{typeOther}, #{inspectionItems}, #{inspectionItemsOther}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{aid}, #{aname}, #{createTime})
     </insert>
 
     <insert id="insertBatch">
-        insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
+        insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
+        (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.inspectWay}, #{entity.type}, #{entity.typeOther}, #{entity.inspectionItems}, #{entity.inspectionItemsOther}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
+        insert into task_feature_log(tdl_id, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
+            (#{entity.tdlId}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.inspectWay}, #{entity.type}, #{entity.typeOther}, #{entity.inspectionItems}, #{entity.inspectionItemsOther}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.aid}, #{entity.aname}, #{entity.createTime})
         </foreach>
         on duplicate key update
 tdl_id = values(tdl_id),
@@ -59,8 +62,11 @@ start_time = values(start_time),
 end_time = values(end_time),
 dep_name = values(dep_name),
 year_feature = values(year_feature),
+inspect_way = values(inspect_way),
 type = values(type),
+type_other = values(type_other),
 inspection_items = values(inspection_items),
+inspection_items_other = values(inspection_items_other),
 enterprise_problems = values(enterprise_problems),
 solution = values(solution),
 inspection_conclusion = values(inspection_conclusion),
@@ -90,19 +96,28 @@ create_time = values(create_time)
             <if test="yearFeature != null and yearFeature != ''">
                 year_feature = #{yearFeature},
             </if>
+            <if test="inspectWay != null">
+                inspect_way = #{inspectWay},
+            </if>
             <if test="type != null">
                 type = #{type},
             </if>
-            <if test="inspectionItems != null and inspectionItems != ''">
+            <if test="typeOther != null and typeOther != ''">
+                type_other = #{typeOther},
+            </if>
+            <if test="inspectionItems != null">
                 inspection_items = #{inspectionItems},
             </if>
+            <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
+                inspection_items_other = #{inspectionItemsOther},
+            </if>
             <if test="enterpriseProblems != null and enterpriseProblems != ''">
                 enterprise_problems = #{enterpriseProblems},
             </if>
             <if test="solution != null and solution != ''">
                 solution = #{solution},
             </if>
-            <if test="inspectionConclusion != null and inspectionConclusion != ''">
+            <if test="inspectionConclusion != null">
                 inspection_conclusion = #{inspectionConclusion},
             </if>
             <if test="remindFollow != null and remindFollow != ''">
@@ -149,19 +164,28 @@ create_time = values(create_time)
             <if test="yearFeature != null and yearFeature != ''">
                 and year_feature = #{yearFeature}
             </if>
+            <if test="inspectWay != null">
+                and inspect_way = #{inspectWay}
+            </if>
             <if test="type != null">
                 and type = #{type}
             </if>
-            <if test="inspectionItems != null and inspectionItems != ''">
+            <if test="typeOther != null and typeOther != ''">
+                and type_other = #{typeOther}
+            </if>
+            <if test="inspectionItems != null">
                 and inspection_items = #{inspectionItems}
             </if>
+            <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
+                and inspection_items_other = #{inspectionItemsOther}
+            </if>
             <if test="enterpriseProblems != null and enterpriseProblems != ''">
                 and enterprise_problems = #{enterpriseProblems}
             </if>
             <if test="solution != null and solution != ''">
                 and solution = #{solution}
             </if>
-            <if test="inspectionConclusion != null and inspectionConclusion != ''">
+            <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
             <if test="remindFollow != null and remindFollow != ''">
@@ -208,19 +232,28 @@ create_time = values(create_time)
             <if test="yearFeature != null and yearFeature != ''">
                 and year_feature = #{yearFeature}
             </if>
+            <if test="inspectWay != null">
+                and inspect_way = #{inspectWay}
+            </if>
             <if test="type != null">
                 and type = #{type}
             </if>
-            <if test="inspectionItems != null and inspectionItems != ''">
+            <if test="typeOther != null and typeOther != ''">
+                and type_other = #{typeOther}
+            </if>
+            <if test="inspectionItems != null">
                 and inspection_items = #{inspectionItems}
             </if>
+            <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
+                and inspection_items_other = #{inspectionItemsOther}
+            </if>
             <if test="enterpriseProblems != null and enterpriseProblems != ''">
                 and enterprise_problems = #{enterpriseProblems}
             </if>
             <if test="solution != null and solution != ''">
                 and solution = #{solution}
             </if>
-            <if test="inspectionConclusion != null and inspectionConclusion != ''">
+            <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
             <if test="remindFollow != null and remindFollow != ''">

+ 48 - 15
src/main/java/com/goafanti/common/mapper/TaskFeatureMapper.xml

@@ -9,18 +9,21 @@
         <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
         <result property="depName" column="dep_name" jdbcType="VARCHAR"/>
         <result property="yearFeature" column="year_feature" jdbcType="VARCHAR"/>
+        <result property="inspectWay" column="inspect_way" jdbcType="INTEGER"/>
         <result property="type" column="type" jdbcType="INTEGER"/>
-        <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
+        <result property="typeOther" column="type_other" jdbcType="VARCHAR"/>
+        <result property="inspectionItems" column="inspection_items" jdbcType="INTEGER"/>
+        <result property="inspectionItemsOther" column="inspection_items_other" jdbcType="VARCHAR"/>
         <result property="enterpriseProblems" column="enterprise_problems" jdbcType="VARCHAR"/>
         <result property="solution" column="solution" jdbcType="VARCHAR"/>
-        <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="VARCHAR"/>
+        <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="INTEGER"/>
         <result property="remindFollow" column="remind_follow" jdbcType="VARCHAR"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
     
     <sql id="TaskFeatureAllSql">
-id, tdid, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time        
+id, tdid, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time        
     </sql>
 
     <!--查询单个-->
@@ -33,23 +36,23 @@ id, tdid, start_time, end_time, dep_name, year_feature, type, inspection_items,
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_feature(tdid, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
-        values (#{tdid}, #{startTime}, #{endTime}, #{depName}, #{yearFeature}, #{type}, #{inspectionItems}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{createTime})
+        insert into task_feature(tdid, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
+        values (#{tdid}, #{startTime}, #{endTime}, #{depName}, #{yearFeature}, #{inspectWay}, #{type}, #{typeOther}, #{inspectionItems}, #{inspectionItemsOther}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{createTime})
     </insert>
 
     <insert id="insertBatch">
-        insert into task_feature(tdid, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
+        insert into task_feature(tdid, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.tdid}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.createTime})
+        (#{entity.tdid}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.inspectWay}, #{entity.type}, #{entity.typeOther}, #{entity.inspectionItems}, #{entity.inspectionItemsOther}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.createTime})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into task_feature(tdid, start_time, end_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
+        insert into task_feature(tdid, start_time, end_time, dep_name, year_feature, inspect_way, type, type_other, inspection_items, inspection_items_other, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.tdid}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.createTime})
+            (#{entity.tdid}, #{entity.startTime}, #{entity.endTime}, #{entity.depName}, #{entity.yearFeature}, #{entity.inspectWay}, #{entity.type}, #{entity.typeOther}, #{entity.inspectionItems}, #{entity.inspectionItemsOther}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.createTime})
         </foreach>
         on duplicate key update
 tdid = values(tdid),
@@ -57,8 +60,11 @@ start_time = values(start_time),
 end_time = values(end_time),
 dep_name = values(dep_name),
 year_feature = values(year_feature),
+inspect_way = values(inspect_way),
 type = values(type),
+type_other = values(type_other),
 inspection_items = values(inspection_items),
+inspection_items_other = values(inspection_items_other),
 enterprise_problems = values(enterprise_problems),
 solution = values(solution),
 inspection_conclusion = values(inspection_conclusion),
@@ -86,19 +92,28 @@ create_time = values(create_time)
             <if test="yearFeature != null and yearFeature != ''">
                 year_feature = #{yearFeature},
             </if>
+            <if test="inspectWay != null">
+                inspect_way = #{inspectWay},
+            </if>
             <if test="type != null">
                 type = #{type},
             </if>
-            <if test="inspectionItems != null and inspectionItems != ''">
+            <if test="typeOther != null and typeOther != ''">
+                type_other = #{typeOther},
+            </if>
+            <if test="inspectionItems != null">
                 inspection_items = #{inspectionItems},
             </if>
+            <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
+                inspection_items_other = #{inspectionItemsOther},
+            </if>
             <if test="enterpriseProblems != null and enterpriseProblems != ''">
                 enterprise_problems = #{enterpriseProblems},
             </if>
             <if test="solution != null and solution != ''">
                 solution = #{solution},
             </if>
-            <if test="inspectionConclusion != null and inspectionConclusion != ''">
+            <if test="inspectionConclusion != null">
                 inspection_conclusion = #{inspectionConclusion},
             </if>
             <if test="remindFollow != null and remindFollow != ''">
@@ -139,19 +154,28 @@ create_time = values(create_time)
             <if test="yearFeature != null and yearFeature != ''">
                 and year_feature = #{yearFeature}
             </if>
+            <if test="inspectWay != null">
+                and inspect_way = #{inspectWay}
+            </if>
             <if test="type != null">
                 and type = #{type}
             </if>
-            <if test="inspectionItems != null and inspectionItems != ''">
+            <if test="typeOther != null and typeOther != ''">
+                and type_other = #{typeOther}
+            </if>
+            <if test="inspectionItems != null">
                 and inspection_items = #{inspectionItems}
             </if>
+            <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
+                and inspection_items_other = #{inspectionItemsOther}
+            </if>
             <if test="enterpriseProblems != null and enterpriseProblems != ''">
                 and enterprise_problems = #{enterpriseProblems}
             </if>
             <if test="solution != null and solution != ''">
                 and solution = #{solution}
             </if>
-            <if test="inspectionConclusion != null and inspectionConclusion != ''">
+            <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
             <if test="remindFollow != null and remindFollow != ''">
@@ -192,19 +216,28 @@ create_time = values(create_time)
             <if test="yearFeature != null and yearFeature != ''">
                 and year_feature = #{yearFeature}
             </if>
+            <if test="inspectWay != null">
+                and inspect_way = #{inspectWay}
+            </if>
             <if test="type != null">
                 and type = #{type}
             </if>
-            <if test="inspectionItems != null and inspectionItems != ''">
+            <if test="typeOther != null and typeOther != ''">
+                and type_other = #{typeOther}
+            </if>
+            <if test="inspectionItems != null">
                 and inspection_items = #{inspectionItems}
             </if>
+            <if test="inspectionItemsOther != null and inspectionItemsOther != ''">
+                and inspection_items_other = #{inspectionItemsOther}
+            </if>
             <if test="enterpriseProblems != null and enterpriseProblems != ''">
                 and enterprise_problems = #{enterpriseProblems}
             </if>
             <if test="solution != null and solution != ''">
                 and solution = #{solution}
             </if>
-            <if test="inspectionConclusion != null and inspectionConclusion != ''">
+            <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
             <if test="remindFollow != null and remindFollow != ''">

+ 48 - 12
src/main/java/com/goafanti/common/model/TaskFeature.java

@@ -8,10 +8,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskFeature)实体类
  *
  * @author makejava
- * @since 2025-01-07 15:31:22
+ * @since 2025-01-08 17:22:04
  */
 public class TaskFeature implements Serializable {
-    private static final long serialVersionUID = 965830575098516785L;
+    private static final long serialVersionUID = -91399890050529400L;
 
     private Integer id;
 /**
@@ -35,13 +35,25 @@ public class TaskFeature implements Serializable {
      */
     private String yearFeature;
 /**
-     * 检查类别
+     * 检查方式 0=线上,1=线下
+     */
+    private Integer inspectWay;
+/**
+     * 检查类别 0=其他 1=高新技术税收优惠政策检查,2=加计扣除税收优惠政策检查,3=税务常规检查,4=税务对研发费用检查,5=税务稽查
      */
     private Integer type;
 /**
-     * 检查事项
+     * 检查类别其他说明
      */
-    private String inspectionItems;
+    private String typeOther;
+/**
+     * 检查事项 0=其他,1=高新产品收入不达标,2=人员人工费用问题检查,3=研发费用占比不达标,4=属于多个类别,5=其他事项检查
+     */
+    private Integer inspectionItems;
+/**
+     * 检查事项其他说明
+     */
+    private String inspectionItemsOther;
 /**
      * 企业问题点
      */
@@ -51,11 +63,11 @@ public class TaskFeature implements Serializable {
      */
     private String solution;
 /**
-     * 检查后结论
+     * 检查后结论 0=其他,1=被取消高新认定资格,2=不通过,3=合规通过,4=通过,5=无结论,6=要求整改
      */
-    private String inspectionConclusion;
+    private Integer inspectionConclusion;
 /**
-     * 是否提醒企业专业人员跟进事宜
+     * 是否提醒企业专业人员跟进事宜 0=未提醒,1=已提醒
      */
     private String remindFollow;
 /**
@@ -116,6 +128,14 @@ public class TaskFeature implements Serializable {
         this.yearFeature = yearFeature;
     }
 
+    public Integer getInspectWay() {
+        return inspectWay;
+    }
+
+    public void setInspectWay(Integer inspectWay) {
+        this.inspectWay = inspectWay;
+    }
+
     public Integer getType() {
         return type;
     }
@@ -124,14 +144,30 @@ public class TaskFeature implements Serializable {
         this.type = type;
     }
 
-    public String getInspectionItems() {
+    public String getTypeOther() {
+        return typeOther;
+    }
+
+    public void setTypeOther(String typeOther) {
+        this.typeOther = typeOther;
+    }
+
+    public Integer getInspectionItems() {
         return inspectionItems;
     }
 
-    public void setInspectionItems(String inspectionItems) {
+    public void setInspectionItems(Integer inspectionItems) {
         this.inspectionItems = inspectionItems;
     }
 
+    public String getInspectionItemsOther() {
+        return inspectionItemsOther;
+    }
+
+    public void setInspectionItemsOther(String inspectionItemsOther) {
+        this.inspectionItemsOther = inspectionItemsOther;
+    }
+
     public String getEnterpriseProblems() {
         return enterpriseProblems;
     }
@@ -148,11 +184,11 @@ public class TaskFeature implements Serializable {
         this.solution = solution;
     }
 
-    public String getInspectionConclusion() {
+    public Integer getInspectionConclusion() {
         return inspectionConclusion;
     }
 
-    public void setInspectionConclusion(String inspectionConclusion) {
+    public void setInspectionConclusion(Integer inspectionConclusion) {
         this.inspectionConclusion = inspectionConclusion;
     }
 

+ 48 - 12
src/main/java/com/goafanti/common/model/TaskFeatureLog.java

@@ -8,10 +8,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskFeatureLog)实体类
  *
  * @author makejava
- * @since 2025-01-07 15:31:29
+ * @since 2025-01-08 17:22:11
  */
 public class TaskFeatureLog implements Serializable {
-    private static final long serialVersionUID = -32390148462137698L;
+    private static final long serialVersionUID = 459696873194928421L;
 
     private Integer id;
 /**
@@ -35,13 +35,25 @@ public class TaskFeatureLog implements Serializable {
      */
     private String yearFeature;
 /**
-     * 检查类别
+     * 检查方式 0=线上,1=线下
+     */
+    private Integer inspectWay;
+/**
+     * 检查类别 0=其他 1=高新技术税收优惠政策检查,2=加计扣除税收优惠政策检查,3=税务常规检查,4=税务对研发费用检查,5=税务稽查
      */
     private Integer type;
 /**
-     * 检查事项
+     * 检查类别其他说明
      */
-    private String inspectionItems;
+    private String typeOther;
+/**
+     * 检查事项 0=其他,1=高新产品收入不达标,2=人员人工费用问题检查,3=研发费用占比不达标,4=属于多个类别,5=其他事项检查
+     */
+    private Integer inspectionItems;
+/**
+     * 检查事项其他说明
+     */
+    private String inspectionItemsOther;
 /**
      * 企业问题点
      */
@@ -51,11 +63,11 @@ public class TaskFeatureLog implements Serializable {
      */
     private String solution;
 /**
-     * 检查后结论
+     * 检查后结论 0=其他,1=被取消高新认定资格,2=不通过,3=合规通过,4=通过,5=无结论,6=要求整改
      */
-    private String inspectionConclusion;
+    private Integer inspectionConclusion;
 /**
-     * 是否提醒企业专业人员跟进事宜
+     * 是否提醒企业专业人员跟进事宜 0=未提醒,1=已提醒
      */
     private String remindFollow;
 /**
@@ -124,6 +136,14 @@ public class TaskFeatureLog implements Serializable {
         this.yearFeature = yearFeature;
     }
 
+    public Integer getInspectWay() {
+        return inspectWay;
+    }
+
+    public void setInspectWay(Integer inspectWay) {
+        this.inspectWay = inspectWay;
+    }
+
     public Integer getType() {
         return type;
     }
@@ -132,14 +152,30 @@ public class TaskFeatureLog implements Serializable {
         this.type = type;
     }
 
-    public String getInspectionItems() {
+    public String getTypeOther() {
+        return typeOther;
+    }
+
+    public void setTypeOther(String typeOther) {
+        this.typeOther = typeOther;
+    }
+
+    public Integer getInspectionItems() {
         return inspectionItems;
     }
 
-    public void setInspectionItems(String inspectionItems) {
+    public void setInspectionItems(Integer inspectionItems) {
         this.inspectionItems = inspectionItems;
     }
 
+    public String getInspectionItemsOther() {
+        return inspectionItemsOther;
+    }
+
+    public void setInspectionItemsOther(String inspectionItemsOther) {
+        this.inspectionItemsOther = inspectionItemsOther;
+    }
+
     public String getEnterpriseProblems() {
         return enterpriseProblems;
     }
@@ -156,11 +192,11 @@ public class TaskFeatureLog implements Serializable {
         this.solution = solution;
     }
 
-    public String getInspectionConclusion() {
+    public Integer getInspectionConclusion() {
         return inspectionConclusion;
     }
 
-    public void setInspectionConclusion(String inspectionConclusion) {
+    public void setInspectionConclusion(Integer inspectionConclusion) {
         this.inspectionConclusion = inspectionConclusion;
     }