Merge branch 'master' into 'test'

审批-分数更新

See merge request !12

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

@@ -111,6 +111,14 @@ public class QuestionnaireCtrl {
             this.questionnaireService.delView(record.getReviews().get(0).getRecordId());
             //2.添加新的备注
             this.questionnaireService.insertReview(record.getReviews(), record.getReviews().get(0).getRecordId());
+
+
+            //更新t_answer表里的分数字段，用户绩效统计使用
+            Answer answer = new Answer();
+            answer.setScore(record.getReviews().get(0).getScore());
+            answer.setRecordId(record.getReviews().get(0).getRecordId().intValue());
+            answer.setOptionsId(record.getReviews().get(0).getQuestionsId());
+            questionnaireService.updateAnswerScore(answer);
         }
         int result=this.questionnaireService.updateRecord(record);
         Map<String, Object> map = new HashMap();

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

@@ -79,4 +79,6 @@ public interface QuestionnaireDao {
     List<SpaceAndIncubation> selectSpaceAndIncubationList();
 
     List<PerformanceSummaryTotal> queryGuideAndRewardIndexList();
+
+    Integer updateAnswerScore(Answer answer);
 }

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

@@ -102,6 +102,8 @@ public interface QuestionnaireService {
   void exportFullTimeWorkPerson(HttpServletRequest request, HttpServletResponse response, String index, String recordId);
 
   void exportPerformanceSummary(HttpServletRequest request, HttpServletResponse response);
+
+  Integer updateAnswerScore(Answer answer);
 }
 
 

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

@@ -86,6 +86,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     @Override
     @Transactional
     public Integer updateRecord(Record record) {
+        //先去查询 t_review  表里的审批状态是否为通过，都是通过的状态，更新列表的审批状态为已审批=3
+
         return questionnaireDao.updateRecord(record);
     }
 
@@ -813,4 +815,9 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public  Integer updateAnswerScore(Answer answer){
+        return questionnaireDao.updateAnswerScore(answer);
+    }
 }

src/main/resources/mapper/Questionnaire.xml

@@ -576,4 +576,12 @@
 			) as queation
 			WHERE queation.isWhetherSpace IS NOT NULL;
 	</select>
+
+	<update id="updateAnswerScore">
+		UPDATE t_answer
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="score != null and score != ''">score = #{score}</if>
+		</trim>
+		WHERE record_id = #{recordId} and options_id = #{optionsId}
+	</update>
 </mapper>
\ No newline at end of file