Merge branch 'test' into 'master'

Test

See merge request !37

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

@@ -390,15 +390,15 @@ public class QuestionnaireCtrl {
         //列表排序
         String sorting = "";
         if(StringUtils.isEmpty(performanceSummary.getSorting())){
-            sorting = "tr.id asc";
+            sorting = "t_record.id asc";
         } else if(performanceSummary.getSorting().equals("desc")){
             sorting = "basicIndicators desc,guideIndicators desc,rewardIndicators desc";
         }else{
-            sorting = "tr.id asc";
+            sorting = "t_record.id asc";
         }
         performanceSummary.setSorting(sorting);
 
-        int totalScore = 0;
+        float totalScore = 0;
         //查询空间的不同指标的分数
         List<PerformanceSummary> performanceSummaryList = questionnaireService.selectPerformanceSummaryList(performanceSummary);
         if(performanceSummaryList.size() > 0){

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

@@ -3,10 +3,10 @@ package com.tiptimes.model;
 public class PerformanceSummary {
 
     private String optinName;//众创空间名称
-    private int basicIndicators;//基础指标得分
-    private int guideIndicators;//引导指标得分
-    private int rewardIndicators;//奖励指标得分
-    private int totalScore;//合计得分
+    private float basicIndicators;//基础指标得分
+    private float guideIndicators;//引导指标得分
+    private float rewardIndicators;//奖励指标得分
+    private float totalScore;//合计得分
 
     private String sorting; //排序使用 - desc 默认    --asc 升
 
@@ -18,35 +18,35 @@ public class PerformanceSummary {
         this.optinName = optinName;
     }
 
-    public int getBasicIndicators() {
+    public float getBasicIndicators() {
         return basicIndicators;
     }
 
-    public void setBasicIndicators(int basicIndicators) {
+    public void setBasicIndicators(float basicIndicators) {
         this.basicIndicators = basicIndicators;
     }
 
-    public int getGuideIndicators() {
+    public float getGuideIndicators() {
         return guideIndicators;
     }
 
-    public void setGuideIndicators(int guideIndicators) {
+    public void setGuideIndicators(float guideIndicators) {
         this.guideIndicators = guideIndicators;
     }
 
-    public int getRewardIndicators() {
+    public float getRewardIndicators() {
         return rewardIndicators;
     }
 
-    public void setRewardIndicators(int rewardIndicators) {
+    public void setRewardIndicators(float rewardIndicators) {
         this.rewardIndicators = rewardIndicators;
     }
 
-    public int getTotalScore() {
+    public float getTotalScore() {
         return totalScore;
     }
 
-    public void setTotalScore(int totalScore) {
+    public void setTotalScore(float totalScore) {
         this.totalScore = totalScore;
     }
 

src/main/resources/mapper/Questionnaire.xml

@@ -122,32 +122,27 @@
 	<!--绩效汇总列表查询-->
 	<select id="selectPerformanceSummaryList"  resultType="com.tiptimes.model.PerformanceSummary">
 		SELECT
-			ta.value as optinName,
-			CASE WHEN tr.process_status = 2 THEN '0' WHEN tr.process_status = 3 THEN '30' ELSE '0' END as basicIndicators,
+		DISTINCT t_answer.`value` as optinName,
+		CASE WHEN t_record.process_status = 2 THEN '0' WHEN t_record.process_status = 3 THEN '30' ELSE '0' END as basicIndicators,
 		(
 		SELECT
-				CASE WHEN COUNT(ta.score) > 50 THEN 50 WHEN COUNT(ta.score) THEN COUNT(ta.score) ELSE '0' END as score
-				FROM t_questions AS tq
-				LEFT JOIN t_answer AS ta ON ta.`group` = tq.id
-				LEFT JOIN t_record AS tr ON tr.id = ta.record_id
-				WHERE tq.`status` = 1 AND ta.`group` in('2','5','6','8','9','12','13','14','15','16')
+		CASE WHEN SUM(t_review.score) > 50 THEN 50 WHEN SUM(t_review.score) THEN SUM(t_review.score) ELSE '0' END as score
+		FROM t_review
+		WHERE t_review.questions_id IN(22,21,20,19,18,17,16,15,14,13,12,11,10) AND record_id=t_record.id
 		) as guideIndicators,
 		(
 		SELECT
-				CASE WHEN COUNT(ta.score) > 10 THEN 10 WHEN COUNT(ta.score) THEN COUNT(ta.score) ELSE '0' END as score
-				FROM t_questions AS tq
-				LEFT JOIN t_answer AS ta ON ta.`group` = tq.id
-				LEFT JOIN t_record AS tr ON tr.id = ta.record_id and ta.`group` BETWEEN 17 and 21
-				WHERE tq.`status` = 1
+		CASE WHEN SUM(t_review.score) > 10 THEN 10 WHEN SUM(t_review.score) THEN SUM(t_review.score) ELSE '0' END as score
+		FROM t_review
+		WHERE t_review.questions_id IN(27,26,25,24,23) AND record_id=t_record.id
 		) as rewardIndicators
 
-		FROM t_questions AS tq
-		LEFT JOIN t_options AS o ON o.question_id = tq.id AND o.id = '1'
-		LEFT JOIN t_answer AS ta ON ta.options_id = o.id AND ta.`group` = '1'
-		LEFT JOIN t_record AS tr ON tr.id = ta.record_id and ta.`group` BETWEEN 1 and 11
-		WHERE o.`status` = 1 and tq.`status` = 1 and tr.process_status=3 or tr.process_status=2
+		FROM t_review
+		LEFT JOIN t_record ON t_review.record_id=t_record.id
+		LEFT JOIN t_answer ON t_answer.record_id=t_review.record_id AND t_answer.options_id=1
+		WHERE t_record.process_status=3 OR t_record.process_status=2
 		<if test=" optinName!= null and optinName !=''">
-			AND  ta.value LIKE  CONCAT('%', #{optinName}, '%')
+			AND  t_answer.`value` LIKE  CONCAT('%', #{optinName}, '%')
 		</if>
 		ORDER BY
 		<if test="sorting != null and sorting != ''">
@@ -158,80 +153,78 @@
 	<!--绩效汇总导出-->
 	<select id="queryGuideAndRewardIndexList" resultType="com.tiptimes.model.exportDTO.PerformanceSummaryTotal">
 		SELECT
-			t_record.create_by as spaceName,
-				MAX( (CASE WHEN t_record.process_status=0 THEN '驳回'
-				 WHEN t_record.process_status=1 THEN '驳回'
-				 WHEN t_record.process_status=2 THEN '驳回'
-				 WHEN t_record.process_status=3 THEN '通过'
-				 ELSE '' END)) AS basisIndexOne,
-
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexTwo,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexThree,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexFour,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexFive,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexSix,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexSeven,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexEight,
-				MAX((CASE WHEN t_record.process_status=0 THEN '驳回'
-				   WHEN t_record.process_status=1 THEN '驳回'
-				   WHEN t_record.process_status=2 THEN '驳回'
-				   WHEN t_record.process_status=3 THEN '通过'
-				   ELSE '' END)) AS basisIndexNine,
-			    MAX((CASE WHEN t_record.process_status=0 THEN 0
-				   WHEN t_record.process_status=1 THEN 0
-				   WHEN t_record.process_status=2 THEN 0
+			DISTINCT t_record.create_by as spaceName,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=1 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexOne,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=2 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexTwo,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=3 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexThree,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=4 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexFour,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=5 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexFive,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=6 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexSix,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=7 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexSeven,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=8 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexEight,
+					 (CASE WHEN (SELECT t_review.approval_status FROM t_review WHERE t_review.questions_id=9 AND t_review.record_id=t_record.id)=0
+							   THEN '驳回'
+						   ELSE '通过'
+						 END
+						 )AS basisIndexNine,
+					 (CASE WHEN t_record.process_status=2 THEN 0
 						   WHEN t_record.process_status=3 THEN 30
-				   ELSE '' END)) AS basisIndexScore,
-			MAX((CASE WHEN t_answer.`group`=2 THEN t_answer.score ELSE 0 END)) AS guideIndexOne,
-			MAX((CASE WHEN t_answer.`group`=2 THEN t_answer.score ELSE 0 END)) AS guideIndexTwo,
-			MAX((CASE WHEN t_answer.`group`=5 THEN t_answer.score ELSE 0 END)) AS guideIndexThree,
-			MAX((CASE WHEN t_answer.`group`=5 THEN t_answer.score ELSE 0 END)) AS guideIndexFour,
-			MAX((CASE WHEN t_answer.`group`=6 THEN t_answer.score ELSE 0 END)) AS guideIndexFive,
-			MAX((CASE WHEN t_answer.`group`=12 THEN t_answer.score ELSE 0 END)) AS guideIndexSix,
-			MAX((CASE WHEN t_answer.`group`=8 THEN t_answer.score ELSE 0 END)) AS guideIndexSeven,
-			MAX((CASE WHEN t_answer.`group`=9 THEN t_answer.score ELSE 0 END)) AS guideIndexEight,
-			MAX((CASE WHEN t_answer.`group`=13 THEN t_answer.score ELSE 0 END)) AS guideIndexNine,
-			MAX((CASE WHEN t_answer.`group`=14 THEN t_answer.score ELSE 0 END)) AS guideIndexTen,
-			MAX((CASE WHEN t_answer.`group`=14 THEN t_answer.score ELSE 0 END)) AS guideIndexEleven,
-			MAX((CASE WHEN t_answer.`group`=15 THEN t_answer.score ELSE 0 END)) AS guideIndexTwelve,
-			MAX((CASE WHEN t_answer.`group`=16 THEN t_answer.score ELSE 0 END)) AS guideIndexThirteen,
-
-			MAX((CASE WHEN t_answer.`group`=17 THEN t_answer.score ELSE 0 END)) AS rewardIndexOne,
-			MAX((CASE WHEN t_answer.`group`=18 THEN t_answer.score ELSE 0 END)) AS rewardIndexTwo,
-			MAX((CASE WHEN t_answer.`group`=19 THEN t_answer.score ELSE 0 END)) AS rewardIndexThree,
-			MAX((CASE WHEN t_answer.`group`=20 THEN t_answer.score ELSE 0 END)) AS rewardIndexFour,
-			MAX((CASE WHEN t_answer.`group`=21 THEN t_answer.score ELSE 0 END)) AS rewardIndexFive
-		FROM t_answer
-		LEFT JOIN t_record ON t_record.id = t_answer.record_id
-		GROUP BY t_record.id
+						 END
+						 ) AS basisIndexScore,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=10 AND t_review.record_id=t_record.id)AS guideIndexOne,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=11 AND t_review.record_id=t_record.id) AS guideIndexTwo,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=12 AND t_review.record_id=t_record.id) AS guideIndexThree,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=13 AND t_review.record_id=t_record.id) AS guideIndexFour,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=14 AND t_review.record_id=t_record.id) AS guideIndexFive,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=15 AND t_review.record_id=t_record.id) AS guideIndexSix,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=16 AND t_review.record_id=t_record.id) AS guideIndexSeven,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=17 AND t_review.record_id=t_record.id) AS guideIndexEight,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=18 AND t_review.record_id=t_record.id) AS guideIndexNine,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=19 AND t_review.record_id=t_record.id) AS guideIndexTen,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=20 AND t_review.record_id=t_record.id) AS guideIndexEleven,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=21 AND t_review.record_id=t_record.id) AS guideIndexTwelve,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=22 AND t_review.record_id=t_record.id) AS guideIndexThirteen,
+
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=23 AND t_review.record_id=t_record.id) AS rewardIndexOne,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=24 AND t_review.record_id=t_record.id) AS rewardIndexTwo,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=25 AND t_review.record_id=t_record.id) AS rewardIndexThree,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=26 AND t_review.record_id=t_record.id) AS rewardIndexFour,
+					 (SELECT t_review.score FROM t_review WHERE t_review.questions_id=27 AND t_review.record_id=t_record.id) AS rewardIndexFive
+		FROM t_record
+				 RIGHT JOIN t_review ON t_record.id = t_review.record_id
+		WHERE t_record.process_status=2 OR process_status=3
 	</select>
 
 	<!--2022年10月新增加功能问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据-->

