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

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);
         }
     }
@@ -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);
     }
 

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.*;
 

src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json

@@ -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
-    }
-  ]
-}

src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json

@@ -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
-    }
-  ]
-}

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
+    }
+  ]
 }