Merge branch 'wangdingyi' into 'dev'

提交问卷检查是否全部完成

See merge request !333

quality-review/src/main/java/com/ruoyi/mapper/ReviewDetailsMapper.java

@@ -21,7 +21,7 @@ public interface ReviewDetailsMapper extends BaseMapper<ReviewDetails> {
      * @param taskId
      * @return
      */
-    List<ReviewDetails> findNoResult(@Param("taskId") Long taskId, @Param("type") String type);
+    List<ReviewDetails> findNoResult(@Param("taskId") Long taskId, @Param("type") String type, @Param("standardId") Long standardId);
 
     Double count (@Param("taskId")Long taskId, @Param("type")String type);
 

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

@@ -130,7 +130,7 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
 
     @Override
     public void doConfirmReview(CarReviewTask carReviewTask) {
-        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(carReviewTask.getId(),CarReviewTask.TYPE);
+        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(carReviewTask.getId(),CarReviewTask.TYPE,carReviewTask.getStandardId());
         List<ReviewTaskInbox> inboxList = reviewTaskInboxMapper.findConfirmListByTaskId(carReviewTask.getId());
         if (detailsList != null && detailsList.size() != 0) {
             throw new ServiceException("存在未填写的表单，请填写完整", HttpStatus.ERROR, detailsList);

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

@@ -92,7 +92,7 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
 
     @Override
     public void doConfirm(SystemReviewTask systemReviewTask) {
-        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(systemReviewTask.getId(),SystemReviewTask.TYPE);
+        List<ReviewDetails> detailsList = reviewDetailsMapper.findNoResult(systemReviewTask.getId(),SystemReviewTask.TYPE,systemReviewTask.getStandardId());
         List<ReviewTaskInbox> inboxList = reviewTaskInboxMapper.findConfirmListByTaskId(systemReviewTask.getId());
         if (detailsList != null && detailsList.size() != 0) {
             throw new ServiceException("存在未填写的表单，请填写完整", HttpStatus.ERROR, detailsList);

quality-review/src/main/resources/mapper/ReviewDetailsMapper.xml

@@ -16,10 +16,10 @@
 
     <select id="findNoResult" resultType="com.ruoyi.domain.ReviewDetails">
         SELECT * FROM t_review_details trd
-                          LEFT JOIN t_review_keypoint trk ON trd.review_keypoint_id = trk.id
-                          LEFT JOIN t_review_standard trs ON trk.review_standard_id = trs.id
+        LEFT JOIN t_review_keypoint trk ON trd.review_keypoint_id = trk.id
+        LEFT JOIN t_review_standard trs ON trk.review_standard_id = trs.id
         WHERE trd.id NOT IN (SELECT review_details_id FROM t_review_details_result WHERE task_id = #{taskId})
-        AND trs.type = #{type}
+        AND trs.type = #{type} AND trs.standard_id = #{standardId}
     </select>
 
     <select id="count" resultType="double">