Merge branch 'dev' into 'master'

dev - master 29

See merge request !376

quality-review/src/main/java/com/ruoyi/service/StrategyCarReviewTask.java

@@ -13,5 +13,5 @@ public interface StrategyCarReviewTask {
 
     void doConfirmReview(CarReviewTask carReviewTask);
 
-    void doSubmitReview(CarReviewTask carReviewTask, List<String> imagesUrl, List<Long> testScenarioList);
+    void doSubmitReview(CarReviewTask carReviewTask, String imagesUrl, List<Long> testScenarioList);
 }

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

@@ -81,7 +81,7 @@ public class StrategyCarReviewTaskFinish implements StrategyCarReviewTask, Initi
     }
 
     @Override
-    public void doSubmitReview(CarReviewTask carReviewTask, List<String> imagesUrl, List<Long> testScenarioList) {
+    public void doSubmitReview(CarReviewTask carReviewTask, String imagesUrl, List<Long> testScenarioList) {
         throw new ServiceException("不能提交一个结束的任务", HttpStatus.ERROR);
     }
 

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

@@ -67,7 +67,7 @@ public class StrategyCarReviewTaskNew implements StrategyCarReviewTask, Initiali
     }
 
     @Override
-    public void doSubmitReview(CarReviewTask carReviewTask,List<String> imagesUrl, List<Long> testScenarioList) {
+    public void doSubmitReview(CarReviewTask carReviewTask,String imagesUrl, List<Long> testScenarioList) {
         throw new ServiceException("不能提交一个未开始的任务", HttpStatus.ERROR);
     }
 

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

@@ -166,7 +166,7 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
     }
 
     @Override
-    public void doSubmitReview(CarReviewTask carReviewTask,List<String> imagesUrl, List<Long> testScenarioList) {
+    public void doSubmitReview(CarReviewTask carReviewTask,String imagesUrl, List<Long> testScenarioList) {
 
         throw new ServiceException("不能提交一个未确认的任务", HttpStatus.ERROR);
 

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

@@ -98,7 +98,7 @@ public class StrategyCarReviewTaskSigned implements StrategyCarReviewTask, Initi
     }
 
     @Override
-    public void doSubmitReview(CarReviewTask carReviewTask, List<String> imagesUrl, List<Long> testScenarioList) {
+    public void doSubmitReview(CarReviewTask carReviewTask, String imagesUrl, List<Long> testScenarioList) {
 
         // 1. 填充review_submit_time
         carReviewTask.setTaskEndTime(new Date());
@@ -113,8 +113,8 @@ public class StrategyCarReviewTaskSigned implements StrategyCarReviewTask, Initi
         carReviewTask.setSubmitName(loginUser.getNickName());
 
         // 4. 保存签名图片地址
-        String joinImageUrl = StringUtils.join(imagesUrl,",");
-        carReviewTask.setImagesUrl(joinImageUrl);
+//        String joinImageUrl = StringUtils.join(imagesUrl,",");
+//        carReviewTask.setImagesUrl(joinImageUrl);
 
         // 5.再找带该子任务所属的总任务，将总任务的状态由 RUNNING 改回 RUNNABLE
         Task task = taskMapper.selectById(taskMapper.findByCarReviewTaskId(carReviewTask.getId()));

quality-review/src/main/java/com/ruoyi/web/request/CarReviewTaskSubmitRequest.java

@@ -14,7 +14,7 @@ public class CarReviewTaskSubmitRequest {
     private Long taskId;
 
     @ApiModelProperty("图片地址")
-    private List<String> imagesUrl;
+    private String imagesUrl;
 
     @ApiModelProperty("选择的测试场景")
     private List<Long> testScenarioList;