Skip to content

platform
platform
Commit 8fa6c2a5 authored by 李楠's avatar 李楠
Browse files
Options

Merge branch 'test' into 'master' 

处理审核页面小数输入问题和导出数据显示状态问题

See merge request !41
parents 16d49bd1 71723d35
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 44 deletions
src/main/resources/mapper/Questionnaire.xml
View file @ 8fa6c2a5
......@@ -122,7 +122,8 @@
<!--绩效汇总列表查询-->
<select id="selectPerformanceSummaryList" resultType="com.tiptimes.model.PerformanceSummary">
SELECT
DISTINCT t_record.id,t_answer.`value` as optinName,
DISTINCT t_record.id as id,
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
......@@ -153,7 +154,8 @@
<!--绩效汇总导出-->
<select id="queryGuideAndRewardIndexList" resultType="com.tiptimes.model.exportDTO.PerformanceSummaryTotal">
SELECT
DISTINCT t_record.create_by as spaceName,
DISTINCT t_record.id as id,
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 '通过'
......@@ -239,7 +241,7 @@
MAX(IF(options_id = 6,`value`,NULL)) as locationNumber,
MAX(IF(options_id = 7,`value`,NULL)) as leasePremises
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.area IS NOT NULL
......@@ -258,7 +260,7 @@
MAX(IF(options_id = 13,`value`,NULL)) as phone,
MAX(IF(options_id = 14,`value`,NULL)) as isfulltime
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
<!--where-->
<!--<if test="recordId != null and recordId != ''">-->
<!--t_answer.record_id = #{recordId}-->
......@@ -280,7 +282,7 @@
MAX(IF(options_id = 19,`value`,NULL)) as isSubmitIncubation,
MAX(IF(options_id = 20,`value`,NULL)) as isEntryYear
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.enterpriseName IS NOT NULL
......@@ -297,7 +299,7 @@
MAX(IF(options_id = 23,`value`,NULL)) as isAgreementMaterials,
MAX(IF(options_id = 24,`value`,NULL)) as isAssessmentPeriod
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.enterpriseName IS NOT NULL
......@@ -320,7 +322,7 @@
MAX(IF(options_id = 33,`value`,NULL)) as isNetworkConnection,
MAX(IF(options_id = 34,`value`,NULL)) as alliance
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.courseName IS NOT NULL
......@@ -350,7 +352,7 @@
MAX(IF(options_id = 50,`value`,NULL)) as mentor,
MAX(IF(options_id = 51,`value`,NULL)) as isSupporting
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.mentorName IS NOT NULL
......@@ -367,7 +369,7 @@
MAX(IF(options_id = 54,`value`,NULL)) as activityType,
MAX(IF(options_id = 55,`value`,NULL)) as platformNews
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.activityTime IS NOT NULL
......@@ -383,7 +385,7 @@
MAX(IF(options_id = 57,`value`,NULL)) as organizer,
MAX(IF(options_id = 58,`value`,NULL)) as projectName
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.eventName IS NOT NULL
......@@ -397,7 +399,7 @@
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 60,`value`,NULL)) as funding
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.funding IS NOT NULL;
......@@ -413,7 +415,7 @@
MAX(IF(options_id = 63,`value`,NULL)) as projectName,
MAX(IF(options_id = 61,`value`,NULL)) as projectLeaderName
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.issueNumber IS NOT NULL;
......@@ -429,7 +431,7 @@
MAX(IF(options_id = 66,`value`,NULL)) as contractAmount,
MAX(IF(options_id = 67,`value`,NULL)) as isSupportingMaterials
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.enterpriseName IS NOT NULL;
......@@ -446,7 +448,7 @@
MAX(IF(options_id = 70,`value`,NULL)) as financingWay,
MAX(IF(options_id = 67,`value`,NULL)) as isSupportingMaterials
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.financingEnterpriseName IS NOT NULL;
......@@ -462,7 +464,7 @@
MAX(IF(options_id = 72,`value`,NULL)) as activitiesFrom,
MAX(IF(options_id = 73,`value`,NULL)) as municipalLevel
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.activitiesName IS NOT NULL;
......@@ -477,7 +479,7 @@
MAX(IF(options_id = 74,`value`,NULL)) as activitiesName,
MAX(IF(options_id = 75,`value`,NULL)) as activitiesFrom
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.activitiesName IS NOT NULL;
......@@ -495,7 +497,7 @@
MAX(IF(options_id = 79,`value`,NULL)) as serialNumber,
MAX(IF(options_id = 80,`value`,NULL)) as supportingMaterials
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.enterpriseName IS NOT NULL;
......@@ -513,7 +515,7 @@
MAX(IF(options_id = 85,`value`,NULL)) as winningProject,
MAX(IF(options_id = 81,`value`,NULL)) as isSupportingMaterials
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.track IS NOT NULL;
......@@ -532,7 +534,7 @@
MAX(IF(options_id = 91,`value`,NULL)) as winningProject,
MAX(IF(options_id = 86,`value`,NULL)) as supportingMaterials
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.eventName IS NOT NULL;
......@@ -549,7 +551,7 @@
MAX(IF(options_id = 95,`value`,NULL)) as isWhetherProject,
MAX(IF(options_id = 92,`value`,NULL)) as isOutstandingProject
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.theYear IS NOT NULL;
......@@ -564,7 +566,7 @@
MAX(IF(options_id = 96,`value`,NULL)) as isWhetherSpace,
MAX(IF(options_id = 97,`value`,NULL)) as isWhetherIncubation
FROM t_answer
LEFT JOIN t_record ON t_record.id = t_answer.record_id
LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
GROUP BY t_answer.`group`,t_record.create_by
) as queation
WHERE queation.isWhetherSpace IS NOT NULL;
......
src/main/webapp/res/js/education/questionnaire_Information.js
View file @ 8fa6c2a5
......@@ -28,7 +28,7 @@ function StatusCheck() {
if (processStatus === 1){
$('#goback_btn').hide()
for (let i = 1; i < 28; i++) {
$(`#submit${i} input[type='number']`).val(()=>{
$(`#submit${i} input[data-myAttr='score']`).val(()=>{
try {
if(data.reviews.length>0){
for(var j=0;j<data.reviews.length;j++){
......@@ -64,7 +64,7 @@ function StatusCheck() {
//$('textarea[name*="question_"]').prop('readonly', true)
for (let i = 1; i < 28; i++) {
$(`#submit${i} a`).hide()
$(`#submit${i} input[type='number']`).val(()=>{
$(`#submit${i} input[data-myAttr='score']`).val(()=>{
try {
if(data.reviews.length>0){
for(var j=0;j<data.reviews.length;j++){
......@@ -103,7 +103,7 @@ function StatusCheck() {
for (let i = 1; i < 28; i++) {
$(`#submit${i} a`).hide()
$(`#submit${i} input[type='radio']`).parent().hide()
$(`#submit${i} input[type='number']`).val(()=>{
$(`#submit${i} input[data-myAttr='score']`).val(()=>{
try {
if(data.reviews.length>0){
for(var j=0;j<data.reviews.length;j++){
......@@ -116,7 +116,7 @@ function StatusCheck() {
}
})
$(`#submit${i} input[type='number']`).attr('disabled',"true")
$(`#submit${i} input[data-myAttr='score']`).attr('disabled',"true")
}
}
}
......@@ -1273,7 +1273,7 @@ function scoreSubmission(questionNum) {
//取消按钮
function emptyContent(questionNum) {
$(`#submit${questionNum} input[type='radio']`).removeAttr("checked")
$(`#submit${questionNum} input[type='number']`).val('')
$(`#submit${questionNum} input[data-myAttr='score']`).val('')
$(`#submit${questionNum} textarea[name='question_${questionNum}']`).val('')
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment