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
099c42e0
Commit
099c42e0
authored
Sep 13, 2024
by
yuanshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.版本号问题=>当子任务通过之后 会获取当前关联的standard的最新版本为version字段赋值
parent
369c11da
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
1 deletion
+34
-1
CarReviewTask.java
...-review/src/main/java/com/ruoyi/domain/CarReviewTask.java
+3
-0
Standard.java
quality-review/src/main/java/com/ruoyi/domain/Standard.java
+6
-0
SystemReviewTask.java
...view/src/main/java/com/ruoyi/domain/SystemReviewTask.java
+3
-0
StandardMapper.java
...review/src/main/java/com/ruoyi/mapper/StandardMapper.java
+2
-0
StrategyCarReviewTaskPending.java
.../com/ruoyi/service/impl/StrategyCarReviewTaskPending.java
+7
-0
StrategySystemReviewTaskPending.java
...m/ruoyi/service/impl/StrategySystemReviewTaskPending.java
+8
-0
StandardController.java
...eview/src/main/java/com/ruoyi/web/StandardController.java
+0
-1
StandardMapper.xml
quality-review/src/main/resources/mapper/StandardMapper.xml
+5
-0
No files found.
quality-review/src/main/java/com/ruoyi/domain/CarReviewTask.java
View file @
099c42e0
...
...
@@ -178,4 +178,7 @@ public class CarReviewTask implements Serializable {
@ApiModelProperty
(
"企业名称"
)
private
String
enterpriseName
;
@ApiModelProperty
(
"版本"
)
private
String
version
;
}
quality-review/src/main/java/com/ruoyi/domain/Standard.java
View file @
099c42e0
...
...
@@ -64,4 +64,10 @@ public class Standard {
@ApiModelProperty
(
"展示状态"
)
private
Long
status
;
@ApiModelProperty
(
"原始版本"
)
private
String
originalVersion
;
@ApiModelProperty
(
"最新版本"
)
private
String
currentVersion
;
}
quality-review/src/main/java/com/ruoyi/domain/SystemReviewTask.java
View file @
099c42e0
...
...
@@ -182,4 +182,7 @@ public class SystemReviewTask {
@ApiModelProperty
(
"企业名称"
)
private
String
enterpriseName
;
@ApiModelProperty
(
"版本"
)
private
String
version
;
}
quality-review/src/main/java/com/ruoyi/mapper/StandardMapper.java
View file @
099c42e0
...
...
@@ -26,4 +26,6 @@ public interface StandardMapper extends BaseMapper<Standard> {
* @return
*/
List
<
Standard
>
findStandardList
(
StandardListRequest
request
);
Standard
getById
(
@Param
(
"standardId"
)
Long
standardId
);
}
quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskPending.java
View file @
099c42e0
...
...
@@ -83,6 +83,8 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
@Autowired
private
ISysUserService
sysUserService
;
@Autowired
private
StandardMapper
standardMapper
;
// PENDING状态下
// 1.standard字段查询当前最新问卷
...
...
@@ -147,6 +149,11 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
setDetailsResult
(
standardTree
,
results
,
carReviewTask
);
carReviewTask
.
setStandard
(
standardTree
);
//问卷全部完成,那么设置任务的版本
Long
standardId
=
carReviewTask
.
getStandardId
();
Standard
standard
=
standardMapper
.
getById
(
standardId
);
carReviewTask
.
setVersion
(
standard
.
getCurrentVersion
());
carReviewTaskMapper
.
updateById
(
carReviewTask
);
// 4. 修改任务状态为 SIGNED 待签字
carReviewTask
.
setTaskStatus
(
CarReviewTask
.
TASK_STATUS_SIGNED
);
...
...
quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskPending.java
View file @
099c42e0
...
...
@@ -73,6 +73,9 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
@Autowired
private
ISysUserService
sysUserService
;
@Autowired
private
StandardMapper
standardMapper
;
@Override
public
void
doStart
(
SystemReviewTask
systemReviewTask
)
{
throw
new
ServiceException
(
"不能开始一个已经开始的任务"
,
HttpStatus
.
ERROR
);
...
...
@@ -110,6 +113,11 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
systemReviewTask
.
setStandard
(
standardTree
);
//问卷全部完成,那么设置任务的版本
Long
standardId
=
systemReviewTask
.
getStandardId
();
Standard
standard
=
standardMapper
.
getById
(
standardId
);
systemReviewTask
.
setVersion
(
standard
.
getCurrentVersion
());
systemReviewTaskMapper
.
updateById
(
systemReviewTask
);
// 4. 修改任务状态为 SIGNED 待签字
systemReviewTask
.
setTaskStatus
(
SystemReviewTask
.
STATUS_SIGNED
);
...
...
quality-review/src/main/java/com/ruoyi/web/StandardController.java
View file @
099c42e0
package
com
.
ruoyi
.
web
;
import
com.ruoyi.common.annotation.Anonymous
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.R
;
...
...
quality-review/src/main/resources/mapper/StandardMapper.xml
View file @
099c42e0
...
...
@@ -62,4 +62,9 @@
</if>
</where>
</select>
<select
id=
"getById"
resultType=
"com.ruoyi.domain.Standard"
>
select *
from t_standard
where id = #{standardId}
</select>
</mapper>
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