修改暂存备注，审核小数问题，导出分数精度问题

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

@@ -7,10 +7,12 @@ import com.tiptimes.service.FileService;
 import com.tiptimes.service.QuestionnaireService;
 import com.tiptimes.util.*;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -185,19 +187,26 @@ public class QuestionnaireCtrl {
             map.put("msg", "不存在需要保存的备注");
             return map;
         }
-        int result;
 
-        //1.通过记录id删除原有备注
-        this.questionnaireService.delView(review.get(0).getRecordId(),review.get(0).getQuestionsId());
-        //2.添加新的备注
-        result=this.questionnaireService.insertReview(review,review.get(0).getRecordId());
-        if(result>0) {
-            map.put("result", true);
-            map.put("msg", "操作成功");
-        } else {
+        try {
+            questionnaireService.saveReview(review);
+        } catch (Exception e) {
             map.put("result", false);
             map.put("msg", "操作失败");
         }
+        map.put("result", true);
+        map.put("msg", "操作成功");
+        //1.通过记录id删除原有备注
+        //this.questionnaireService.delView(review.get(0).getRecordId(),review.get(0).getQuestionsId());
+        //2.添加新的备注
+        //result=this.questionnaireService.insertReview(review,review.get(0).getRecordId());
+//        if(result>0) {
+//            map.put("result", true);
+//            map.put("msg", "操作成功");
+//        } else {
+//            map.put("result", false);
+//            map.put("msg", "操作失败");
+//        }
         return map;
     }
 

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

@@ -85,4 +85,10 @@ public interface QuestionnaireDao {
     List<Review> selectAnswerByStatus(@Param("recordId") Long recordId);
 
     List<Integer> selectAnswerByQuestion(@Param("recordId") Long recordId);
+
+    Review selectOneReviewByRecordIdAndQuestionsId(@Param("recordId") Long recordId,@Param("questionsId") Long questionsId);
+
+    Integer updateOneReviewByRecordIdAndQuestionsId(@Param("review") Review review);
+
+    Integer insertOneReview(@Param("review") Review review);
 }

src/main/java/com/tiptimes/model/Answer.java

