Skip to content

platform
platform
Commit 9d53cfd1 authored by 王国存's avatar 王国存
Browse files
Options

Merge branch 'test' into 'master' 

Test

See merge request !44
parents 5a5393ef 706b7cfc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 78 deletions
src/main/java/com/tiptimes/model/exportDTO/EducationCommission.java
View file @ 9d53cfd1
......@@ -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 @ 9d53cfd1
......@@ -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 @ 9d53cfd1
......@@ -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;
......@@ -518,35 +518,35 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build();
//查询数据
List<EntrepreneurshipProject> entrepreneurshipProjectList = questionnaireDao.selectEntrepreneurshipProjectList();
if (entrepreneurshipProjectList != null) {
for(int i = 0; i < entrepreneurshipProjectList.size();i++){
List<EntrepreneurshipCourses> entrepreneurshipCoursesList5 = questionnaireDao.selectEntrepreneurshipCoursesList();
if (entrepreneurshipCoursesList5 != null) {
for(int i = 0; i < entrepreneurshipCoursesList5.size();i++){
//excel生成序号
entrepreneurshipProjectList.get(i).setIndex(i+1);
entrepreneurshipCoursesList5.get(i).setIndex(i+1);
}
//生成excel
WriteSheet writeSheet0=EasyExcel.writerSheet(0,"申报成功高校众创空间联盟发布的创新创业研究课题信息")
.head(EntrepreneurshipProject.class)
WriteSheet writeSheet1=EasyExcel.writerSheet(0,"开设创新创业课程情况")
.head(EntrepreneurshipCourses.class)
.registerWriteHandler(horizontalCellStyleStrategy)
.registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
.registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
.build();
excelWriter.write(entrepreneurshipProjectList,writeSheet0);
excelWriter.write(entrepreneurshipCoursesList5,writeSheet1);
}
//查询数据
List<EntrepreneurshipCourses> entrepreneurshipCoursesList5 = questionnaireDao.selectEntrepreneurshipCoursesList();
if (entrepreneurshipCoursesList5 != null) {
for(int i = 0; i < entrepreneurshipCoursesList5.size();i++){
List<EntrepreneurshipProject> entrepreneurshipProjectList = questionnaireDao.selectEntrepreneurshipProjectList();
if (entrepreneurshipProjectList != null) {
for(int i = 0; i < entrepreneurshipProjectList.size();i++){
//excel生成序号
entrepreneurshipCoursesList5.get(i).setIndex(i+1);
entrepreneurshipProjectList.get(i).setIndex(i+1);
}
WriteSheet writeSheet1=EasyExcel.writerSheet(1,"开设创新创业课程情况")
.head(EntrepreneurshipCourses.class)
//生成excel
WriteSheet writeSheet0=EasyExcel.writerSheet(1,"申报成功高校众创空间联盟发布的创新创业研究课题信息")
.head(EntrepreneurshipProject.class)
.registerWriteHandler(horizontalCellStyleStrategy)
.registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
.registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
.build();
excelWriter.write(entrepreneurshipCoursesList5,writeSheet1);
excelWriter.write(entrepreneurshipProjectList,writeSheet0);
}
excelWriter.finish();
response.flushBuffer();
......
src/main/resources/mapper/Questionnaire.xml
View file @ 9d53cfd1
This diff is collapsed.
src/main/webapp/WEB-INF/page/education/questionnaire_Information_list.jsp
View file @ 9d53cfd1
......@@ -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 @ 9d53cfd1
......@@ -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 @ 9d53cfd1
......@@ -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 @ 9d53cfd1
......@@ -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 @ 9d53cfd1
......@@ -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