'commit'

src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java

@@ -592,7 +592,7 @@ public class DataEaseController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"id"})
     public void getDataSetContentByProvince(int id) {
-        List<Record> list = dm.getDataSetContentByCity(id, "云南省");
+        List<Record> list = dm.getDataSetContentByProvince(id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -625,7 +625,7 @@ public class DataEaseController extends Controller {
         String dataSetName = record.getStr("dataset_name");
         //导出excel
         String upPath = BaseApplication.PropKit.get("upload.path") + "/";
-        String excelFileName = dm.exportExcelByCity(tableName, upPath, "云南省");
+        String excelFileName = dm.exportExcelByProvince(tableName, upPath);
         //renderFile
         renderFile(new File(excelFileName), "【云南省】" + dataSetName + "." + "xlsx");
     }

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -627,6 +627,20 @@ public class DataEaseModel {
         return Db.use(DB_NAME).find(sql);
     }
 
+    /**
+     * 市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据
+     *
+     * @param id
+     * @return
+     */
+    public List<Record> getDataSetContentByProvince(int id) {
+        Record record = Db.findById("t_dp_dataset", "id", id);
+        String tableName = record.getStr("table_name");
+
+        String sql = "select * from `" + tableName+"`";
+        return Db.use(DB_NAME).find(sql);
+    }
+
     /**
      * 保存数据集对应的表
      *
@@ -714,6 +728,20 @@ public class DataEaseModel {
         return filePath;
     }
 
+    public String exportExcelByProvince(String tableName, String exportPath) throws IOException {
+        //填充默认的行政区划
+        fillDefaultXzqh(3, tableName);
+        //对此表中的数据进行直接导出EXCEL
+        String sql = "select * from `" + tableName + "`";
+
+        List<Record> tableData = Db.use(DataEaseModel.DB_NAME).find(sql);
+        String excelFileName = UUID.randomUUID().toString().toUpperCase() + ".xlsx";
+        String filePath = exportPath + excelFileName;
+        //导出
+        ExcelCommonUtil.writeExcel(tableData, filePath, true);
+        return filePath;
+    }
+
     /**
      * 保存数据集对应的表
      *

src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java

@@ -19,7 +19,7 @@ import java.util.List;
 public class A7 {
 
     //示例Excel
-    static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【7】终-人口总体情况\\鲁甸县教育发展规模数据收集表.xlsx";
+    static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【7】终-人口总体情况\\终-人口总体情况(万人).xlsx";
 
     //源文件
     static String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\133个县区报告2022\\县区研究报告";

src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java

@@ -102,7 +102,7 @@ public class ExcelKit {
         //先把样例的第一行复制到目标输出Excel的第一行中去
         Row firstRow = outSheet.createRow(0);
         //样例Sheet
-        XSSFSheet sampleSheet = sampleWorkbook.getSheet("Sheet1");
+        XSSFSheet sampleSheet = sampleWorkbook.getSheetAt(0);
         Row firstSampleRow = sampleSheet.getRow(0);
         for (Cell cell : firstSampleRow) {
             Cell outCell = firstRow.createCell(cell.getColumnIndex());