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

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -2,6 +2,7 @@ package com.dsideal.QingLong.Collect.Controller;
 
 import com.dsideal.QingLong.Collect.Model.CollectModel;
 import com.dsideal.QingLong.Interceptor.IsLoginInterface;
+import com.dsideal.QingLong.Interceptor.IsNumericInterface;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Util.ExcelUtil;
 import com.dsideal.QingLong.Util.SessionKit;
@@ -109,11 +110,27 @@ public class CollectController extends Controller {
      */
     @Before({GET.class})
     @IsLoginInterface({})
+    @IsNumericInterface({"job_id"})
     public void getSheets(int job_id) {
         List<Record> list = cm.getSheets(job_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
+    /**
+     * 功能：获取指定Sheet的表结构，也就是列的信息
+     *
+     * @param job_id
+     * @param sheet_index
+     * @return
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    @IsNumericInterface({"job_id", "sheet_index"})
+    public void getSheetStruct(int job_id, int sheet_index) {
+        List<Record> list = cm.getSheetStruct(job_id, sheet_index);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
+
     /**
      * 功能：获取数据类型下拉列表
      */

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -122,4 +122,18 @@ public class CollectModel {
         String sql = "select * from t_collect_job_sheet where job_id=? order by sheet_index";
         return Db.find(sql, job_id);
     }
+
+    /**
+     * 功能：获取指定Sheet的表结构，也就是列的信息
+     *
+     * @param job_id
+     * @param sheet_index
+     * @return
+     */
+    public List<Record> getSheetStruct(int job_id, int sheet_index) {
+        String sql = "select * from t_collect_job_sheet_col where job_id=? and sheet_index=? order by column_index";
+        return Db.find(sql, job_id, sheet_index);
+    }
+
+
 }