Skip to content

platform
platform
Commit a6945ca2 authored by 熊海's avatar 熊海
Browse files
Options

修改页面显示年份问题，导出数据出错问题，页面表格行数回显问题

parent dc5382d0
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 44 deletions
src/main/java/com/tiptimes/model/exportDTO/EducationCommission.java
View file @ a6945ca2
......@@ -23,7 +23,7 @@ public class EducationCommission {
private String organizedCompetition;
@ExcelProperty({"获得创客马拉松大赛及市教委组织的其他双创大赛奖项情况","获得奖项"})
private String WonPrizes;
private String wonPrizes;
@ExcelProperty({"获得创客马拉松大赛及市教委组织的其他双创大赛奖项情况","获奖团队"})
private String winningTeam;
......@@ -67,11 +67,11 @@ public class EducationCommission {
}
public String getWonPrizes() {
return WonPrizes;
return wonPrizes;
}
public void setWonPrizes(String wonPrizes) {
WonPrizes = wonPrizes;
this.wonPrizes = wonPrizes;
}
public String getWinningTeam() {
......
src/main/java/com/tiptimes/model/exportDTO/OrganizationActivity.java
View file @ a6945ca2
......@@ -29,6 +29,17 @@ public class OrganizationActivity {
@ExcelProperty({"组织双创活动情况","平台中有活动新闻"})
private String platformNews;
@ExcelProperty({"组织双创活动情况","新闻中含一张以上照片"})
private String platformNewsPhoto;
public String getPlatformNewsPhoto() {
return platformNewsPhoto;
}
public void setPlatformNewsPhoto(String platformNewsPhoto) {
this.platformNewsPhoto = platformNewsPhoto;
}
public Integer getIndex() {
return index;
}
......
src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java
View file @ a6945ca2
......@@ -222,7 +222,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
//需要合并的列
int[] mergeColumeIndex = {1};
// 从第二行后开始合并
int mergeRowIndex = 2;
int mergeRowIndex = 1;
switch (index) {
case "1":
......@@ -495,18 +495,18 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
String fileName_ee = "引导指标五";
response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_ee).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
//查询数据
List<SigningMentors> leadingIndicatorFiveList = questionnaireDao.selectSigningMentorsList();
if (leadingIndicatorFiveList != null) {
for(int i = 0; i < leadingIndicatorFiveList.size();i++){
List<EmploymentSituation> employmentSituationList1 = questionnaireDao.selectEmploymentSituationList();
if (employmentSituationList1 != null) {
for(int i = 0; i < employmentSituationList1.size();i++){
//excel生成序号
leadingIndicatorFiveList.get(i).setIndex(i+1);
employmentSituationList1.get(i).setIndex(i+1);
}
//生成excel
EasyExcel.write(response.getOutputStream(),SigningMentors.class).sheet("引导指标五").
EasyExcel.write(response.getOutputStream(),EmploymentSituation.class).sheet("新增就业情况").
registerWriteHandler(horizontalCellStyleStrategy)
.registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
.registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
.doWrite(leadingIndicatorFiveList);
.doWrite(employmentSituationList1);
response.flushBuffer();
}
break;
......
src/main/resources/mapper/Questionnaire.xml
View file @ a6945ca2
......@@ -367,7 +367,8 @@
MAX(IF(options_id = 52,`value`,NULL)) as activityTime,
MAX(IF(options_id = 53,`value`,NULL)) as theme,
MAX(IF(options_id = 54,`value`,NULL)) as activityType,
MAX(IF(options_id = 55,`value`,NULL)) as platformNews
MAX(IF(options_id = 55,`value`,NULL)) as platformNews,
MAX(IF(options_id = 56,`value`,NULL)) as platformNewsPhoto
FROM t_answer
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
......@@ -381,9 +382,9 @@
(
SELECT
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 56,`value`,NULL)) as eventName,
MAX(IF(options_id = 57,`value`,NULL)) as organizer,
MAX(IF(options_id = 58,`value`,NULL)) as projectName
MAX(IF(options_id = 57,`value`,NULL)) as eventName,
MAX(IF(options_id = 58,`value`,NULL)) as organizer,
MAX(IF(options_id = 59,`value`,NULL)) as projectName
FROM t_answer
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
......@@ -413,7 +414,7 @@
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 62,`value`,NULL)) as issueNumber,
MAX(IF(options_id = 63,`value`,NULL)) as projectName,
MAX(IF(options_id = 61,`value`,NULL)) as projectLeaderName
MAX(IF(options_id = 64,`value`,NULL)) as projectLeaderName
FROM t_answer
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
......@@ -446,7 +447,7 @@
MAX(IF(options_id = 68,`value`,NULL)) as financingEnterpriseName,
MAX(IF(options_id = 69,`value`,NULL)) as financingAmount,
MAX(IF(options_id = 70,`value`,NULL)) as financingWay,
MAX(IF(options_id = 67,`value`,NULL)) as isSupportingMaterials
MAX(IF(options_id = 71,`value`,NULL)) as isSupportingMaterials
FROM t_answer
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
......@@ -460,9 +461,9 @@
(
SELECT
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 71,`value`,NULL)) as activitiesName,
MAX(IF(options_id = 72,`value`,NULL)) as activitiesFrom,
MAX(IF(options_id = 73,`value`,NULL)) as municipalLevel
MAX(IF(options_id = 72,`value`,NULL)) as activitiesName,
MAX(IF(options_id = 73,`value`,NULL)) as activitiesFrom,
MAX(IF(options_id = 74,`value`,NULL)) as municipalLevel
FROM t_answer
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
......@@ -476,8 +477,8 @@
(
SELECT
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 74,`value`,NULL)) as activitiesName,
MAX(IF(options_id = 75,`value`,NULL)) as activitiesFrom
MAX(IF(options_id = 75,`value`,NULL)) as activitiesName,
MAX(IF(options_id = 76,`value`,NULL)) as activitiesFrom
FROM t_answer
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
......@@ -491,11 +492,11 @@
(
SELECT
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 76,`value`,NULL)) as enterpriseName,
MAX(IF(options_id = 77,`value`,NULL)) as forTime,
MAX(IF(options_id = 78,`value`,NULL)) as acquiredType,
MAX(IF(options_id = 79,`value`,NULL)) as serialNumber,
MAX(IF(options_id = 80,`value`,NULL)) as supportingMaterials
MAX(IF(options_id = 77,`value`,NULL)) as enterpriseName,
MAX(IF(options_id = 78,`value`,NULL)) as forTime,
MAX(IF(options_id = 79,`value`,NULL)) as acquiredType,
MAX(IF(options_id = 80,`value`,NULL)) as serialNumber,
MAX(IF(options_id = 81,`value`,NULL)) as supportingMaterials
FROM t_answer
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
......@@ -513,7 +514,7 @@
MAX(IF(options_id = 83,`value`,NULL)) as prizes,
MAX(IF(options_id = 84,`value`,NULL)) as winningTeam,
MAX(IF(options_id = 85,`value`,NULL)) as winningProject,
MAX(IF(options_id = 81,`value`,NULL)) as isSupportingMaterials
MAX(IF(options_id = 86,`value`,NULL)) as isSupportingMaterials
FROM t_answer
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
......@@ -529,10 +530,10 @@
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 87,`value`,NULL)) as eventName,
MAX(IF(options_id = 88,`value`,NULL)) as organizedCompetition,
MAX(IF(options_id = 89,`value`,NULL)) as WonPrizes,
MAX(IF(options_id = 89,`value`,NULL)) as wonPrizes,
MAX(IF(options_id = 90,`value`,NULL)) as winningTeam,
MAX(IF(options_id = 91,`value`,NULL)) as winningProject,
MAX(IF(options_id = 86,`value`,NULL)) as supportingMaterials
MAX(IF(options_id = 92,`value`,NULL)) as supportingMaterials
FROM t_answer
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
......@@ -549,7 +550,7 @@
MAX(IF(options_id = 93,`value`,NULL)) as theYear,
MAX(IF(options_id = 94,`value`,NULL)) as projectName,
MAX(IF(options_id = 95,`value`,NULL)) as isWhetherProject,
MAX(IF(options_id = 92,`value`,NULL)) as isOutstandingProject
MAX(IF(options_id = 96,`value`,NULL)) as isOutstandingProject
FROM t_answer
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
......@@ -563,8 +564,8 @@
(
SELECT
t_answer.`group`,t_record.create_by as spaceName,
MAX(IF(options_id = 96,`value`,NULL)) as isWhetherSpace,
MAX(IF(options_id = 97,`value`,NULL)) as isWhetherIncubation
MAX(IF(options_id = 97,`value`,NULL)) as isWhetherSpace,
MAX(IF(options_id = 98,`value`,NULL)) as isWhetherIncubation
FROM t_answer
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
......
src/main/webapp/WEB-INF/page/education/questionnaire_Information_list.jsp
View file @ a6945ca2
......@@ -135,8 +135,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<span style="line-height: 14px"><input name="index" type="radio" value="23">奖励指标1</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="24">奖励指标2</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="25">奖励指标3</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="26">奖励指标4</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<span style="line-height: 14px"><input name="index" type="radio" value="27">奖励指标5</span>
<span style="line-height: 14px"><input name="index" type="radio" value="26">奖励指标4、5</span>&emsp;&emsp;&emsp;&emsp;&emsp;
<%-- <span style="line-height: 14px"><input name="index" type="radio" value="27">奖励指标5</span>--%>
</div>
<br>
<div class="ibox-content">
......
src/main/webapp/WEB-INF/page/education/questionnaire_information.jsp
View file @ a6945ca2
......@@ -497,7 +497,7 @@
style="font-size: 15px;padding-left: 25px">开设创新创业课程情况:</label>
</div>
<div class="form-group">
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<div id="goDie1" style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
<table class="newCourse" border="1"
style="max-width: 1000px">
<thead>
......@@ -1010,7 +1010,7 @@
<form class="form-horizontal m-t" id="commentForm">
<div class="form-group">
<label class="col-sm-3"
style="font-size: 15px;padding-left: 25px">1.2021年创新创业工作经费（万元）</label>
style="font-size: 15px;padding-left: 25px">1.本年创新创业工作经费（万元）</label>
<div class="col-sm-4">
<div class="form-control" name="option_60"></div>
<label class="grayTip">仅支持2位小数, 如1234.00</label>
......@@ -1477,12 +1477,23 @@
<div class="ibox-tools"><a class="collapse-link"><i
class="fa fa-chevron-up"></i></a></div>
<h5 class="inline" style="font-size: 15px">
引导指标6:申报成功高校众创空间联盟发布的创新创业研究课题，每项1分，2分封顶</h5>
引导指标6:(1)开设创新创业课程每门不低于16学时，且有视频网课展示，每增加1门加1分，3分封顶</h5>
<br>
<h5 class="inline" style="font-size: 15px">&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&nbsp;(2)申报成功高校众创空间联盟发布的创新创业研究课题，每项1分，2分封顶</h5>
<div class="ibox-content" style="display: none">
<form class="form-horizontal m-t" id="commentForm">
<div class="form-group">
<label class="col-sm-6"
style="font-size: 15px;padding-left: 25px">申报成功高校众创空间联盟发布的创新创业研究课题信息:</label>
<h4>(1)开设创新创业课程每门不低于16学时，且有视频网课展示，每增加1门加1分，3分封顶</h4>
<label class="col-sm-6" style="font-size: 15px;padding-left: 25px">开设创新创业课程情况:</label>
</div>
<div class="form-group">
<div id="goDie2" style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
</div>
</div>
<div class="form-group">
<h4>(2)申报成功高校众创空间联盟发布的创新创业研究课题，每项1分，2分封顶</h4>
<label class="col-sm-6" style="font-size: 15px;padding-left: 25px">申报成功高校众创空间联盟发布的创新创业研究课题信息:</label>
</div>
<div class="form-group">
<div style="width:1000px;overflow-x: auto;border: #333333 1px;margin-bottom: 15px">
......
src/main/webapp/WEB-INF/page/space/questionnaire_information.jsp
View file @ a6945ca2
......@@ -1092,7 +1092,7 @@
<div class="form-group draggable">
<div class="col-sm-10">
<div class="row" style="padding-left: 40px">
<label class="question_label">2021年创新创业工作经费（万元） ：</label>
<label class="question_label">本年创新创业工作经费（万元） ：</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="option_60">
<label class="grayTip">仅支持2位小数, 如1234.00</label>
......@@ -2294,6 +2294,7 @@
<option value="2019">2019</option>
<option value="2020">2020</option>
<option value="2021">2021</option>
<option value="2022">2022</option>
<option value="其他">其他</option>
</select>
</td>
......@@ -2585,6 +2586,7 @@
<option value="">——请选择——</option>
<option value="2020年度">2020年度</option>
<option value="2021年度">2021年度</option>
<option value="2022年度">2022年度</option>
</select>
</td>
<td><input class="td-class" type=""
......
src/main/webapp/res/js/education/questionnaire_Information.js
View file @ a6945ca2
......@@ -127,14 +127,14 @@ var option_list = [
{ num: 2, name: '2.众创空间场地情况', table: '', max: 0 },
{ num: 3, name: '3.是否租赁场地', table: '', max: 0 },
{ num: 4, name: '4.众创空间配备专职工作人员情况', table: 'professionalEmploy', max: 20 },
{ num: 5, name: '5.入孵企业情况', table: 'incubates', max: 80 },
{ num: 5, name: '5.入孵企业情况', table: 'incubates', max: 55 },
{ num: 6, name: '6.新增就业情况', table: 'newPost', max: 80 },
{ num: 7, name: '7.开设创新创业课程情况', table: 'newCourse', max: 20 },
{ num: 8, name: '8.签约创业导师情况', table: 'newTeacher', max: 40 },
{ num: 9, name: '9.组织双创活动情况', table: 'activity', max: 13 },
{ num: 10, name: '10.参赛情况', table: 'competition', max: 5 },
{ num: 11, name: '11.2021年创新创业工作经费', table: '', max: 0 },
{ num: 12, name: '12.申报成功高校众创空间联盟发布的创新创业研究课题信息', table: 'twelve', max: 2 },
{ num: 12, name: '12.申报成功高校众创空间联盟发布的创新创业研究课题信息', table: 'twelve', max: 6 },
{ num: 13, name: '13.在孵企业销售收入或累计合同额情况(表1)', table: 'thirteen', max: 80 },
{ num: 14, name: '13.本评估周期实现股权或债权融资情况(表2)', table: 'borrow', max: 10 },
{ num: 15, name: '14.主办或承办市级及以上级别路演、双创周活动', table: 'fourteen', max: 10 },
......@@ -923,7 +923,9 @@ function synchronizeUpperAndLowerFormContents() {
text8.attr("disabled","disabled")
$("#guidingindicators8 #submit17").prepend(text8)
var table1=$("#goDie1 table").clone(false)
$("#goDie2").append(table1)
$("#goDie2 table").removeAttr("class","newCourse")
})
}
......@@ -1061,7 +1063,7 @@ function scoreSubmission(questionNum) {
//引导指标6
case 15:
var tempObj = {};
if($(`#submit${questionNum} input`).val()<0||$(`#submit${questionNum} input`).val()>2){
if($(`#submit${questionNum} input`).val()<0||$(`#submit${questionNum} input`).val()>5){
swal('失败','分数不符合预期！','error')
return
}
......
src/main/webapp/res/js/space/questionnaire_Information.js
View file @ a6945ca2
......@@ -1183,6 +1183,7 @@ $(function () {
$("#guidingindicators8 select").attr("disabled", "disabled")
$("#guidingindicators8 #rejectMessage7").hide()
$("#guidingindicators8").removeAttr('class','ibox-content')
$("#guidingindicators8 table").removeAttr('class','activity')
})
})
\ No newline at end of file
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