From 19720bf9b12584fefae6a368d123ec32b05fbef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sun, 23 Apr 2023 15:30:14 +0800 Subject: [PATCH 1/4] 'commit' --- .../java/com/dsideal/FengHuang/Yp/Controller/YpController.java | 2 +- src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java index 2dfeb6b..c4b7ce0 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java @@ -38,7 +38,7 @@ public class YpController extends Controller { if (list.size() > 0) { renderJson(list.get(0)); } else { - Kv kv = Kv.by("task_id", -1); + Kv kv = Kv.by("task_id", 0); renderJson(kv); } } diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java index d2135c0..11f8af8 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java @@ -7,7 +7,6 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.SqlPara; -import jnr.ffi.annotations.In; import java.util.*; From 62c46d1873cfd131af905f924b364c39abfba455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sun, 23 Apr 2023 15:33:07 +0800 Subject: [PATCH 2/4] 'commit' --- .../TouPiaoSummaryGaoJi.json | 19 ---- .../TouPiaoSummaryZhongJi.json | 19 ---- .../YangPuZhaoShengExcel.json | 101 +++++++++--------- 3 files changed, 53 insertions(+), 86 deletions(-) delete mode 100644 src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json delete mode 100644 src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json diff --git a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json b/src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json deleted file mode 100644 index 9a1b031..0000000 --- a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json +++ /dev/null @@ -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 - } - ] -} \ No newline at end of file diff --git a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json b/src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json deleted file mode 100644 index d0c1b67..0000000 --- a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json +++ /dev/null @@ -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 - } - ] -} \ No newline at end of file diff --git a/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json b/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json index b0b4960..7390fea 100644 --- a/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json +++ b/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json @@ -1,49 +1,54 @@ -{ - "title": "招生结果", - "sheetName": "结果", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "name", - "width": 40 - }, - { - "show_column_name": "性别", - "list_column_name": "xb", - "width": 20 - }, - { - "show_column_name": "家庭住址", - "list_column_name": "address", - "width": 50 - }, - { - "show_column_name": "父亲姓名", - "list_column_name": "address", - "width": 40 - }, - { - "show_column_name": "母亲姓名", - "list_column_name": "address", - "width": 40 - }, - { - "show_column_name": "身份证号", - "list_column_name": "sfzh", - "width": 40 - }, - { - "show_column_name": "联系电话", - "list_column_name": "tel", - "width": 40 - }, - { - "show_column_name": "申报时间", - "list_column_name": "create_time", - "width": 40 - } - ] +{ + "title": "招生结果", + "sheetName": "结果", + "titleHeight": 30, + "rowHeight": 30, + "showNumber": true, + "colInfo": [ + { + "show_column_name": "班型", + "list_column_name": "bx_name", + "width": 40 + }, + { + "show_column_name": "姓名", + "list_column_name": "name", + "width": 40 + }, + { + "show_column_name": "性别", + "list_column_name": "xb", + "width": 20 + }, + { + "show_column_name": "家庭住址", + "list_column_name": "address", + "width": 50 + }, + { + "show_column_name": "父亲姓名", + "list_column_name": "address", + "width": 40 + }, + { + "show_column_name": "母亲姓名", + "list_column_name": "address", + "width": 40 + }, + { + "show_column_name": "身份证号", + "list_column_name": "sfzh", + "width": 40 + }, + { + "show_column_name": "联系电话", + "list_column_name": "tel", + "width": 40 + }, + { + "show_column_name": "申报时间", + "list_column_name": "create_time", + "width": 40 + } + ] } \ No newline at end of file From 8c97ef0bc94a20f112135644b15038c56485befa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sun, 23 Apr 2023 15:33:25 +0800 Subject: [PATCH 3/4] 'commit' --- src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json b/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json index 7390fea..a02c6d5 100644 --- a/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json +++ b/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json @@ -6,7 +6,7 @@ "showNumber": true, "colInfo": [ { - "show_column_name": "班型", + "show_column_name": "申报班型", "list_column_name": "bx_name", "width": 40 }, From 636712464f1e8506050a36a1bbc3b429d771eb4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sun, 23 Apr 2023 15:34:02 +0800 Subject: [PATCH 4/4] 'commit' --- .../java/com/dsideal/FengHuang/Yp/Controller/YpController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java index c4b7ce0..fc1d7a7 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java @@ -230,7 +230,7 @@ public class YpController extends Controller { String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls"; ExcelExportUtil.export(rs, jo, excelFile); //提供下载 - String filename = "招生.xls"; + String filename = "申报结果.xls"; renderFile(new File(excelFile), filename); }