|
|
@@ -12,10 +12,13 @@
|
|
|
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
|
|
<result column="process_status" jdbcType="INTEGER" property="processStatus" />
|
|
|
<result column="duration" jdbcType="DOUBLE" property="duration" />
|
|
|
+ <result column="examine_id" jdbcType="BIGINT" property="examineId" />
|
|
|
+ <result column="examine_name" jdbcType="INTEGER" property="examineName" />
|
|
|
+ <result column="examine_time" jdbcType="TIMESTAMP" property="examineTime" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
id, pid, aid, `name`, project_status, content, annex_url, create_time, process_status,
|
|
|
- duration
|
|
|
+ duration, examine_id, examine_name, examine_time
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -30,11 +33,13 @@
|
|
|
<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, process_status, duration
|
|
|
+ create_time, process_status, duration,
|
|
|
+ examine_id, examine_name, examine_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}
|
|
|
+ #{createTime,jdbcType=TIMESTAMP}, #{processStatus,jdbcType=INTEGER}, #{duration,jdbcType=DOUBLE},
|
|
|
+ #{examineId,jdbcType=BIGINT}, #{examineName,jdbcType=INTEGER}, #{examineTime,jdbcType=TIMESTAMP}
|
|
|
)
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.project.domain.ProjectStaffRecord" useGeneratedKeys="true">
|
|
|
@@ -67,6 +72,15 @@
|
|
|
<if test="duration != null">
|
|
|
duration,
|
|
|
</if>
|
|
|
+ <if test="examineId != null">
|
|
|
+ examine_id,
|
|
|
+ </if>
|
|
|
+ <if test="examineName != null">
|
|
|
+ examine_name,
|
|
|
+ </if>
|
|
|
+ <if test="examineTime != null">
|
|
|
+ examine_time,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="pid != null">
|
|
|
@@ -96,6 +110,15 @@
|
|
|
<if test="duration != null">
|
|
|
#{duration,jdbcType=DOUBLE},
|
|
|
</if>
|
|
|
+ <if test="examineId != null">
|
|
|
+ #{examineId,jdbcType=BIGINT},
|
|
|
+ </if>
|
|
|
+ <if test="examineName != null">
|
|
|
+ #{examineName,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
+ <if test="examineTime != null">
|
|
|
+ #{examineTime,jdbcType=TIMESTAMP},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.project.domain.ProjectStaffRecord">
|
|
|
@@ -128,6 +151,15 @@
|
|
|
<if test="duration != null">
|
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
|
</if>
|
|
|
+ <if test="examineId != null">
|
|
|
+ examine_id = #{examineId,jdbcType=BIGINT},
|
|
|
+ </if>
|
|
|
+ <if test="examineName != null">
|
|
|
+ examine_name = #{examineName,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
+ <if test="examineTime != null">
|
|
|
+ examine_time = #{examineTime,jdbcType=TIMESTAMP},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=BIGINT}
|
|
|
</update>
|
|
|
@@ -141,14 +173,19 @@
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
|
|
process_status = #{processStatus,jdbcType=INTEGER},
|
|
|
- duration = #{duration,jdbcType=DOUBLE}
|
|
|
+ duration = #{duration,jdbcType=DOUBLE},
|
|
|
+ examine_id = #{examineId,jdbcType=BIGINT},
|
|
|
+ examine_name = #{examineName,jdbcType=INTEGER},
|
|
|
+ examine_time = #{examineTime,jdbcType=TIMESTAMP}
|
|
|
where id = #{id,jdbcType=BIGINT}
|
|
|
</update>
|
|
|
<select id="selectList" resultType="com.ruoyi.project.bo.ProjectStaffRecordOut">
|
|
|
- select a.id,a.pid ,a.aid ,a.name ,a.project_status projectStatus,a.content ,
|
|
|
- a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus ,
|
|
|
- a.duration,b.name projectName,b.admin_name adminName
|
|
|
+ select a.id,c.job_number jobNumber,a.name ,d.dept_id deptId ,d.dept_name deptName ,c.create_time createMonth,
|
|
|
+ b.id projectId,b.name projectName,b.admin_name adminName ,a.project_status projectStatus,a.content ,
|
|
|
+ a.pid ,a.aid ,a.examine_id examineId ,a.examine_name examineName ,a.examine_time examineTime,
|
|
|
+ a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration
|
|
|
from project_staff_record a left join project_task b on a.pid=b.id
|
|
|
+ left join sys_user c on a.aid=c.user_id left join sys_dept d on c.dept_id =d.dept_id
|
|
|
where 1=1
|
|
|
<if test="roleType==0">
|
|
|
and a.aid =#{aid}
|