Browse Source

列表开发

anderx 2 years ago
parent
commit
fca5d0ae00

+ 26 - 0
ruoyi-system/src/main/java/com/ruoyi/project/domain/ProjectStaffRecord.java

@@ -48,6 +48,16 @@ public class ProjectStaffRecord implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * 审核状态 0=未发起,1=待审核,2=已审核,3=驳回
+     */
+    private Integer processStatus;
+
+    /**
+     * 时长
+     */
+    private Double duration;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -113,4 +123,20 @@ public class ProjectStaffRecord implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    public Double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Double duration) {
+        this.duration = duration;
+    }
 }

+ 29 - 4
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -10,9 +10,12 @@
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="annex_url" jdbcType="VARCHAR" property="annexUrl" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="process_status" jdbcType="INTEGER" property="processStatus" />
+    <result column="duration" jdbcType="DOUBLE" property="duration" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, pid, aid, `name`, project_status, content, annex_url, create_time
+    id, pid, aid, `name`, project_status, content, annex_url, create_time, process_status, 
+    duration
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -27,10 +30,12 @@
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.project.domain.ProjectStaffRecord" useGeneratedKeys="true">
     insert into project_staff_record (pid, aid, `name`, 
       project_status, content, annex_url, 
-      create_time)
+      create_time, process_status, duration
+      )
     values (#{pid,jdbcType=BIGINT}, #{aid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{projectStatus,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{processStatus,jdbcType=INTEGER}, #{duration,jdbcType=DOUBLE}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.project.domain.ProjectStaffRecord" useGeneratedKeys="true">
     insert into project_staff_record
@@ -56,6 +61,12 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="processStatus != null">
+        process_status,
+      </if>
+      <if test="duration != null">
+        duration,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pid != null">
@@ -79,6 +90,12 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="processStatus != null">
+        #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="duration != null">
+        #{duration,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.project.domain.ProjectStaffRecord">
@@ -105,6 +122,12 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="duration != null">
+        duration = #{duration,jdbcType=DOUBLE},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -116,7 +139,9 @@
       project_status = #{projectStatus,jdbcType=INTEGER},
       content = #{content,jdbcType=VARCHAR},
       annex_url = #{annexUrl,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      process_status = #{processStatus,jdbcType=INTEGER},
+      duration = #{duration,jdbcType=DOUBLE}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>