Merge branch 'master' into 'test'

Master

See merge request !16

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -108,7 +108,7 @@ public class QuestionnaireCtrl {
     public Map<String, Object> checkReject(@RequestBody Record record){
         if(record.getReviews()!=null) {
             //1.通过记录id删除原有备注
-            this.questionnaireService.delView(record.getReviews().get(0).getRecordId());
+            this.questionnaireService.delView(record.getReviews().get(0).getRecordId(),record.getReviews().get(0).getQuestionsId());
             //2.添加新的备注
             this.questionnaireService.insertReview(record.getReviews(), record.getReviews().get(0).getRecordId());
 
@@ -147,7 +147,7 @@ public class QuestionnaireCtrl {
                     request.getSession().getAttribute("realID").toString());
         }
         //1.根据记录id查询上报数据详情
-        List<Answer>answerList=this.questionnaireService.selectAnswerByRecordId(recordId);
+        List<Answer> answerList=this.questionnaireService.selectAnswerByRecordId(recordId);
         //2.根据记录id查询审核备注详情
         List<Review> reviews=this.questionnaireService.selectReviewByRecordId(recordId);
         Map<String, Object> map = new HashMap();
@@ -187,7 +187,7 @@ public class QuestionnaireCtrl {
         }
         int result;
         //1.通过记录id删除原有备注
-        this.questionnaireService.delView(review.get(0).getRecordId());
+        this.questionnaireService.delView(review.get(0).getRecordId(),review.get(0).getQuestionsId());
         //2.添加新的备注
         result=this.questionnaireService.insertReview(review,review.get(0).getRecordId());
         if(result>0) {

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

@@ -23,7 +23,7 @@ public interface QuestionnaireDao {
 
     Integer updateRecord(Record record);
 
-    Integer delView(@Param("recordId")Long recordId);
+    Integer delView(@Param("recordId")Long recordId,@Param("questionsId")Long questionsId);
 
     Integer insertReview(@Param("list") List<Review> list, @Param("recordId")Long recordId);
 
@@ -82,5 +82,5 @@ public interface QuestionnaireDao {
 
     Integer updateAnswerScore(Answer answer);
 
-    List<Answer> selectAnswerByStatus(@Param("recordId") Long recordId);
+    List<Review> selectAnswerByStatus(@Param("recordId") Long recordId);
 }

src/main/java/com/tiptimes/service/QuestionnaireService.java

@@ -55,7 +55,7 @@ public interface QuestionnaireService {
    * @param recordId
    * @return
    */
-  Integer delView(Long recordId);
+  Integer delView(Long recordId,Long questionsId);
 
   /**
    * 添加新的备注

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
 import java.util.List;
 
 
@@ -88,17 +89,19 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     @Transactional
     public Integer updateRecord(Record record) {
         //先去查询 t_review  表里的审批状态是否全部为通过，都是通过的状态，更新列表的审批状态为已审批=3
-        Integer processStatus;
-        List<Answer> answerList = questionnaireDao.selectAnswerByStatus(record.getReviews().get(0).getRecordId());
-        if(CollectionUtils.isNotEmpty(answerList)){
-            if(answerList.size() > 0){
-                processStatus = record.getProcessStatus();
-                record.setProcessStatus(processStatus);
-            }else{
+        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());
+                }
             }
         }
-
         return questionnaireDao.updateRecord(record);
     }
 
@@ -109,8 +112,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
      */
     @Override
     @Transactional
-    public Integer delView(Long recordId) {
-        return questionnaireDao.delView(recordId);
+    public Integer delView(Long recordId,Long questionsId) {
+        return questionnaireDao.delView(recordId,questionsId);
     }
 
     /**

src/main/resources/mapper/Questionnaire.xml

@@ -64,7 +64,7 @@
 		DELETE FROM
 			t_review
         WHERE
-          record_id=#{recordId}
+          record_id=#{recordId} and questions_id =#{questionsId} and approval_status = 0
 	</delete>
 
 	<select id="selectRecordId" resultType="java.lang.Long">
@@ -584,14 +584,12 @@
 	</update>
 
 	<!--查询审批页面各个问题是否都是通过状态，封信列表的审批状态使用-->
-	<select id="selectAnswerByStatus" resultType="com.tiptimes.model.Answer">
+	<select id="selectAnswerByStatus" resultType="com.tiptimes.model.Review">
 		SELECT
 			approval_status
 		FROM
-			t_answer
+			t_review
 		WHERE
-			approval_status != 1
-			and
 			<if test="recordId != null and recordId != ''">record_id = #{recordId}</if>
 	</select>
 </mapper>
\ No newline at end of file