Quellcode durchsuchen

研发打卡修改

anderx vor 2 Jahren
Ursprung
Commit
7867209267

+ 14 - 3
ruoyi-system/src/main/java/com/ruoyi/project/domain/ProjectStaffRecord.java

@@ -66,8 +66,6 @@ public class ProjectStaffRecord implements Serializable {
      */
     private Long examineId;
 
-
-
     /**
      * 审核时间
      */
@@ -78,6 +76,12 @@ public class ProjectStaffRecord implements Serializable {
      */
     private String examineName;
 
+    /**
+     * 打卡时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recordTime;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -168,7 +172,6 @@ public class ProjectStaffRecord implements Serializable {
         this.examineId = examineId;
     }
 
-
     public Date getExamineTime() {
         return examineTime;
     }
@@ -184,4 +187,12 @@ public class ProjectStaffRecord implements Serializable {
     public void setExamineName(String examineName) {
         this.examineName = examineName;
     }
+
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
 }

+ 17 - 6
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -15,10 +15,11 @@
     <result column="examine_id" jdbcType="BIGINT" property="examineId" />
     <result column="examine_time" jdbcType="TIMESTAMP" property="examineTime" />
     <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
+    <result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />
   </resultMap>
   <sql id="Base_Column_List">
     id, pid, aid, `name`, project_status, content, annex_url, create_time, process_status,
-    duration, examine_id, examine_time, examine_name
+    duration, examine_id, examine_time, examine_name, record_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
@@ -34,13 +35,13 @@
     insert into project_staff_record (pid, aid, `name`,
       project_status, content, annex_url,
       create_time, process_status, duration,
-      examine_id, examine_time, examine_name
-      )
+      examine_id, examine_time, examine_name,
+      record_time)
     values (#{pid,jdbcType=BIGINT}, #{aid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
       #{projectStatus,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP}, #{processStatus,jdbcType=INTEGER}, #{duration,jdbcType=DOUBLE},
-      #{examineId,jdbcType=BIGINT}, #{examineTime,jdbcType=TIMESTAMP}, #{examineName,jdbcType=VARCHAR}
-      )
+      #{examineId,jdbcType=BIGINT}, #{examineTime,jdbcType=TIMESTAMP}, #{examineName,jdbcType=VARCHAR},
+      #{recordTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.project.domain.ProjectStaffRecord" useGeneratedKeys="true">
     insert into project_staff_record
@@ -81,6 +82,9 @@
       <if test="examineName != null">
         examine_name,
       </if>
+      <if test="recordTime != null">
+        record_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pid != null">
@@ -119,6 +123,9 @@
       <if test="examineName != null">
         #{examineName,jdbcType=VARCHAR},
       </if>
+      <if test="recordTime != null">
+        #{recordTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.project.domain.ProjectStaffRecord">
@@ -160,6 +167,9 @@
       <if test="examineName != null">
         examine_name = #{examineName,jdbcType=VARCHAR},
       </if>
+      <if test="recordTime != null">
+        record_time = #{recordTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -176,7 +186,8 @@
       duration = #{duration,jdbcType=DOUBLE},
       examine_id = #{examineId,jdbcType=BIGINT},
       examine_time = #{examineTime,jdbcType=TIMESTAMP},
-      examine_name = #{examineName,jdbcType=VARCHAR}
+      examine_name = #{examineName,jdbcType=VARCHAR},
+      record_time = #{recordTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectList" resultType="com.ruoyi.project.bo.ProjectStaffRecordOut">