Merge branch 'master' into 'test'

Master

See merge request !29

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

@@ -102,12 +102,12 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                 //查询结果为一条数据，并且状态都是通过，更新列表状态为3
                 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
+                }else if(reviewList.size() > 1 ){
+                    //既有通过和驳回，更新列表状态为2-驳回
                     record.setProcessStatus(2);
                 }else{
                     //列表状态为待审批
-                    record.setProcessStatus(2);
+                    record.setProcessStatus(record.getProcessStatus());
                 }
             }
         }