Kaynağa Gözat

打卡数据匹配考勤接口开发

anderx 1 yıl önce
ebeveyn
işleme
6577c3ab34

+ 23 - 1
ruoyi-system/src/main/java/com/ruoyi/project/domain/ProjectStaffRecord.java

@@ -96,6 +96,11 @@ public class ProjectStaffRecord implements Serializable {
      */
     private Double checkDuration;
 
+    /**
+     * 核算状态 0无需核算 1待核算 2已核算
+     */
+    private Double checkStatus;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -337,6 +342,20 @@ public class ProjectStaffRecord implements Serializable {
         this.checkDuration = checkDuration;
     }
 
+    /**
+     * 核算状态 0无需核算 1待核算 2已核算
+     */
+    public Double getCheckStatus() {
+        return checkStatus;
+    }
+
+    /**
+     * 核算状态 0无需核算 1待核算 2已核算
+     */
+    public void setCheckStatus(Double checkStatus) {
+        this.checkStatus = checkStatus;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -365,7 +384,8 @@ public class ProjectStaffRecord implements Serializable {
             && (this.getRecordTime() == null ? other.getRecordTime() == null : this.getRecordTime().equals(other.getRecordTime()))
             && (this.getExamineContent() == null ? other.getExamineContent() == null : this.getExamineContent().equals(other.getExamineContent()))
             && (this.getInitDuration() == null ? other.getInitDuration() == null : this.getInitDuration().equals(other.getInitDuration()))
-            && (this.getCheckDuration() == null ? other.getCheckDuration() == null : this.getCheckDuration().equals(other.getCheckDuration()));
+            && (this.getCheckDuration() == null ? other.getCheckDuration() == null : this.getCheckDuration().equals(other.getCheckDuration()))
+            && (this.getCheckStatus() == null ? other.getCheckStatus() == null : this.getCheckStatus().equals(other.getCheckStatus()));
     }
 
     @Override
@@ -389,6 +409,7 @@ public class ProjectStaffRecord implements Serializable {
         result = prime * result + ((getExamineContent() == null) ? 0 : getExamineContent().hashCode());
         result = prime * result + ((getInitDuration() == null) ? 0 : getInitDuration().hashCode());
         result = prime * result + ((getCheckDuration() == null) ? 0 : getCheckDuration().hashCode());
+        result = prime * result + ((getCheckStatus() == null) ? 0 : getCheckStatus().hashCode());
         return result;
     }
 
@@ -415,6 +436,7 @@ public class ProjectStaffRecord implements Serializable {
         sb.append(", examineContent=").append(examineContent);
         sb.append(", initDuration=").append(initDuration);
         sb.append(", checkDuration=").append(checkDuration);
+        sb.append(", checkStatus=").append(checkStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/project/mapper/ProjectStaffRecordMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
 * @author Administrator
 * @description 针对表【project_staff_record(项目人员记录表)】的数据库操作Mapper
-* @createDate 2024-03-19 15:15:46
+* @createDate 2024-03-19 16:33:50
 * @Entity com.ruoyi.project.domain.ProjectStaffRecord
 */
 public interface ProjectStaffRecordMapper {

+ 13 - 5
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -22,6 +22,7 @@
             <result property="examineContent" column="examine_content" jdbcType="VARCHAR"/>
             <result property="initDuration" column="init_duration" jdbcType="DOUBLE"/>
             <result property="checkDuration" column="check_duration" jdbcType="DOUBLE"/>
+            <result property="checkStatus" column="check_status" jdbcType="DOUBLE"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -30,7 +31,7 @@
         annex_url,create_time,process_status,
         duration,examine_id,examine_time,
         examine_name,record_time,examine_content,
-        init_duration,check_duration
+        init_duration,check_duration,check_status
     </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -51,13 +52,15 @@
         ,annex_url,create_time,process_status
         ,duration,examine_id,examine_time
         ,examine_name,record_time,examine_content
-        ,init_duration,check_duration)
+        ,init_duration,check_duration,check_status
+        )
         values (#{id,jdbcType=BIGINT},#{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},#{recordTime,jdbcType=TIMESTAMP},#{examineContent,jdbcType=VARCHAR}
-        ,#{initDuration,jdbcType=DOUBLE},#{checkDuration,jdbcType=DOUBLE})
+        ,#{initDuration,jdbcType=DOUBLE},#{checkDuration,jdbcType=DOUBLE},#{checkStatus,jdbcType=DOUBLE}
+        )
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.project.domain.ProjectStaffRecord" useGeneratedKeys="true">
         insert into project_staff_record
@@ -79,6 +82,7 @@
                 <if test="examineContent != null">examine_content,</if>
                 <if test="initDuration != null">init_duration,</if>
                 <if test="checkDuration != null">check_duration,</if>
+                <if test="checkStatus != null">check_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -98,6 +102,7 @@
                 <if test="examineContent != null">#{examineContent,jdbcType=VARCHAR},</if>
                 <if test="initDuration != null">#{initDuration,jdbcType=DOUBLE},</if>
                 <if test="checkDuration != null">#{checkDuration,jdbcType=DOUBLE},</if>
+                <if test="checkStatus != null">#{checkStatus,jdbcType=DOUBLE},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.project.domain.ProjectStaffRecord">
@@ -151,6 +156,9 @@
                 <if test="checkDuration != null">
                     check_duration = #{checkDuration,jdbcType=DOUBLE},
                 </if>
+                <if test="checkStatus != null">
+                    check_status = #{checkStatus,jdbcType=DOUBLE},
+                </if>
         </set>
         where   id = #{id,jdbcType=BIGINT} 
     </update>
@@ -172,7 +180,8 @@
             record_time =  #{recordTime,jdbcType=TIMESTAMP},
             examine_content =  #{examineContent,jdbcType=VARCHAR},
             init_duration =  #{initDuration,jdbcType=DOUBLE},
-            check_duration =  #{checkDuration,jdbcType=DOUBLE}
+            check_duration =  #{checkDuration,jdbcType=DOUBLE},
+            check_status =  #{checkStatus,jdbcType=DOUBLE}
         where   id = #{id,jdbcType=BIGINT} 
     </update>
     <select id="selectList" resultType="com.ruoyi.project.bo.ProjectStaffRecordOut">
@@ -301,4 +310,3 @@
     </update>
 
 </mapper>
-