'commit'

src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java

@@ -193,18 +193,18 @@ public class YpController extends Controller {
      * 功能：导出excel
      *
      * @param task_id
-     * @param bx_id
+     * @param bx_id 0:全部，否则指定的班型ID
      */
     @Before(GET.class)
     @IsNumericInterface({"task_id", "page", "limit"})
-    public void exportExcel(int task_id, int bx_id) {
+    public void exportExcel(int task_id,int bx_id) {
         //模板文件
         String excelPath = PathKit.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
         String filePath = excelPath + "YangPuZhaoShengExcel.json";
         //转成 json对象
         JSONObject jo = FileUtil.readJsonFile(filePath);
         //导出
-        Page<Record> rs = model.getTaskInfo(task_id, bx_id, 1, 99999);
+        Page<Record> rs = model.getTaskInfo(task_id, bx_id,1, 99999);
         String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls";
         ExcelExportUtil.export(rs, jo, excelFile);
         //提供下载

src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java

@@ -231,6 +231,7 @@ public class YpModel {
     public Page<Record> getTaskInfo(int task_id, int bx_id, int page, int limit) {
         Kv kv = Kv.by("task_id", task_id);
         kv.set("bx_id", bx_id);
+        if (bx_id > 0) kv.set("bx_id", bx_id);
         SqlPara sqlPara = Db.getSqlPara("yp.getTaskInfo", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;

src/main/resource/Sql/yp.sql

@@ -1,7 +1,12 @@
 -- 应用接入命名空间
 #namespace("yp")
   #sql("getTaskInfo")
-    select * from t_yp_record where task_id=#para(task_id) and bx_id=#para(bx_id)
+    select t1.*,t2.bx_name from t_yp_record as t1 inner join t_yp_bx as t2 on t1.bx_id=t2.bx_id
+    where t1.task_id=#para(task_id)
+    #if(bx_id)
+        and  t1.bx_id=#para(bx_id)
+    #end
+    order by t1.bx_id
   #end
 
 #end

target/classes/Sql/yp.sql

@@ -1,7 +1,12 @@
 -- 应用接入命名空间
 #namespace("yp")
   #sql("getTaskInfo")
-    select * from t_yp_record where task_id=#para(task_id) and bx_id=#para(bx_id)
+    select t1.*,t2.bx_name from t_yp_record as t1 inner join t_yp_bx as t2 on t1.bx_id=t2.bx_id
+    where t1.task_id=#para(task_id)
+    #if(bx_id)
+        and  t1.bx_id=#para(bx_id)
+    #end
+    order by t1.bx_id
   #end
 
 #end