Commit 05673732 authored by W_Y's avatar W_Y

问卷-审查标准添加字段&体系审查任务添加字段&新建体系审查任务参数添加字段

parent 5d7d36e8
......@@ -38,4 +38,24 @@ public class ReviewStandard {
@TableField(exist = false)
private List<ReviewKeyPoint> keyPointList;
/**
* 关联标准表id
*/
private Long standardId;
/**
* 标准名称
*/
private String name;
/**
* 标准号
*/
private String standardNo;
/**
* 文件路径
*/
private String file;
}
......@@ -97,4 +97,24 @@ public class SystemReviewTask {
*/
private Date createTime;
}
\ No newline at end of file
/**
* 关联标准表id
*/
private Long standardId;
/**
* 标准名称
*/
private String name;
/**
* 标准号
*/
private String standardNo;
/**
* 文件路径
*/
private String file;
}
......@@ -12,4 +12,10 @@ public class SystemReviewTaskCreateRequest {
private List<SystemReviewTaskUserRelation> auditors;
/**
* 标准id
* 根据哪个标准新建的审查任务
*/
private Long standardId;
}
......@@ -9,6 +9,10 @@
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="chapter" column="chapter" jdbcType="VARCHAR"/>
<result property="text" column="text" jdbcType="VARCHAR"/>
<result property="standardId" column="standard_id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="file" column="file" jdbcType="VARCHAR"/>
<collection property="keyPointList" ofType="com.ruoyi.domain.ReviewKeyPoint" select="com.ruoyi.mapper.ReviewKeyPointMapper.findAllByReviewStandardId" column="id">
<result property="id" column="u_id" jdbcType="BIGINT"/>
......@@ -18,7 +22,7 @@
</resultMap>
<select id="findTree" resultMap="StandardTreeResultMap">
SELECT id, chapter, text FROM t_review_standard;
SELECT id, chapter, text, standardId, name, standardNo, file FROM t_review_standard;
</select>
......
......@@ -16,10 +16,14 @@
<result property="standard" column="standard" typeHandler="com.ruoyi.common.StandardJsonTypeHandler"/>
<result property="bizInfo" column="biz_info" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="standardId" column="standard_id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="file" column="file" jdbcType="VARCHAR"/>
</resultMap>
<select id="findListByStatus" resultMap="BaseResultMap">
SELECT id, task_no, task_status, task_initiator, task_initiator_dept, task_result, task_begin_time, task_end_time, standard, biz_info, create_time
SELECT id, task_no, task_status, task_initiator, task_initiator_dept, task_result, task_begin_time, task_end_time, standard, biz_info, create_time, standardId, name, standardNo, file
FROM t_system_review_task WHERE task_status = #{status}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment