Merge remote-tracking branch 'origin/test' into test

src/main/java/com/tiptimes/dao/QuestionnaireDao.java

@@ -84,5 +84,5 @@ public interface QuestionnaireDao {
 
     List<Review> selectAnswerByStatus(@Param("recordId") Long recordId);
 
-    List<Review> selectAnswerByQuestion(@Param("recordId") Long recordId);
+    List<Integer> selectAnswerByQuestion(@Param("recordId") Long recordId);
 }

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -94,13 +94,13 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
         reviewList.removeAll(Collections.singleton(null));
 
         //查询审批页面问题通过的个数
-        List<Review> reviews = questionnaireDao.selectAnswerByQuestion(record.getReviews().get(0).getRecordId());
+        List<Integer> reviews = questionnaireDao.selectAnswerByQuestion(record.getReviews().get(0).getRecordId());
         //问题个数
-        List<Integer> list = Arrays.asList(1, 2, 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27);
+        List<Integer> list = Arrays.asList(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27);
 
         if(reviewList != null){
             //查询结果为一条数据，并且状态都是通过，更新列表状态为3
-            if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 1 && reviews.containsAll(list)){
+            if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 1 && reviews.containsAll(list) && list.containsAll(reviews)){
                 record.setProcessStatus(3);
             }else if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 0){
                 //查询结果为一条数据，并且状态都是驳回，更新列表状态为2

src/main/resources/mapper/Questionnaire.xml

@@ -64,7 +64,7 @@
 		DELETE FROM
 			t_review
         WHERE
-          record_id=#{recordId} and questions_id =#{questionsId} and approval_status = 0
+          record_id=#{recordId} and questions_id =#{questionsId}
 	</delete>
 
 	<select id="selectRecordId" resultType="java.lang.Long">
@@ -87,7 +87,7 @@
 	<select id="selectReviewByRecordId" resultType="com.tiptimes.model.Review">
 		SELECT
 			questions_id AS 'questionsId',
-			`remark`
+			`remark`,score,approval_status as approvalStatus
 		FROM
 			t_review
 		WHERE
@@ -594,7 +594,7 @@
 	</select>
 
 	<!--查询审批页面问题通过状态-->
-	<select id="selectAnswerByQuestion" resultType="com.tiptimes.model.Review">
+	<select id="selectAnswerByQuestion" resultType="integer">
 		SELECT
 			questions_id
 		FROM
@@ -602,5 +602,6 @@
 		WHERE
 		<if test="recordId != null and recordId != ''">record_id = #{recordId}</if>
 		and questions_id BETWEEN 1 AND 27
+		ORDER BY questions_id asc
 	</select>
 </mapper>
\ No newline at end of file