Commit 1e7e18a7 authored by 王国存's avatar 王国存

审批-通过/驳回优化

parent 9375538b
...@@ -92,14 +92,15 @@ public class QuestionnaireServiceImpl implements QuestionnaireService { ...@@ -92,14 +92,15 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
List<Review> reviewList = questionnaireDao.selectAnswerByStatus(record.getReviews().get(0).getRecordId()); List<Review> reviewList = questionnaireDao.selectAnswerByStatus(record.getReviews().get(0).getRecordId());
reviewList.removeAll(Collections.singleton(null)); reviewList.removeAll(Collections.singleton(null));
if(reviewList != null){ if(reviewList != null){
for(Review review : reviewList){ //查询结果为一条数据,并且状态都是通过,更新列表状态为3
if(review.getApprovalStatus() == 1){ if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 1){
record.setProcessStatus(3); record.setProcessStatus(3);
}else if(review.getApprovalStatus() == 0){ }else if(reviewList.size() == 1 && reviewList.get(0).getApprovalStatus() == 0){
record.setProcessStatus(2); //查询结果为一条数据,并且状态都是驳回,更新列表状态为2
}else{ record.setProcessStatus(2);
record.setProcessStatus(record.getProcessStatus()); }else{
} //列表状态为待审批
record.setProcessStatus(record.getProcessStatus());
} }
} }
return questionnaireDao.updateRecord(record); return questionnaireDao.updateRecord(record);
......
...@@ -586,7 +586,7 @@ ...@@ -586,7 +586,7 @@
<!--查询审批页面各个问题是否都是通过状态,封信列表的审批状态使用--> <!--查询审批页面各个问题是否都是通过状态,封信列表的审批状态使用-->
<select id="selectAnswerByStatus" resultType="com.tiptimes.model.Review"> <select id="selectAnswerByStatus" resultType="com.tiptimes.model.Review">
SELECT SELECT
approval_status DISTINCT approval_status
FROM FROM
t_review t_review
WHERE WHERE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment