Browse Source

项目特色工作新增与修改

anderx 1 year ago
parent
commit
2836c35fc6

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

@@ -6,6 +6,7 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="tdlId" column="tdl_id" jdbcType="INTEGER"/>
         <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
+        <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="type" column="type" jdbcType="INTEGER"/>
@@ -21,7 +22,7 @@
     </resultMap>
     
     <sql id="TaskFeatureLogAllSql">
-id, tdl_id, start_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, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time        
     </sql>
 
     <!--查询单个-->
@@ -34,27 +35,28 @@ id, tdl_id, start_time, dep_name, year_feature, type, inspection_items, enterpri
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_feature_log(tdl_id, start_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
-        values (#{tdlId}, #{startTime}, #{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, 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>
 
     <insert id="insertBatch">
-        insert into task_feature_log(tdl_id, start_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, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.tdlId}, #{entity.startTime}, #{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.type}, #{entity.inspectionItems}, #{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, 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, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, aid, aname, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.tdlId}, #{entity.startTime}, #{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.type}, #{entity.inspectionItems}, #{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),
 start_time = values(start_time),
+end_time = values(end_time),
 dep_name = values(dep_name),
 year_feature = values(year_feature),
 type = values(type),
@@ -79,6 +81,9 @@ create_time = values(create_time)
             <if test="startTime != null">
                 start_time = #{startTime},
             </if>
+            <if test="endTime != null">
+                end_time = #{endTime},
+            </if>
             <if test="depName != null and depName != ''">
                 dep_name = #{depName},
             </if>
@@ -135,6 +140,9 @@ create_time = values(create_time)
             <if test="startTime != null">
                 and start_time = #{startTime}
             </if>
+            <if test="endTime != null">
+                and end_time = #{endTime}
+            </if>
             <if test="depName != null and depName != ''">
                 and dep_name = #{depName}
             </if>
@@ -191,6 +199,9 @@ create_time = values(create_time)
             <if test="startTime != null">
                 and start_time = #{startTime}
             </if>
+            <if test="endTime != null">
+                and end_time = #{endTime}
+            </if>
             <if test="depName != null and depName != ''">
                 and dep_name = #{depName}
             </if>

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

@@ -6,6 +6,7 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="tdid" column="tdid" jdbcType="INTEGER"/>
         <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
+        <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="type" column="type" jdbcType="INTEGER"/>
@@ -19,7 +20,7 @@
     </resultMap>
     
     <sql id="TaskFeatureAllSql">
-id, tdid, start_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, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time        
     </sql>
 
     <!--查询单个-->
@@ -32,27 +33,28 @@ id, tdid, start_time, dep_name, year_feature, type, inspection_items, enterprise
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into task_feature(tdid, start_time, dep_name, year_feature, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
-        values (#{tdid}, #{startTime}, #{depName}, #{yearFeature}, #{type}, #{inspectionItems}, #{enterpriseProblems}, #{solution}, #{inspectionConclusion}, #{remindFollow}, #{remarks}, #{createTime})
+        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>
 
     <insert id="insertBatch">
-        insert into task_feature(tdid, start_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, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.tdid}, #{entity.startTime}, #{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.type}, #{entity.inspectionItems}, #{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, 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, type, inspection_items, enterprise_problems, solution, inspection_conclusion, remind_follow, remarks, create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.tdid}, #{entity.startTime}, #{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.type}, #{entity.inspectionItems}, #{entity.enterpriseProblems}, #{entity.solution}, #{entity.inspectionConclusion}, #{entity.remindFollow}, #{entity.remarks}, #{entity.createTime})
         </foreach>
         on duplicate key update
 tdid = values(tdid),
 start_time = values(start_time),
+end_time = values(end_time),
 dep_name = values(dep_name),
 year_feature = values(year_feature),
 type = values(type),
@@ -75,6 +77,9 @@ create_time = values(create_time)
             <if test="startTime != null">
                 start_time = #{startTime},
             </if>
+            <if test="endTime != null">
+                end_time = #{endTime},
+            </if>
             <if test="depName != null and depName != ''">
                 dep_name = #{depName},
             </if>
@@ -125,6 +130,9 @@ create_time = values(create_time)
             <if test="startTime != null">
                 and start_time = #{startTime}
             </if>
+            <if test="endTime != null">
+                and end_time = #{endTime}
+            </if>
             <if test="depName != null and depName != ''">
                 and dep_name = #{depName}
             </if>
@@ -175,6 +183,9 @@ create_time = values(create_time)
             <if test="startTime != null">
                 and start_time = #{startTime}
             </if>
+            <if test="endTime != null">
+                and end_time = #{endTime}
+            </if>
             <if test="depName != null and depName != ''">
                 and dep_name = #{depName}
             </if>
@@ -208,7 +219,6 @@ create_time = values(create_time)
         </where>
     </select>
 
-
     <!--通过主键删除-->
     <delete id="deleteById">
         delete from task_feature where id = #{id}

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

@@ -8,10 +8,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskFeature)实体类
  *
  * @author makejava
- * @since 2025-01-02 15:36:03
+ * @since 2025-01-07 15:31:22
  */
 public class TaskFeature implements Serializable {
-    private static final long serialVersionUID = 475737003772588398L;
+    private static final long serialVersionUID = 965830575098516785L;
 
     private Integer id;
 /**
@@ -23,6 +23,10 @@ public class TaskFeature implements Serializable {
      */
     private Date startTime;
 /**
+     * 检查结束时间
+     */
+    private Date endTime;
+/**
      * 检查部门
      */
     private String depName;
@@ -88,6 +92,14 @@ public class TaskFeature implements Serializable {
         this.startTime = startTime;
     }
 
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public String getDepName() {
         return depName;
     }

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

@@ -8,10 +8,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskFeatureLog)实体类
  *
  * @author makejava
- * @since 2025-01-02 15:36:11
+ * @since 2025-01-07 15:31:29
  */
 public class TaskFeatureLog implements Serializable {
-    private static final long serialVersionUID = 547666453731683831L;
+    private static final long serialVersionUID = -32390148462137698L;
 
     private Integer id;
 /**
@@ -23,6 +23,10 @@ public class TaskFeatureLog implements Serializable {
      */
     private Date startTime;
 /**
+     * 检查结束时间
+     */
+    private Date endTime;
+/**
      * 检查部门
      */
     private String depName;
@@ -96,6 +100,14 @@ public class TaskFeatureLog implements Serializable {
         this.startTime = startTime;
     }
 
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public String getDepName() {
         return depName;
     }