Merge branch 'songyuanshuo' into 'dev'

1.版本号问题=>当子任务通过之后 会获取当前关联的standard的最新版本为version字段赋值

See merge request !442

quality-review/src/main/java/com/ruoyi/domain/CarReviewTask.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 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

@@ -62,4 +62,9 @@
             </if>
         </where>
     </select>
+    <select id="getById" resultType="com.ruoyi.domain.Standard">
+        select *
+        from t_standard
+        where id = #{standardId}
+    </select>
 </mapper>