huanghai
/
YangPuBaoMing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/YangPuBaoMing

Browse Source
main
kgdxpr 2 years ago
parent 06b1f67905 636712464f
commit be0c88ee4b
5 changed files with 55 additions and 89 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
Unescape View File

@ -38,7 +38,7 @@ public class YpController extends Controller {
if (list.size() > 0) { if (list.size() > 0) {
renderJson(list.get(0)); renderJson(list.get(0));
} else { } else {
Kv kv = Kv.by("task_id", -1); Kv kv = Kv.by("task_id", 0);
renderJson(kv); renderJson(kv);
} }
} }
@ -230,7 +230,7 @@ public class YpController extends Controller {
String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls"; String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls";
ExcelExportUtil.export(rs, jo, excelFile); ExcelExportUtil.export(rs, jo, excelFile);
//提供下载 //提供下载
String filename = "招生.xls"; String filename = "申报结果.xls";
renderFile(new File(excelFile), filename); renderFile(new File(excelFile), filename);
} }

1
src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
Unescape View File

@ -7,7 +7,6 @@ import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Page;
import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.Record;
import com.jfinal.plugin.activerecord.SqlPara; import com.jfinal.plugin.activerecord.SqlPara;
import jnr.ffi.annotations.In;
import java.util.*; import java.util.*;

19
src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json
Unescape View File

@ -1,19 +0,0 @@
{
"title": "高级职称评定结果",
"sheetName": "高级",
"titleHeight": 30,
"rowHeight": 30,
"showNumber": true,
"colInfo": [
{
"show_column_name": "姓名",
"list_column_name": "houxuanren_name",
"width": 40
},
{
"show_column_name": "分数",
"list_column_name": "score",
"width": 40
}
]
}

19
src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json
Unescape View File

@ -1,19 +0,0 @@
{
"title": "中级职称评定结果",
"sheetName": "中级",
"titleHeight": 30,
"rowHeight": 30,
"showNumber": true,
"colInfo": [
{
"show_column_name": "姓名",
"list_column_name": "houxuanren_name",
"width": 40
},
{
"show_column_name": "分数",
"list_column_name": "score",
"width": 40
}
]
}

101
src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json
Unescape View File

@ -1,49 +1,54 @@
{ {
"title": "招生结果", "title": "招生结果",
"sheetName": "结果", "sheetName": "结果",
"titleHeight": 30, "titleHeight": 30,
"rowHeight": 30, "rowHeight": 30,
"showNumber": true, "showNumber": true,
"colInfo": [ "colInfo": [
{ {
"show_column_name": "姓名", "show_column_name": "申报班型",
"list_column_name": "name", "list_column_name": "bx_name",
"width": 40 "width": 40
}, },
{ {
"show_column_name": "性别", "show_column_name": "姓名",
"list_column_name": "xb", "list_column_name": "name",
"width": 20 "width": 40
}, },
{ {
"show_column_name": "家庭住址", "show_column_name": "性别",
"list_column_name": "address", "list_column_name": "xb",
"width": 50 "width": 20
}, },
{ {
"show_column_name": "父亲姓名", "show_column_name": "家庭住址",
"list_column_name": "address", "list_column_name": "address",
"width": 40 "width": 50
}, },
{ {
"show_column_name": "母亲姓名", "show_column_name": "父亲姓名",
"list_column_name": "address", "list_column_name": "address",
"width": 40 "width": 40
}, },
{ {
"show_column_name": "身份证号", "show_column_name": "母亲姓名",
"list_column_name": "sfzh", "list_column_name": "address",
"width": 40 "width": 40
}, },
{ {
"show_column_name": "联系电话", "show_column_name": "身份证号",
"list_column_name": "tel", "list_column_name": "sfzh",
"width": 40 "width": 40
}, },
{ {
"show_column_name": "申报时间", "show_column_name": "联系电话",
"list_column_name": "create_time", "list_column_name": "tel",
"width": 40 "width": 40
} },
] {
"show_column_name": "申报时间",
"list_column_name": "create_time",
"width": 40
}
]
} }
Write Preview
Loading…
Cancel
Save