@@ -8,7 +8,7 @@ public class Answer {//上报数据表（每条上报记录的详细数据表）
     private int recordId;//上报记录id
     private String remark;//备注
 
-    private int score;//分数
+    private float score;//分数
 
     public String getRemark() {
         return remark;
@@ -58,11 +58,11 @@ public class Answer {//上报数据表（每条上报记录的详细数据表）
         this.recordId = recordId;
     }
 
-    public int getScore() {
+    public float getScore() {
         return score;
     }
 
-    public void setScore(int score) {
+    public void setScore(float score) {
         this.score = score;
     }
 

src/main/java/com/tiptimes/model/Review.java

@@ -6,22 +6,22 @@ public class Review {//评审备注详情表
     private Long recordId;//记录id
     private String remark;//驳回原因
 
-    private int score; //审批评分
-    private int approvalStatus;//审批状态，0-驳回，1-通过
+    private float score; //审批评分
+    private Integer approvalStatus;//审批状态，0-驳回，1-通过
 
-    public int getScore() {
+    public float getScore() {
         return score;
     }
 
-    public void setScore(int score) {
+    public void setScore(float score) {
         this.score = score;
     }
 
-    public int getApprovalStatus() {
+    public Integer getApprovalStatus() {
         return approvalStatus;
     }
 
-    public void setApprovalStatus(int approvalStatus) {
+    public void setApprovalStatus(Integer approvalStatus) {
         this.approvalStatus = approvalStatus;
     }
 

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

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 public interface QuestionnaireService {
   /**
@@ -104,6 +105,14 @@ public interface QuestionnaireService {
   void exportPerformanceSummary(HttpServletRequest request, HttpServletResponse response);
 
   Integer updateAnswerScore(Answer answer);
+
+  Review selectOneReviewByRecordIdAndQuestionsId( Long recordId, Long questionsId);
+
+  Integer updateOneReviewByRecordIdAndQuestionsId(Review review);
+
+  Integer insertOneReview(Review review);
+
+  Integer saveReview(List<Review> reviews) throws Exception;
 }
 
 

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

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -805,27 +806,27 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     summaryList.get(i).setIndex(i+1);
 
                     //计算引导指标和奖励指标分数
-                    Integer guideIndexScore = summaryList.get(i).getGuideIndexOne() + summaryList.get(i).getGuideIndexTwo() + summaryList.get(i).getGuideIndexThree()
+                    float guideIndexScore = summaryList.get(i).getGuideIndexOne() + summaryList.get(i).getGuideIndexTwo() + summaryList.get(i).getGuideIndexThree()
                             + summaryList.get(i).getGuideIndexFour() + summaryList.get(i).getGuideIndexFive() + summaryList.get(i).getGuideIndexSix() + summaryList.get(i).getGuideIndexSeven()
                             + summaryList.get(i).getGuideIndexEight() + summaryList.get(i).getGuideIndexNine() + summaryList.get(i).getGuideIndexTen() + summaryList.get(i).getGuideIndexEleven()
                             + summaryList.get(i).getGuideIndexTwelve() + summaryList.get(i).getGuideIndexThirteen();
-                    if(guideIndexScore >= 50){
+                    if(guideIndexScore >= 50.0){
                         summaryList.get(i).setGuideIndexScore(50);
                     }else{
                         summaryList.get(i).setGuideIndexScore(guideIndexScore);
                     }
 
                     //计算奖励指标分数
-                    Integer rewardIndexScore = summaryList.get(i).getRewardIndexOne() + summaryList.get(i).getRewardIndexTwo() + summaryList.get(i).getRewardIndexThree()
+                    float rewardIndexScore = summaryList.get(i).getRewardIndexOne() + summaryList.get(i).getRewardIndexTwo() + summaryList.get(i).getRewardIndexThree()
                             + summaryList.get(i).getRewardIndexFour() + summaryList.get(i).getRewardIndexFive();
-                    if(rewardIndexScore >= 10){
+                    if(rewardIndexScore >= 10.0){
                         summaryList.get(i).setRewardIndexScore(10);
                     }else{
                         summaryList.get(i).setRewardIndexScore(rewardIndexScore);
                     }
 
                     //总分数
-                    Integer totalScore = summaryList.get(i).getBasisIndexScore() + summaryList.get(i).getGuideIndexScore() + summaryList.get(i).getRewardIndexScore();
+                    float totalScore = summaryList.get(i).getBasisIndexScore() + summaryList.get(i).getGuideIndexScore() + summaryList.get(i).getRewardIndexScore();
                     summaryList.get(i).setTotalScore(totalScore);
                 }
                 //生成excel
@@ -844,4 +845,41 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     public  Integer updateAnswerScore(Answer answer){
         return questionnaireDao.updateAnswerScore(answer);
     }
+
+    @Override
+    public Review selectOneReviewByRecordIdAndQuestionsId(Long recordId, Long questionsId) {
+        return questionnaireDao.selectOneReviewByRecordIdAndQuestionsId(recordId,questionsId);
+    }
+
+    @Override
+    public Integer updateOneReviewByRecordIdAndQuestionsId(Review review) {
+        return questionnaireDao.updateOneReviewByRecordIdAndQuestionsId(review);
+    }
+
+    @Override
+    public Integer insertOneReview(Review review) {
+        return questionnaireDao.insertOneReview(review);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Integer saveReview(List<Review> reviews) throws Exception {
+        //结果
+        Integer result=0;
+        //遍历存在则更新，不存在则新增
+        for (Review reviewItem: reviews) {
+            if(questionnaireDao.selectOneReviewByRecordIdAndQuestionsId(reviewItem.getRecordId(),reviewItem.getQuestionsId())==null){
+                //新增
+                result+=questionnaireDao.insertOneReview(reviewItem);
+            }else {
+                //更新
+                result+= questionnaireDao.updateOneReviewByRecordIdAndQuestionsId(reviewItem);
+            }
+        }
+        if(reviews.size()==result){
+            return result;
+        }else {
+            throw new Exception();
+        }
+    }
 }

src/main/resources/mapper/Questionnaire.xml

@@ -604,4 +604,21 @@
 		and questions_id BETWEEN 1 AND 27
 		ORDER BY questions_id asc
 	</select>
+
+	<select id="selectOneReviewByRecordIdAndQuestionsId" resultType="com.tiptimes.model.Review">
+		select id,questions_id,record_id,remark,approval_status,score
+		from t_review
+		where questions_id=#{questionsId} and record_id=#{recordId}
+	</select>
+
+	<update id="updateOneReviewByRecordIdAndQuestionsId" parameterType="com.tiptimes.model.Review" >
+		update t_review
+		set remark=#{review.remark}
+		where questions_id=#{review.questionsId} and record_id=#{review.recordId}
+	</update>
+
+	<insert id="insertOneReview" parameterType="com.tiptimes.model.Review" >
+		insert into t_review(questions_id,record_id,remark)
+		values (#{review.questionsId},#{review.recordId},#{review.remark})
+	</insert>
 </mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/page/space/index.jsp

@@ -168,7 +168,7 @@
                     <ul class="nav nav-second-level">
                         <li><a class="J_menuItem"
                                href="<%=request.getContextPath()%>/goto/space/questionnaire_information"
-                        >2021年天津市高校众创空间绩效评估</a></li>
+                        >2022年天津市高校众创空间绩效评估</a></li>
                     </ul>
                 </li>
                 <%--   <li><a class="J_menuItem" href="<%=request.getContextPath()%>/goto/space/space_change_password" data-index="0"> <i class="fa fa-rotate-left"></i> <span class="nav-label">修改密码</span></a></li>

src/main/webapp/WEB-INF/page/space/questionnaire_information.jsp

@@ -108,7 +108,7 @@
         <div class="col-sm-12">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <h5 style="margin-left: 20px; font-size: 20px;text-align: center">2021年度天津市高校众创空间绩效评估</h5>
+                    <h5 style="margin-left: 20px; font-size: 20px;text-align: center">2022年度天津市高校众创空间绩效评估</h5>
                 </div>
                 <div class="ibox-content">
                     <form method="get" class="form-horizontal">