提交问卷审核

quality-review/src/main/java/com/ruoyi/service/impl/CarReviewTaskServiceImpl.java

@@ -131,14 +131,9 @@ public class CarReviewTaskServiceImpl extends ServiceImpl<CarReviewTaskMapper, C
 
     @Override
     public void submitReviewTask(CarReviewTaskSubmitRequest request) {
-        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(request.getTaskId());
 
-        if (detailsList != null) {
-            throw new ServiceException("存在未填写的问卷，请填写完整", HttpStatus.ERROR, detailsList);
-        } else {
-            CarReviewTask carReviewTask = carReviewTaskService.getById(request.getTaskId());
-            strategyCarReviewTaskContext.getResource(carReviewTask.getReviewStatus()).doSubmitReview(carReviewTask);
-        }
+        CarReviewTask carReviewTask = carReviewTaskService.getById(request.getTaskId());
+        strategyCarReviewTaskContext.getResource(carReviewTask.getReviewStatus()).doSubmitReview(carReviewTask);
     }
 
     @Override

quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskPending.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.*;
 import com.ruoyi.mapper.CarReviewTaskMapper;
+import com.ruoyi.mapper.ReviewDetailsMapper;
 import com.ruoyi.mapper.ReviewDetailsResultMapper;
 import com.ruoyi.mapper.SystemReviewTaskMapper;
 import com.ruoyi.service.ReviewDetailsResultService;
@@ -49,6 +50,9 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
     @Autowired
     private ReviewDetailsResultMapper reviewDetailsResultMapper;
 
+    @Autowired
+    private ReviewDetailsMapper reviewDetailsMapper;
+
     // PENDING状态下
     // 1.standard字段查询当前最新问卷
     // 2.查询场景变更任务
