diff --git a/Doc/云南教育厅修改.txt b/Doc/云南教育厅修改.txt deleted file mode 100644 index bab7289c..00000000 --- a/Doc/云南教育厅修改.txt +++ /dev/null @@ -1,9 +0,0 @@ -#省管理员 -sys1 -12345678 - -大屏数据维护 -大屏数据省代录市数据 -大屏数据省代录区数据 - - diff --git a/Doc/账号/云南教育厅修改.txt b/Doc/账号/云南教育厅修改.txt new file mode 100644 index 00000000..ad8f2ca6 --- /dev/null +++ b/Doc/账号/云南教育厅修改.txt @@ -0,0 +1,19 @@ +#省管理员 +sys1 +12345678 + +大屏数据维护 +大屏数据省代录市数据 +大屏数据省代录区数据 + +#市州管理员 +shi1 +200187 +大屏数据维护 +大屏数据市级代录 + + +#县区管理员 +qu1 +358526 +大屏数据维护 diff --git a/Doc/账号/县区管理员账号.xls b/Doc/账号/县区管理员账号.xls new file mode 100644 index 00000000..6a935350 Binary files /dev/null and b/Doc/账号/县区管理员账号.xls differ diff --git a/Doc/账号/市管理员账号.xls b/Doc/账号/市管理员账号.xls new file mode 100644 index 00000000..b143fdeb Binary files /dev/null and b/Doc/账号/市管理员账号.xls differ diff --git a/WebRoot/html/pages/dataease/dataList.html b/WebRoot/html/pages/dataease/dataList.html index ecdd9ab1..0d3a78de 100644 --- a/WebRoot/html/pages/dataease/dataList.html +++ b/WebRoot/html/pages/dataease/dataList.html @@ -53,8 +53,6 @@ 上传数据 - 下载样例模板 下载数据 diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java index 819f07d6..d8ac127a 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -215,37 +215,6 @@ public class DataEaseController extends Controller { } - /** - * 下载模板Excel - * - * @param id 数据集id - */ - @Before(GET.class) - @IsLoginInterface({}) - @IsNumericInterface({"id"}) - public void downSampleExcel(int id) throws IOException { - String identity_idStr = CookieUtil.getValue(getRequest(), "identity_id"); - int identity_id = 1; - if (!StrKit.isBlank(identity_idStr)) { - identity_id = Integer.parseInt(identity_idStr); - } - String area_name = "云南省"; - //获取他是哪个城市的管理员 - if (identity_id == 2) { - area_name = "昆明市"; - } - //获取他是哪个县区的管理员 - if (identity_id == 3) { - area_name = "寻甸县"; - } - Record record = dm.getDataSetById(id); - String tableName = record.getStr("table_name"); - String dataSetName = record.getStr("dataset_name"); - //导出excel - String excelFileName = dm.exportExcel(identity_id, tableName, tempDir, area_name); - //renderFile - renderFile(new File(excelFileName), "【样例:" + area_name + "】" + dataSetName + "." + "xlsx"); - } /** * 下载指定数据集的Excel文件