src/main/webapp/WEB-INF/page/education/questionnaire_Administration_list.jsp

@@ -94,6 +94,13 @@
         </div>
     </div>
 </div>
+<div class="modal fade" id="loadingModal" backdrop="static" keyboard="false">
+    　　<div style="width: 200px;height:20px; z-index: 20000; position: absolute; text-align: center; left: 50%; top: 50%;margin-left:-100px;margin-top:-10px">
+    　　　　<div class="progress progress-striped active" style="margin-bottom: 0;background-color:rgba(0,0,0,0)">
+    　　　　<img  src="<%=request.getContextPath()%>/res/image/loading.gif"><span style="color: white">数据加载中,请稍候...</span>
+</div>
+    　　</div>
+</div>
 <!-- 全局js -->
 <script src="<%=request.getContextPath()%>/res/js/jquery.min.js?v=2.1.4"></script>
 <script src="<%=request.getContextPath()%>/res/js/bootstrap.min.js?v=3.3.6"></script>

src/main/webapp/res/js/education/questionnaire_Administration_list.js

@@ -90,17 +90,36 @@ function sortAsc() {
 
 //导出汇总文件
 function reform_DIV_Export() {
-    $.ajax({
-        url: webroot + "questionnaire/exportPerformanceSummary",
-        method: "GET",
-        responseType: "blob",
-        success: (res) => {
-            window.location.href = webroot+"questionnaire/exportPerformanceSummary"
-        },
-        error: () => {
-            swal("失败！",'网络有问题，稍后再试', "error")
+    showLoading()
+    var url = webroot+"questionnaire/exportPerformanceSummary";
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, true);    // 也可以使用POST方式，根据接口
+    xhr.responseType = "blob";  // 返回类型blob
+    // 定义请求完成的处理函数，请求前也可以增加加载框/禁用下载按钮逻辑
+    xhr.onload = function () {
+        // 请求完成
+        if (this.status === 200) {
+            // 返回200
+            var blob = this.response;
+            var reader = new FileReader();
+            reader.readAsDataURL(blob);  // 转换为base64，可以直接放入a表情href
+            reader.onload = function (e) {
+                // 转换完成，创建一个a标签用于下载
+                var a = document.createElement('a');
+                a.download = '绩效汇总表.xls';
+                a.href = e.target.result;
+                $("body").append(a);  // 修复firefox中无法触发click
+                a.click();
+                $(a).remove();
+                hideLoading()
             }
-    })
+        }else {
+            hideLoading()
+            swal("失败！", '网络错误，稍后再试', "error");
+        }
+    };
+    // 发送ajax请求
+    xhr.send()
 }
 
 //搜索标题内容
@@ -143,3 +162,10 @@ function getTableData() {
     })
 
 }
+
+showLoading = function(){
+    $('#loadingModal').modal({backdrop: 'static', keyboard: false});
+}
+hideLoading = function(){
+    $('#loadingModal').modal('hide');
+}
\ No newline at end of file