Merge branch 'master' into 'test'

审批-通过/驳回优化

See merge request !17

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

@@ -92,14 +92,15 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
         List<Review> reviewList = questionnaireDao.selectAnswerByStatus(record.getReviews().get(0).getRecordId());
         reviewList.removeAll(Collections.singleton(null));
         if(reviewList != null){
-            for(Review review : reviewList){
-                if(review.getApprovalStatus() == 1){
-                    record.setProcessStatus(3);
-                }else if(review.getApprovalStatus() == 0){
-                    record.setProcessStatus(2);
-                }else{
-                    record.setProcessStatus(record.getProcessStatus());
-                }
+            //查询结果为一条数据，并且状态都是通过，更新列表状态为3
+            if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 1){
+                record.setProcessStatus(3);
+            }else if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 0){
+                //查询结果为一条数据，并且状态都是驳回，更新列表状态为2
+                record.setProcessStatus(2);
+            }else{
+                //列表状态为待审批
+                record.setProcessStatus(record.getProcessStatus());
             }
         }
         return questionnaireDao.updateRecord(record);

src/main/resources/mapper/Questionnaire.xml

@@ -586,7 +586,7 @@
 	<!--查询审批页面各个问题是否都是通过状态，封信列表的审批状态使用-->
 	<select id="selectAnswerByStatus" resultType="com.tiptimes.model.Review">
 		SELECT
-			approval_status
+			DISTINCT approval_status
 		FROM
 			t_review
 		WHERE