anderx 1 рік тому
батько
коміт
83ca91e207

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

@@ -17,7 +17,7 @@
         <result property="enterpriseProblems" column="enterprise_problems" jdbcType="VARCHAR"/>
         <result property="solution" column="solution" jdbcType="VARCHAR"/>
         <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="INTEGER"/>
-        <result property="remindFollow" column="remind_follow" jdbcType="VARCHAR"/>
+        <result property="remindFollow" column="remind_follow" jdbcType="INTEGER"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
         <result property="aname" column="aname" jdbcType="VARCHAR"/>
@@ -120,7 +120,7 @@ create_time = values(create_time)
             <if test="inspectionConclusion != null">
                 inspection_conclusion = #{inspectionConclusion},
             </if>
-            <if test="remindFollow != null and remindFollow != ''">
+            <if test="remindFollow != null">
                 remind_follow = #{remindFollow},
             </if>
             <if test="remarks != null and remarks != ''">
@@ -188,7 +188,7 @@ create_time = values(create_time)
             <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
-            <if test="remindFollow != null and remindFollow != ''">
+            <if test="remindFollow != null">
                 and remind_follow = #{remindFollow}
             </if>
             <if test="remarks != null and remarks != ''">
@@ -256,7 +256,7 @@ create_time = values(create_time)
             <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
-            <if test="remindFollow != null and remindFollow != ''">
+            <if test="remindFollow != null">
                 and remind_follow = #{remindFollow}
             </if>
             <if test="remarks != null and remarks != ''">

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

@@ -17,7 +17,7 @@
         <result property="enterpriseProblems" column="enterprise_problems" jdbcType="VARCHAR"/>
         <result property="solution" column="solution" jdbcType="VARCHAR"/>
         <result property="inspectionConclusion" column="inspection_conclusion" jdbcType="INTEGER"/>
-        <result property="remindFollow" column="remind_follow" jdbcType="VARCHAR"/>
+        <result property="remindFollow" column="remind_follow" jdbcType="INTEGER"/>
         <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
@@ -116,7 +116,7 @@ create_time = values(create_time)
             <if test="inspectionConclusion != null">
                 inspection_conclusion = #{inspectionConclusion},
             </if>
-            <if test="remindFollow != null and remindFollow != ''">
+            <if test="remindFollow != null">
                 remind_follow = #{remindFollow},
             </if>
             <if test="remarks != null and remarks != ''">
@@ -178,7 +178,7 @@ create_time = values(create_time)
             <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
-            <if test="remindFollow != null and remindFollow != ''">
+            <if test="remindFollow != null">
                 and remind_follow = #{remindFollow}
             </if>
             <if test="remarks != null and remarks != ''">
@@ -240,7 +240,7 @@ create_time = values(create_time)
             <if test="inspectionConclusion != null">
                 and inspection_conclusion = #{inspectionConclusion}
             </if>
-            <if test="remindFollow != null and remindFollow != ''">
+            <if test="remindFollow != null">
                 and remind_follow = #{remindFollow}
             </if>
             <if test="remarks != null and remarks != ''">

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

@@ -10,10 +10,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskFeature)实体类
  *
  * @author makejava
- * @since 2025-01-08 17:22:04
+ * @since 2025-01-10 09:44:23
  */
 public class TaskFeature implements Serializable {
-    private static final long serialVersionUID = -91399890050529400L;
+    private static final long serialVersionUID = -26561630127014294L;
 
     private Integer id;
 /**
@@ -23,14 +23,12 @@ public class TaskFeature implements Serializable {
 /**
      * 检查开始时间
      */
-
     private Date startTime;
 /**
      * 检查结束时间
      */
-
     private Date endTime;
-    /**
+/**
      * 检查部门
      */
     private String depName;
@@ -73,7 +71,7 @@ public class TaskFeature implements Serializable {
 /**
      * 是否提醒企业专业人员跟进事宜 0=未提醒,1=已提醒
      */
-    private String remindFollow;
+    private Integer remindFollow;
 /**
      * 备注说明
      */
@@ -104,6 +102,7 @@ public class TaskFeature implements Serializable {
     public Date getStartTime() {
         return startTime;
     }
+
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
@@ -111,6 +110,7 @@ public class TaskFeature implements Serializable {
     public Date getEndTime() {
         return endTime;
     }
+
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
@@ -195,11 +195,11 @@ public class TaskFeature implements Serializable {
         this.inspectionConclusion = inspectionConclusion;
     }
 
-    public String getRemindFollow() {
+    public Integer getRemindFollow() {
         return remindFollow;
     }
 
-    public void setRemindFollow(String remindFollow) {
+    public void setRemindFollow(Integer remindFollow) {
         this.remindFollow = remindFollow;
     }
 

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

@@ -8,10 +8,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskFeatureLog)实体类
  *
  * @author makejava
- * @since 2025-01-08 17:22:11
+ * @since 2025-01-10 09:44:29
  */
 public class TaskFeatureLog implements Serializable {
-    private static final long serialVersionUID = 459696873194928421L;
+    private static final long serialVersionUID = -72238591478184679L;
 
     private Integer id;
 /**
@@ -69,7 +69,7 @@ public class TaskFeatureLog implements Serializable {
 /**
      * 是否提醒企业专业人员跟进事宜 0=未提醒,1=已提醒
      */
-    private String remindFollow;
+    private Integer remindFollow;
 /**
      * 备注说明
      */
@@ -200,11 +200,11 @@ public class TaskFeatureLog implements Serializable {
         this.inspectionConclusion = inspectionConclusion;
     }
 
-    public String getRemindFollow() {
+    public Integer getRemindFollow() {
         return remindFollow;
     }
 
-    public void setRemindFollow(String remindFollow) {
+    public void setRemindFollow(Integer remindFollow) {
         this.remindFollow = remindFollow;
     }