Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王飞
vehicle-quality-review
Commits
05673732
Commit
05673732
authored
Jan 04, 2024
by
W_Y
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
问卷-审查标准添加字段&体系审查任务添加字段&新建体系审查任务参数添加字段
parent
5d7d36e8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
3 deletions
+57
-3
ReviewStandard.java
...review/src/main/java/com/ruoyi/domain/ReviewStandard.java
+20
-0
SystemReviewTask.java
...view/src/main/java/com/ruoyi/domain/SystemReviewTask.java
+21
-1
SystemReviewTaskCreateRequest.java
.../com/ruoyi/web/request/SystemReviewTaskCreateRequest.java
+6
-0
ReviewStandardMapper.xml
...review/src/main/resources/mapper/ReviewStandardMapper.xml
+5
-1
SystemReviewTaskMapper.xml
...view/src/main/resources/mapper/SystemReviewTaskMapper.xml
+5
-1
No files found.
quality-review/src/main/java/com/ruoyi/domain/ReviewStandard.java
View file @
05673732
...
...
@@ -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
;
}
quality-review/src/main/java/com/ruoyi/domain/SystemReviewTask.java
View file @
05673732
...
...
@@ -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
;
}
quality-review/src/main/java/com/ruoyi/web/request/SystemReviewTaskCreateRequest.java
View file @
05673732
...
...
@@ -12,4 +12,10 @@ public class SystemReviewTaskCreateRequest {
private
List
<
SystemReviewTaskUserRelation
>
auditors
;
/**
* 标准id
* 根据哪个标准新建的审查任务
*/
private
Long
standardId
;
}
quality-review/src/main/resources/mapper/ReviewStandardMapper.xml
View file @
05673732
...
...
@@ -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>
...
...
quality-review/src/main/resources/mapper/SystemReviewTaskMapper.xml
View file @
05673732
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment