|
|
@@ -15,11 +15,12 @@
|
|
|
<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="examine_content" jdbcType="VARCHAR" property="examineContent" />
|
|
|
<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, record_time
|
|
|
+ duration, examine_id, examine_time, examine_name, record_time,examine_content
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -36,12 +37,12 @@
|
|
|
project_status, content, annex_url,
|
|
|
create_time, process_status, duration,
|
|
|
examine_id, examine_time, examine_name,
|
|
|
- record_time)
|
|
|
+ record_time,examine_content)
|
|
|
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},
|
|
|
- #{recordTime,jdbcType=TIMESTAMP})
|
|
|
+ #{recordTime,jdbcType=TIMESTAMP},#{examineContent})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.project.domain.ProjectStaffRecord" useGeneratedKeys="true">
|
|
|
insert into project_staff_record
|
|
|
@@ -85,6 +86,9 @@
|
|
|
<if test="recordTime != null">
|
|
|
record_time,
|
|
|
</if>
|
|
|
+ <if test="examineContent != null">
|
|
|
+ examine_content,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="pid != null">
|
|
|
@@ -126,6 +130,9 @@
|
|
|
<if test="recordTime != null">
|
|
|
#{recordTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
+ <if test="examineContent != null">
|
|
|
+ #{examineContent},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.project.domain.ProjectStaffRecord">
|
|
|
@@ -170,6 +177,9 @@
|
|
|
<if test="recordTime != null">
|
|
|
record_time = #{recordTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
+ <if test="examineContent != null">
|
|
|
+ examine_content = #{examineContent},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=BIGINT}
|
|
|
</update>
|
|
|
@@ -187,7 +197,8 @@
|
|
|
examine_id = #{examineId,jdbcType=BIGINT},
|
|
|
examine_time = #{examineTime,jdbcType=TIMESTAMP},
|
|
|
examine_name = #{examineName,jdbcType=VARCHAR},
|
|
|
- record_time = #{recordTime,jdbcType=TIMESTAMP}
|
|
|
+ record_time = #{recordTime,jdbcType=TIMESTAMP},
|
|
|
+ examine_content = #{examineContent}
|
|
|
where id = #{id,jdbcType=BIGINT}
|
|
|
</update>
|
|
|
<select id="selectList" resultType="com.ruoyi.project.bo.ProjectStaffRecordOut">
|
|
|
@@ -253,7 +264,8 @@
|
|
|
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
|
|
|
+ a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration,
|
|
|
+ a.examine_content examineContent
|
|
|
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
|