Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
platform
Commits
ae511555
Commit
ae511555
authored
Nov 17, 2022
by
熊海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改汇总页面导出数据分数错误问题
parent
71058d56
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
115 additions
and
84 deletions
+115
-84
Questionnaire.xml
src/main/resources/mapper/Questionnaire.xml
+72
-74
questionnaire_Administration_list.jsp
...-INF/page/education/questionnaire_Administration_list.jsp
+7
-0
questionnaire_Administration_list.js
...app/res/js/education/questionnaire_Administration_list.js
+36
-10
No files found.
src/main/resources/mapper/Questionnaire.xml
View file @
ae511555
...
...
@@ -153,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
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
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
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
View file @
ae511555
...
...
@@ -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
View file @
ae511555
...
...
@@ -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
()
}
//搜索标题内容
...
...
@@ -142,4 +161,11 @@ function getTableData() {
}
})
}
showLoading
=
function
(){
$
(
'#loadingModal'
).
modal
({
backdrop
:
'static'
,
keyboard
:
false
});
}
hideLoading
=
function
(){
$
(
'#loadingModal'
).
modal
(
'hide'
);
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment