Commit 6f0f52a1 authored by 王国存's avatar 王国存

1、绩效汇总列表排序修改;

2、绩效汇总导出优化
parent 02cd3b86
...@@ -371,11 +371,11 @@ public class QuestionnaireCtrl { ...@@ -371,11 +371,11 @@ public class QuestionnaireCtrl {
//列表排序 //列表排序
String sorting = ""; String sorting = "";
if(StringUtils.isEmpty(performanceSummary.getSorting())){ if(StringUtils.isEmpty(performanceSummary.getSorting())){
sorting = "tr.create_time desc"; sorting = "tr.id asc";
} else if(performanceSummary.getSorting().equals("desc")){ } else if(performanceSummary.getSorting().equals("desc")){
sorting = "tr.create_time desc"; sorting = "tr.id asc";
}else{ }else{
sorting = "basicIndicators,guideIndicators,rewardIndicators desc"; sorting = "basicIndicators desc,guideIndicators desc,rewardIndicators desc";
} }
performanceSummary.setSorting(sorting); performanceSummary.setSorting(sorting);
......
...@@ -17,91 +17,91 @@ public class PerformanceSummaryTotal { ...@@ -17,91 +17,91 @@ public class PerformanceSummaryTotal {
@ExcelProperty(value="空间名称",index=1) @ExcelProperty(value="空间名称",index=1)
private String spaceName; private String spaceName;
@ExcelProperty({"基础指标","基础指标一"}) @ExcelProperty({"基础指标","基础指标一","场地"})
private String basisIndexOne; private String basisIndexOne;
@ExcelProperty({"基础指标","基础指标二"}) @ExcelProperty({"基础指标","基础指标二","专职人员"})
private String basisIndexTwo; private String basisIndexTwo;
@ExcelProperty({"基础指标","基础指标三"}) @ExcelProperty({"基础指标","基础指标三","在孵企业"})
private String basisIndexThree; private String basisIndexThree;
@ExcelProperty({"基础指标","基础指标四"}) @ExcelProperty({"基础指标","基础指标四","新增就业"})
private String basisIndexFour; private String basisIndexFour;
@ExcelProperty({"基础指标","基础指标五"}) @ExcelProperty({"基础指标","基础指标五","双创课程"})
private String basisIndexFive; private String basisIndexFive;
@ExcelProperty({"基础指标","基础指标六"}) @ExcelProperty({"基础指标","基础指标六","创业导师"})
private String basisIndexSix; private String basisIndexSix;
@ExcelProperty({"基础指标","基础指标七"}) @ExcelProperty({"基础指标","基础指标七","组织活动"})
private String basisIndexSeven; private String basisIndexSeven;
@ExcelProperty({"基础指标","基础指标八"}) @ExcelProperty({"基础指标","基础指标八","参赛情况"})
private String basisIndexEight; private String basisIndexEight;
@ExcelProperty({"基础指标","基础指标九"}) @ExcelProperty({"基础指标","基础指标九","创业经费"})
private String basisIndexNine; private String basisIndexNine;
@ExcelProperty({"基础指标","分数"}) @ExcelProperty({"基础指标","分数"})
private Integer basisIndexScore; private Integer basisIndexScore;
@ExcelProperty({"引导指标","引导指标一"}) @ExcelProperty({"引导指标","引导指标一","面积"})
private Integer guideIndexOne; private Integer guideIndexOne;
@ExcelProperty({"引导指标","引导指标二"}) @ExcelProperty({"引导指标","引导指标二","工位"})
private Integer guideIndexTwo; private Integer guideIndexTwo;
@ExcelProperty({"引导指标","引导指标三"}) @ExcelProperty({"引导指标","引导指标三","入驻企业总数"})
private Integer guideIndexThree; private Integer guideIndexThree;
@ExcelProperty({"引导指标","引导指标四"}) @ExcelProperty({"引导指标","引导指标四","新增企业"})
private Integer guideIndexFour; private Integer guideIndexFour;
@ExcelProperty({"引导指标","引导指标五"}) @ExcelProperty({"引导指标","引导指标五","新增就业"})
private Integer guideIndexFive; private Integer guideIndexFive;
@ExcelProperty({"引导指标","引导指标六"}) @ExcelProperty({"引导指标","引导指标六","双创课题"})
private Integer guideIndexSix; private Integer guideIndexSix;
@ExcelProperty({"引导指标","引导指标七"}) @ExcelProperty({"引导指标","引导指标七","国家级双创导师"})
private Integer guideIndexSeven; private Integer guideIndexSeven;
@ExcelProperty({"引导指标","引导指标八"}) @ExcelProperty({"引导指标","引导指标八","双创活动"})
private Integer guideIndexEight; private Integer guideIndexEight;
@ExcelProperty({"引导指标","引导指标九"}) @ExcelProperty({"引导指标","引导指标九","销售额"})
private Integer guideIndexNine; private Integer guideIndexNine;
@ExcelProperty({"引导指标","引导指标十"}) @ExcelProperty({"引导指标","引导指标十","融资"})
private Integer guideIndexTen; private Integer guideIndexTen;
@ExcelProperty({"引导指标","引导指标十一"}) @ExcelProperty({"引导指标","引导指标十一","市级活动"})
private Integer guideIndexEleven; private Integer guideIndexEleven;
@ExcelProperty({"引导指标","引导指标十二"}) @ExcelProperty({"引导指标","引导指标十二","OTC挂牌"})
private Integer guideIndexTwelve; private Integer guideIndexTwelve;
@ExcelProperty({"引导指标","引导指标十三"}) @ExcelProperty({"引导指标","引导指标十三","新增知识产权"})
private Integer guideIndexThirteen; private Integer guideIndexThirteen;
@ExcelProperty({"引导指标","分数"}) @ExcelProperty({"引导指标","分数"})
private Integer guideIndexScore; private Integer guideIndexScore;
@ExcelProperty({"奖励指标","奖励指标一"}) @ExcelProperty({"奖励指标","奖励指标一","“互联网+”大赛"})
private Integer rewardIndexOne; private Integer rewardIndexOne;
@ExcelProperty({"奖励指标","奖励指标二"}) @ExcelProperty({"奖励指标","奖励指标二","市级奖项"})
private Integer rewardIndexTwo; private Integer rewardIndexTwo;
@ExcelProperty({"奖励指标","奖励指标三"}) @ExcelProperty({"奖励指标","奖励指标三","拔尖项目"})
private Integer rewardIndexThree; private Integer rewardIndexThree;
@ExcelProperty({"奖励指标","奖励指标四"}) @ExcelProperty({"奖励指标","奖励指标四","国家级众创空间"})
private Integer rewardIndexFour; private Integer rewardIndexFour;
@ExcelProperty({"奖励指标","奖励指标五"}) @ExcelProperty({"奖励指标","奖励指标五","国家创业孵化示范基地"})
private Integer rewardIndexFive; private Integer rewardIndexFive;
@ExcelProperty({"奖励指标","分数"}) @ExcelProperty({"奖励指标","分数"})
......
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