Commit 7dad8312 authored by W_Y's avatar W_Y

查看车辆审查任务

parent 8ba7bb00
...@@ -13,7 +13,7 @@ import lombok.experimental.Accessors; ...@@ -13,7 +13,7 @@ import lombok.experimental.Accessors;
* @TableName t_review_task_inbox * @TableName t_review_task_inbox
*/ */
@ApiModel @ApiModel
@TableName(value ="t_system_review_task_inbox") @TableName(value ="t_review_task_inbox")
@Accessors(chain = true) @Accessors(chain = true)
@Data @Data
public class ReviewTaskInbox { public class ReviewTaskInbox {
......
...@@ -117,12 +117,12 @@ public class CarReviewTaskServiceImpl extends ServiceImpl<CarReviewTaskMapper, C ...@@ -117,12 +117,12 @@ public class CarReviewTaskServiceImpl extends ServiceImpl<CarReviewTaskMapper, C
@Override @Override
public CarReviewTaskViewResponse viewReviewTask(Long taskId) { public CarReviewTaskViewResponse viewReviewTask(Long taskId) {
CarReviewTask carReviewTask = carReviewTaskService.getById(taskId); CarReviewTask carReviewTask = carReviewTaskService.getById(taskId);
return strategyCarReviewTaskContext.getResource(carReviewTask.getTaskStatus() + "SystemReviewTask").doView(carReviewTask); return strategyCarReviewTaskContext.getResource(carReviewTask.getTaskStatus()).doView(carReviewTask);
} }
@Override @Override
public void startReviewTask(CarReviewTaskStartRequest request) { public void startReviewTask(CarReviewTaskStartRequest request) {
CarReviewTask carReviewTask = carReviewTaskService.getById(request.getTaskId());
} }
@Override @Override
......
package com.ruoyi.service.impl; package com.ruoyi.service.impl;
import com.ruoyi.service.StrategyCarReviewTask; import com.ruoyi.service.StrategyCarReviewTask;
import com.ruoyi.service.StrategySystemReviewTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -13,8 +11,7 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -13,8 +11,7 @@ import java.util.concurrent.ConcurrentHashMap;
@Service @Service
public class StrategyCarReviewTaskContext { public class StrategyCarReviewTaskContext {
@Autowired private Map<String, StrategyCarReviewTask> resourceMap = new ConcurrentHashMap<>();
private final Map<String, StrategyCarReviewTask> resourceMap = new ConcurrentHashMap<>();
public void putResource(String key, StrategyCarReviewTask strategyCarReviewTask) { public void putResource(String key, StrategyCarReviewTask strategyCarReviewTask) {
resourceMap.put(key, strategyCarReviewTask); resourceMap.put(key, strategyCarReviewTask);
......
package com.ruoyi.service.impl; package com.ruoyi.service.impl;
import com.ruoyi.service.StrategyReviewSceneChange; import com.ruoyi.service.StrategyReviewSceneChange;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -12,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -12,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap;
@Service @Service
public class StrategyReviewSceneChangeContext { public class StrategyReviewSceneChangeContext {
@Autowired
private final Map<String, StrategyReviewSceneChange> strategyMap = new ConcurrentHashMap<>(); private final Map<String, StrategyReviewSceneChange> strategyMap = new ConcurrentHashMap<>();
public void putResource(String key, StrategyReviewSceneChange strategySystemReviewTask) { public void putResource(String key, StrategyReviewSceneChange strategySystemReviewTask) {
......
package com.ruoyi.service.impl; package com.ruoyi.service.impl;
import com.ruoyi.service.StrategySystemReviewTask; import com.ruoyi.service.StrategySystemReviewTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -12,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -12,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap;
@Service @Service
public class StrategySystemReviewTaskContext { public class StrategySystemReviewTaskContext {
@Autowired
private final Map<String, StrategySystemReviewTask> resourceMap = new ConcurrentHashMap<>(); private final Map<String, StrategySystemReviewTask> resourceMap = new ConcurrentHashMap<>();
public void putResource(String key, StrategySystemReviewTask strategySystemReviewTask) { public void putResource(String key, StrategySystemReviewTask strategySystemReviewTask) {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask"> <select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
SELECT * FROM t_review_scene_change_task WHERE id IN SELECT * FROM t_review_scene_change_task WHERE id IN
( (
SELECT MAX(id) FROM t_review_scene_change_task WHERE task_status = 'FINISH' AND task_result = 'PASS' AND id IN (SELECT review_scene_change_task_id FROM t_system_review_task_inbox WHERE system_review_task_id = #{taskId} AND is_confirm = 0) GROUP BY review_scene_id SELECT MAX(id) FROM t_review_scene_change_task WHERE task_status = 'FINISH' AND task_result = 'PASS' AND id IN (SELECT review_scene_change_task_id FROM t_review_task_inbox WHERE review_task_id = #{taskId} AND is_confirm = 0) GROUP BY review_scene_id
) )
</select> </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