|
|
@@ -10,6 +10,7 @@
|
|
|
<result property="psrId" column="psr_id" jdbcType="BIGINT"/>
|
|
|
<result property="name" column="name" jdbcType="VARCHAR"/>
|
|
|
<result property="status" column="status" jdbcType="INTEGER"/>
|
|
|
+ <result property="clockStatus" column="clock_status" jdbcType="INTEGER"/>
|
|
|
<result property="content" column="content" jdbcType="VARCHAR"/>
|
|
|
<result property="recordTime" column="record_time" jdbcType="TIMESTAMP"/>
|
|
|
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
|
|
|
@@ -21,9 +22,10 @@
|
|
|
|
|
|
<sql id="Base_Column_List">
|
|
|
id,dd_user_id,psr_id,
|
|
|
- name,status,content,
|
|
|
- record_time,start_time,end_time,
|
|
|
- sum_duration,check_duration,create_id
|
|
|
+ name,status,clock_status,
|
|
|
+ content,record_time,start_time,
|
|
|
+ end_time,sum_duration,check_duration,
|
|
|
+ create_id
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
|
|
@@ -40,15 +42,15 @@
|
|
|
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.system.domain.UserRecord" useGeneratedKeys="true">
|
|
|
insert into user_record
|
|
|
( id,dd_user_id,psr_id
|
|
|
- ,name,status,content
|
|
|
- ,record_time,start_time,end_time
|
|
|
- ,sum_duration,check_duration,create_id
|
|
|
- )
|
|
|
+ ,name,status,clock_status
|
|
|
+ ,content,record_time,start_time
|
|
|
+ ,end_time,sum_duration,check_duration
|
|
|
+ ,create_id)
|
|
|
values (#{id,jdbcType=BIGINT},#{ddUserId,jdbcType=BIGINT},#{psrId,jdbcType=BIGINT}
|
|
|
- ,#{name,jdbcType=VARCHAR},#{status,jdbcType=INTEGER},#{content,jdbcType=VARCHAR}
|
|
|
- ,#{recordTime,jdbcType=TIMESTAMP},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP}
|
|
|
- ,#{sumDuration,jdbcType=DOUBLE},#{checkDuration,jdbcType=DOUBLE},#{createId,jdbcType=BIGINT}
|
|
|
- )
|
|
|
+ ,#{name,jdbcType=VARCHAR},#{status,jdbcType=INTEGER},#{clockStatus,jdbcType=INTEGER}
|
|
|
+ ,#{content,jdbcType=VARCHAR},#{recordTime,jdbcType=TIMESTAMP},#{startTime,jdbcType=TIMESTAMP}
|
|
|
+ ,#{endTime,jdbcType=TIMESTAMP},#{sumDuration,jdbcType=DOUBLE},#{checkDuration,jdbcType=DOUBLE}
|
|
|
+ ,#{createId,jdbcType=BIGINT})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.system.domain.UserRecord" useGeneratedKeys="true">
|
|
|
insert into user_record
|
|
|
@@ -58,6 +60,7 @@
|
|
|
<if test="psrId != null">psr_id,</if>
|
|
|
<if test="name != null">name,</if>
|
|
|
<if test="status != null">status,</if>
|
|
|
+ <if test="clockStatus != null">clock_status,</if>
|
|
|
<if test="content != null">content,</if>
|
|
|
<if test="recordTime != null">record_time,</if>
|
|
|
<if test="startTime != null">start_time,</if>
|
|
|
@@ -72,6 +75,7 @@
|
|
|
<if test="psrId != null">#{psrId,jdbcType=BIGINT},</if>
|
|
|
<if test="name != null">#{name,jdbcType=VARCHAR},</if>
|
|
|
<if test="status != null">#{status,jdbcType=INTEGER},</if>
|
|
|
+ <if test="clockStatus != null">#{clockStatus,jdbcType=INTEGER},</if>
|
|
|
<if test="content != null">#{content,jdbcType=VARCHAR},</if>
|
|
|
<if test="recordTime != null">#{recordTime,jdbcType=TIMESTAMP},</if>
|
|
|
<if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
|
|
|
@@ -96,6 +100,9 @@
|
|
|
<if test="status != null">
|
|
|
status = #{status,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
+ <if test="clockStatus != null">
|
|
|
+ clock_status = #{clockStatus,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
<if test="content != null">
|
|
|
content = #{content,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -127,6 +134,7 @@
|
|
|
psr_id = #{psrId,jdbcType=BIGINT},
|
|
|
name = #{name,jdbcType=VARCHAR},
|
|
|
status = #{status,jdbcType=INTEGER},
|
|
|
+ clock_status = #{clockStatus,jdbcType=INTEGER},
|
|
|
content = #{content,jdbcType=VARCHAR},
|
|
|
record_time = #{recordTime,jdbcType=TIMESTAMP},
|
|
|
start_time = #{startTime,jdbcType=TIMESTAMP},
|
|
|
@@ -143,6 +151,7 @@
|
|
|
<result property="psrId" column="psr_id" jdbcType="BIGINT"/>
|
|
|
<result property="name" column="name" jdbcType="VARCHAR"/>
|
|
|
<result property="status" column="status" jdbcType="INTEGER"/>
|
|
|
+ <result property="clockStatus" column="clock_status" jdbcType="INTEGER"/>
|
|
|
<result property="content" column="content" jdbcType="VARCHAR"/>
|
|
|
<result property="recordTime" column="record_time" jdbcType="TIMESTAMP"/>
|
|
|
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
|
|
|
@@ -155,7 +164,7 @@
|
|
|
|
|
|
<select id="selectUserClock" resultMap="OutMap">
|
|
|
select
|
|
|
- a.id,a.dd_user_id, a.psr_id, a.name, a.status, a.content, a.record_time, a.start_time, a.end_time,
|
|
|
+ a.id,a.dd_user_id, a.psr_id, a.name, a.status,a.clock_status, a.content, a.record_time, a.start_time, a.end_time,
|
|
|
a.sum_duration, a.check_duration, a.create_id,
|
|
|
b.duration
|
|
|
from user_record a left join project_staff_record b on a.psr_id=b.id
|