@@ -87,33 +91,40 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
     @Override
     public void doSubmitReview(CarReviewTask carReviewTask) {
 
-        // 1. 获取最新问卷
-        List<ReviewStandard> standardTree = reviewStandardService.findTree(carReviewTask.getStandardId(), ReviewStandard.TYPE_CAR);
-
-        // 2. 所有细则必须有对应答案
-        List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(carReviewTask.getId());
-
-        // 3. 将最终问卷归档到 standard 字段
-        setDetailsResult(standardTree, results);
-        carReviewTask.setStandard(standardTree);
+        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(carReviewTask.getId());
 
-        // 4. 填充review_submit_time
-        carReviewTask.setReviewSubmitTime(new Date());
-        // 5. 修改任务状态为 FINISH
-        carReviewTask.setReviewStatus(CarReviewTask.REVIEW_STATUS_FINISH);
-        // 6. 填写当前用户id
-        // 获取当前登陆人
-        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
-        carReviewTask.setReviewSubmitId(loginUser.getUserId());
-        carReviewTask.setReviewSubmitName(loginUser.getNickName());
-
-        // 7. 设置问卷结果
-        if (reviewDetailsResultMapper.findNotPass(carReviewTask.getId()) > 0) {
-            carReviewTask.setReviewResult("REJECT");
+        if (detailsList != null) {
+            throw new ServiceException("存在未填写的问卷，请填写完整", HttpStatus.ERROR, detailsList);
         } else {
-            carReviewTask.setReviewResult("PASS");
+            // 1. 获取最新问卷
+            List<ReviewStandard> standardTree = reviewStandardService.findTree(carReviewTask.getStandardId(), ReviewStandard.TYPE_CAR);
+
+            // 2. 所有细则必须有对应答案
+            List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(carReviewTask.getId());
+
+            // 3. 将最终问卷归档到 standard 字段
+            setDetailsResult(standardTree, results);
+            carReviewTask.setStandard(standardTree);
+
+            // 4. 填充review_submit_time
+            carReviewTask.setReviewSubmitTime(new Date());
+            // 5. 修改任务状态为 FINISH
+            carReviewTask.setReviewStatus(CarReviewTask.REVIEW_STATUS_FINISH);
+            // 6. 填写当前用户id
+            // 获取当前登陆人
+            SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+            carReviewTask.setReviewSubmitId(loginUser.getUserId());
+            carReviewTask.setReviewSubmitName(loginUser.getNickName());
+
+            // 7. 设置问卷结果
+            if (reviewDetailsResultMapper.findNotPass(carReviewTask.getId()) > 0) {
+                carReviewTask.setReviewResult("REJECT");
+            } else {
+                carReviewTask.setReviewResult("PASS");
+            }
+            carReviewTaskMapper.updateById(carReviewTask);
         }
-        carReviewTaskMapper.updateById(carReviewTask);
+
     }
 
     private void setDetailsResult(List<ReviewStandard> standards, List<ReviewDetailsResult> results) {

quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskPending.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.*;
+import com.ruoyi.mapper.ReviewDetailsMapper;
 import com.ruoyi.mapper.ReviewDetailsResultMapper;
 import com.ruoyi.mapper.SystemReviewTaskMapper;
 import com.ruoyi.service.*;
@@ -45,6 +46,9 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
     @Autowired
     private ReviewDetailsResultMapper reviewDetailsResultMapper;
 
+    @Autowired
+    private ReviewDetailsMapper reviewDetailsMapper;
+
     @Override
     public void doStart(SystemReviewTask systemReviewTask) {
         throw new ServiceException("不能开始一个已经开始的任务", HttpStatus.ERROR);
@@ -53,33 +57,38 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
     @Override
     public void doSubmit(SystemReviewTask systemReviewTask) {
         // TODO
-        // 1. 获取最新问卷
-        List<ReviewStandard> standardTree = reviewStandardService.findTree(systemReviewTask.getStandardId(), ReviewStandard.TYPE_SYSTEM);
-
-        // 2. 所有细则必须有对应答案
-        List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(systemReviewTask.getId());
-
-        // 3. 将最终问卷归档到 standard 字段
-        setDetailsResult(standardTree, results);
-        systemReviewTask.setStandard(standardTree);
-
-        // 4. 填充task_end_time
-        systemReviewTask.setTaskEndTime(new Date());
-        // 5. 修改任务状态为 FINISH
-        systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_FINISH);
-        // 6. 填写当前用户id
-        // 获取当前登陆人
-        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
-        systemReviewTask.setSubmitById(loginUser.getUserId());
-        systemReviewTask.setSubmitByName(loginUser.getNickName());
-
-        // 7. 设置问卷结果
-        if (reviewDetailsResultMapper.findNotPass(systemReviewTask.getId()) > 0) {
-            systemReviewTask.setTaskResult("REJECT");
+        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(systemReviewTask.getId());
+        if (detailsList != null) {
+            throw new ServiceException("存在未填写的问卷，请填写完整", HttpStatus.ERROR, detailsList);
         } else {
-            systemReviewTask.setTaskResult("PASS");
+            // 1. 获取最新问卷
+            List<ReviewStandard> standardTree = reviewStandardService.findTree(systemReviewTask.getStandardId(), ReviewStandard.TYPE_SYSTEM);
+
+            // 2. 所有细则必须有对应答案
+            List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(systemReviewTask.getId());
+
+            // 3. 将最终问卷归档到 standard 字段
+            setDetailsResult(standardTree, results);
+            systemReviewTask.setStandard(standardTree);
+
+            // 4. 填充task_end_time
+            systemReviewTask.setTaskEndTime(new Date());
+            // 5. 修改任务状态为 FINISH
+            systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_FINISH);
+            // 6. 填写当前用户id
+            // 获取当前登陆人
+            SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+            systemReviewTask.setSubmitById(loginUser.getUserId());
+            systemReviewTask.setSubmitByName(loginUser.getNickName());
+
+            // 7. 设置问卷结果
+            if (reviewDetailsResultMapper.findNotPass(systemReviewTask.getId()) > 0) {
+                systemReviewTask.setTaskResult("REJECT");
+            } else {
+                systemReviewTask.setTaskResult("PASS");
+            }
+            systemReviewTaskMapper.updateById(systemReviewTask);
         }
-        systemReviewTaskMapper.updateById(systemReviewTask);
 
     }
 

quality-review/src/main/java/com/ruoyi/service/impl/SystemReviewTaskServiceImpl.java

@@ -120,13 +120,8 @@ public class SystemReviewTaskServiceImpl extends ServiceImpl<SystemReviewTaskMap
 
     @Override
     public void submit(SystemReviewTaskSubmitRequest request) {
-        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(request.getTaskId());
-        if (detailsList != null) {
-            throw new ServiceException("存在未填写的问卷，请填写完整", HttpStatus.ERROR, detailsList);
-        } else {
-            SystemReviewTask systemReviewTask = systemReviewTaskService.getById(request.getTaskId());
-            strategySystemReviewTaskContext.getResource(systemReviewTask.getTaskStatus()).doSubmit(systemReviewTask);
-        }
+        SystemReviewTask systemReviewTask = systemReviewTaskService.getById(request.getTaskId());
+        strategySystemReviewTaskContext.getResource(systemReviewTask.getTaskStatus()).doSubmit(systemReviewTask);
     }
 
 }

quality-review/src/main/java/com/ruoyi/web/CarReviewTaskController.java

@@ -5,10 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.service.CarReviewTaskService;
-import com.ruoyi.web.request.CarReviewTaskCreateRequest;
-import com.ruoyi.web.request.CarReviewTaskStartRequest;
-import com.ruoyi.web.request.CarReviewTaskViewRequest;
-import com.ruoyi.web.request.SystemReviewTaskViewRequest;
+import com.ruoyi.web.request.*;
 import com.ruoyi.web.response.CarReviewTaskViewResponse;
 import com.ruoyi.web.response.SystemReviewTaskViewResponse;
 import io.swagger.annotations.Api;
@@ -54,10 +51,19 @@ public class CarReviewTaskController extends BaseController {
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/startReview")
-    public R<String>startReview(@Validated @RequestBody CarReviewTaskStartRequest request) {
+    public R<String> startReview(@Validated @RequestBody CarReviewTaskStartRequest request) {
         carReviewTaskService.startReviewTask(request);
         return R.ok();
     }
 
+    @ApiOperation("提交车辆问卷审查任务")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/submitReview")
+    public R<String> submitReview(@Validated @RequestBody CarReviewTaskSubmitRequest request) {
+        carReviewTaskService.submitReviewTask(request);
+        return R.ok();
+    }
+
 
 }