'commit'

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

@@ -3137,7 +3137,7 @@ public class CollectModel {
      * @param job_id
      */
     public List<Record> getSheetStage(int job_id) {
-        String sql = "select * from t_collect_sheet_stage where job_id=?";
+        String sql = "select t1.*,t2.sheet_name from t_collect_sheet_stage as t1 inner join t_collect_job_sheet as t2 on t1.job_id=t2.job_id and t1.sheet_index=t2.sheet_index where t1.job_id=?";
         return Db.find(sql, job_id);
     }
 
@@ -3206,12 +3206,10 @@ public class CollectModel {
             // 假设我们要隐藏第一个工作表
             int sheetIndexToHide = 0;
             // 获取要隐藏的工作表
-            Sheet sheetToHide = workbook.getSheetAt(sheetIndexToHide);
-            if (sheetToHide != null) {
-                // 隐藏工作表
-               // sheetToHide.setSheetHidden(true);
-               // workbook.setSheetHidden(sheetIndexToHide, SheetVisibility.hidden);
-            }
+            // 将Sheet2设置为隐藏
+            workbook.setSheetHidden(workbook.getSheetIndex(sheetIndexToHide), true);
+
+
 
             // 将修改后的工作簿写回文件
             workbook.write(fos);