Merge branch 'master' into 'test'

审批-通过/驳回修改

See merge request !13

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

@@ -81,4 +81,6 @@ public interface QuestionnaireDao {
     List<PerformanceSummaryTotal> queryGuideAndRewardIndexList();
 
     Integer updateAnswerScore(Answer answer);
+
+    List<Answer> selectAnswerByStatus(@Param("recordId") Long recordId);
 }

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

@@ -15,6 +15,7 @@ import com.tiptimes.model.Record;
 import com.tiptimes.model.Review;
 import com.tiptimes.model.exportDTO.*;
 import com.tiptimes.service.QuestionnaireService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
@@ -86,7 +87,17 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     @Override
     @Transactional
     public Integer updateRecord(Record record) {
-        //先去查询 t_review  表里的审批状态是否为通过，都是通过的状态，更新列表的审批状态为已审批=3
+        //先去查询 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{
+                record.setProcessStatus(3);
+            }
+        }
 
         return questionnaireDao.updateRecord(record);
     }

src/main/resources/mapper/Questionnaire.xml

@@ -36,7 +36,7 @@
 	</insert>
 
 	<insert id="insertReview">
-		INSERT INTO t_review (`questions_id`, `remark`,'score','approval_status', `record_id`) VALUES
+		INSERT INTO t_review (`questions_id`, `remark`,`score`,`approval_status`, `record_id`) VALUES
 		<foreach collection="list" item="list" separator=",">
 			( #{list.questionsId}, #{list.remark},#{list.score}, #{list.approvalStatus} #{recordId})
 		</foreach>
@@ -577,6 +577,7 @@
 			WHERE queation.isWhetherSpace IS NOT NULL;
 	</select>
 
+	<!--更新问题表的分数，汇总统计使用-->
 	<update id="updateAnswerScore">
 		UPDATE t_answer
 		<trim prefix="SET" suffixOverrides=",">
@@ -584,4 +585,16 @@
 		</trim>
 		WHERE record_id = #{recordId} and options_id = #{optionsId}
 	</update>
+
+	<!--查询审批页面各个问题是否都是通过状态，封信列表的审批状态使用-->
+	<select id="selectAnswerByStatus" resultType="com.tiptimes.model.Answer">
+		SELECT
+			approval_status
+		FROM
+			t_answer
+		WHERE
+			approval_status != 1
+			and
+			<if test="recordId != null and recordId != ''">record_id = #{recordId}</if>
+	</select>
 </mapper>
\ No newline at end of file