diff --git a/Doc/v1.0/.cache.json b/Doc/v1.0/.cache.json
index e0f90bd9..ab681334 100644
--- a/Doc/v1.0/.cache.json
+++ b/Doc/v1.0/.cache.json
@@ -1 +1 @@
-[{"baseUrl":"","className":"DataEaseController","description":"DataEaseController","docFileName":"com_dsideal_base_DataEase_Controller_DataEaseController.html","generateDocs":true,"packageName":"com.dsideal.base.DataEase.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#route","deprecated":false,"description":"省级路由","header":[],"method":["GET","POST"],"methodName":"route","paramNodes":[{"description":"城市名称","jsonBody":false,"name":"city_name","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/route"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage","deprecated":false,"description":"routePage","header":[],"method":["GET","POST"],"methodName":"routePage","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/routePage"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet","deprecated":false,"description":"根据当前登录人员的identity_id,获取此人员可以维护的数据集名称","header":[],"method":["GET","POST"],"methodName":"getDataSet","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSet"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel","deprecated":false,"description":"下载指定数据集的Excel文件","header":[],"method":["GET","POST"],"methodName":"downloadExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downloadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel","deprecated":false,"description":"下载模板Excel","header":[],"method":["GET","POST"],"methodName":"downSampleExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downSampleExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel","deprecated":false,"description":"上传Excel文件","header":[],"method":["GET","POST"],"methodName":"uploadExcel","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/uploadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent","deprecated":false,"description":"获取数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"getDataSetContent","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetContent"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet","deprecated":false,"description":"保存数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"saveDataSet","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"},{"description":"保存的数据","jsonBody":false,"name":"data","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/saveDataSet"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetByCity","deprecated":false,"description":"市级管理员获取县区级可视数据集有哪些","header":[],"method":["GET","POST"],"methodName":"getDataSetByCity","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetByCity"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContentByCity","deprecated":false,"description":"市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据","header":[],"method":["GET","POST"],"methodName":"getDataSetContentByCity","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetContentByCity"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSetByCity","deprecated":false,"description":"市州管理员，帮助县区管理员填报数据，保存数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"saveDataSetByCity","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"},{"description":"保存的数据","jsonBody":false,"name":"data","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/saveDataSetByCity"}],"srcFileName":"D:\\dsWork\\YunNanDsBase\\src\\main\\java\\com\\dsideal\\base\\DataEase\\Controller\\DataEaseController.java"}]
\ No newline at end of file
+[{"baseUrl":"","className":"DataEaseController","description":"DataEaseController","docFileName":"com_dsideal_base_DataEase_Controller_DataEaseController.html","generateDocs":true,"packageName":"com.dsideal.base.DataEase.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#route","deprecated":false,"description":"省级路由","header":[],"method":["GET","POST"],"methodName":"route","paramNodes":[{"description":"城市名称","jsonBody":false,"name":"city_name","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/route"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage","deprecated":false,"description":"routePage","header":[],"method":["GET","POST"],"methodName":"routePage","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/routePage"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet","deprecated":false,"description":"根据当前登录人员的identity_id,获取此人员可以维护的数据集名称","header":[],"method":["GET","POST"],"methodName":"getDataSet","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSet"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel","deprecated":false,"description":"下载模板Excel","header":[],"method":["GET","POST"],"methodName":"downSampleExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downSampleExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel","deprecated":false,"description":"下载指定数据集的Excel文件","header":[],"method":["GET","POST"],"methodName":"downloadExcel","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downloadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel","deprecated":false,"description":"上传Excel文件","header":[],"method":["GET","POST"],"methodName":"uploadExcel","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/uploadExcel"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent","deprecated":false,"description":"获取数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"getDataSetContent","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetContent"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet","deprecated":false,"description":"保存数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"saveDataSet","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"},{"description":"保存的数据","jsonBody":false,"name":"data","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/saveDataSet"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetByCity","deprecated":false,"description":"市级管理员获取县区级可视数据集有哪些","header":[],"method":["GET","POST"],"methodName":"getDataSetByCity","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetByCity"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContentByCity","deprecated":false,"description":"市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据","header":[],"method":["GET","POST"],"methodName":"getDataSetContentByCity","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/getDataSetContentByCity"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSetByCity","deprecated":false,"description":"市州管理员，帮助县区管理员填报数据，保存数据集下的数据表","header":[],"method":["GET","POST"],"methodName":"saveDataSetByCity","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"},{"description":"保存的数据","jsonBody":false,"name":"data","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/saveDataSetByCity"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcelByCity","deprecated":false,"description":"市管理员辅助县区录入：下载指定数据集的Excel文件","header":[],"method":["GET","POST"],"methodName":"downloadExcelByCity","paramNodes":[{"description":"数据集id","jsonBody":false,"name":"id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/downloadExcelByCity"},{"changeFlag":0,"codeFileUrl":"com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcelByCity","deprecated":false,"description":"市管理员辅助县区录入:上传Excel文件","header":[],"method":["GET","POST"],"methodName":"uploadExcelByCity","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/dataease/uploadExcelByCity"}],"srcFileName":"D:\\dsWork\\YunNanDsBase\\src\\main\\java\\com\\dsideal\\base\\DataEase\\Controller\\DataEaseController.java"}]
\ No newline at end of file
diff --git a/Doc/v1.0/YunNanDsBase-v1.0-api-docs.json b/Doc/v1.0/YunNanDsBase-v1.0-api-docs.json
index dc7332c7..2fc7a973 100644
--- a/Doc/v1.0/YunNanDsBase-v1.0-api-docs.json
+++ b/Doc/v1.0/YunNanDsBase-v1.0-api-docs.json
@@ -47,10 +47,10 @@
               "key": "id"
             }
           ],
-          "raw": "{{domain}}/dataease/downloadExcel"
+          "raw": "{{domain}}/dataease/downSampleExcel"
         }
       },
-      "name": "下载指定数据集的Excel文件"
+      "name": "下载模板Excel"
     },
     {
       "request": {
@@ -63,10 +63,10 @@
               "key": "id"
             }
           ],
-          "raw": "{{domain}}/dataease/downSampleExcel"
+          "raw": "{{domain}}/dataease/downloadExcel"
         }
       },
-      "name": "下载模板Excel"
+      "name": "下载指定数据集的Excel文件"
     },
     {
       "request": {
@@ -161,6 +161,32 @@
         }
       },
       "name": "市州管理员，帮助县区管理员填报数据，保存数据集下的数据表"
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [
+            {
+              "description": "数据集id",
+              "value": "",
+              "key": "id"
+            }
+          ],
+          "raw": "{{domain}}/dataease/downloadExcelByCity"
+        }
+      },
+      "name": "市管理员辅助县区录入：下载指定数据集的Excel文件"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [],
+          "raw": "{{domain}}/dataease/uploadExcelByCity"
+        }
+      },
+      "name": "市管理员辅助县区录入:上传Excel文件"
     }
   ],
   "name": "DataEaseController"
diff --git a/Doc/v1.0/com_dsideal_base_DataEase_Controller_DataEaseController.html b/Doc/v1.0/com_dsideal_base_DataEase_Controller_DataEaseController.html
index fa9841fd..cedb046c 100644
--- a/Doc/v1.0/com_dsideal_base_DataEase_Controller_DataEaseController.html
+++ b/Doc/v1.0/com_dsideal_base_DataEase_Controller_DataEaseController.html
@@ -51,12 +51,12 @@
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet">
                         根据当前登录人员的identity_id,获取此人员可以维护的数据集名称
                     </a>
-                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel">
-                        下载指定数据集的Excel文件
-                    </a>
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel">
                         下载模板Excel
                     </a>
+                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel">
+                        下载指定数据集的Excel文件
+                    </a>
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel">
                         上传Excel文件
                     </a>
@@ -75,6 +75,12 @@
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSetByCity">
                         市州管理员，帮助县区管理员填报数据，保存数据集下的数据表
                     </a>
+                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcelByCity">
+                        市管理员辅助县区录入：下载指定数据集的Excel文件
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcelByCity">
+                        市管理员辅助县区录入:上传Excel文件
+                    </a>
             </div>
         </div>
 </div>    </div>
@@ -141,10 +147,10 @@
                         </div>
                         <hr>
                         <div class="action-item">
-<h2 id="downloadExcel"><a href="#">下载指定数据集的Excel文件 </a></h2>
+<h2 id="downSampleExcel"><a href="#">下载模板Excel </a></h2>
 <p><strong>请求URL</strong></p>
 <p>
-    <code>/dataease/downloadExcel</code>
+    <code>/dataease/downSampleExcel</code>
         <span class="label label-default">GET</span>
         <span class="label label-default">POST</span>
 </p>
@@ -168,10 +174,10 @@
                         </div>
                         <hr>
                         <div class="action-item">
-<h2 id="downSampleExcel"><a href="#">下载模板Excel </a></h2>
+<h2 id="downloadExcel"><a href="#">下载指定数据集的Excel文件 </a></h2>
 <p><strong>请求URL</strong></p>
 <p>
-    <code>/dataease/downSampleExcel</code>
+    <code>/dataease/downloadExcel</code>
         <span class="label label-default">GET</span>
         <span class="label label-default">POST</span>
 </p>
@@ -335,6 +341,45 @@
                     </tr>
         </table>
     <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="downloadExcelByCity"><a href="#">市管理员辅助县区录入：下载指定数据集的Excel文件 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/dataease/downloadExcelByCity</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>数据集id</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="uploadExcelByCity"><a href="#">市管理员辅助县区录入:上传Excel文件 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/dataease/uploadExcelByCity</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+    <p><strong>返回结果</strong></p>
     <pre class="prettyprint lang-json">{}</pre>
                         </div>
                         <hr>
@@ -354,14 +399,16 @@
             {name: 'DataEaseController.省级路由', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#route'},
             {name: 'DataEaseController.routePage', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage'},
             {name: 'DataEaseController.根据当前登录人员的identity_id,获取此人员可以维护的数据集名称', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet'},
-            {name: 'DataEaseController.下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel'},
             {name: 'DataEaseController.下载模板Excel', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel'},
+            {name: 'DataEaseController.下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel'},
             {name: 'DataEaseController.上传Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel'},
             {name: 'DataEaseController.获取数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent'},
             {name: 'DataEaseController.保存数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet'},
             {name: 'DataEaseController.市级管理员获取县区级可视数据集有哪些', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetByCity'},
             {name: 'DataEaseController.市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContentByCity'},
             {name: 'DataEaseController.市州管理员，帮助县区管理员填报数据，保存数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSetByCity'},
+            {name: 'DataEaseController.市管理员辅助县区录入：下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcelByCity'},
+            {name: 'DataEaseController.市管理员辅助县区录入:上传Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcelByCity'},
     ];
 
 
diff --git a/Doc/v1.0/index.html b/Doc/v1.0/index.html
index a5113849..c7c0063a 100644
--- a/Doc/v1.0/index.html
+++ b/Doc/v1.0/index.html
@@ -51,12 +51,12 @@
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet">
                         根据当前登录人员的identity_id,获取此人员可以维护的数据集名称
                     </a>
-                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel">
-                        下载指定数据集的Excel文件
-                    </a>
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel">
                         下载模板Excel
                     </a>
+                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel">
+                        下载指定数据集的Excel文件
+                    </a>
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel">
                         上传Excel文件
                     </a>
@@ -75,6 +75,12 @@
                     <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSetByCity">
                         市州管理员，帮助县区管理员填报数据，保存数据集下的数据表
                     </a>
+                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcelByCity">
+                        市管理员辅助县区录入：下载指定数据集的Excel文件
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcelByCity">
+                        市管理员辅助县区录入:上传Excel文件
+                    </a>
             </div>
         </div>
 </div>    </div>
@@ -110,14 +116,16 @@
         {name: 'DataEaseController.省级路由', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#route'},
         {name: 'DataEaseController.routePage', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#routePage'},
         {name: 'DataEaseController.根据当前登录人员的identity_id,获取此人员可以维护的数据集名称', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSet'},
-        {name: 'DataEaseController.下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel'},
         {name: 'DataEaseController.下载模板Excel', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downSampleExcel'},
+        {name: 'DataEaseController.下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcel'},
         {name: 'DataEaseController.上传Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcel'},
         {name: 'DataEaseController.获取数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContent'},
         {name: 'DataEaseController.保存数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSet'},
         {name: 'DataEaseController.市级管理员获取县区级可视数据集有哪些', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetByCity'},
         {name: 'DataEaseController.市州管理员，帮助县区管理员填报数据，需要获取指定数据集的数据', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#getDataSetContentByCity'},
         {name: 'DataEaseController.市州管理员，帮助县区管理员填报数据，保存数据集下的数据表', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#saveDataSetByCity'},
+        {name: 'DataEaseController.市管理员辅助县区录入：下载指定数据集的Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#downloadExcelByCity'},
+        {name: 'DataEaseController.市管理员辅助县区录入:上传Excel文件', url: 'com_dsideal_base_DataEase_Controller_DataEaseController.html#uploadExcelByCity'},
     ];
 
 
diff --git a/WebRoot/html/pages/dataease/dataList_proxy.html b/WebRoot/html/pages/dataease/dataList_proxy.html
new file mode 100644
index 00000000..079ecb56
--- /dev/null
+++ b/WebRoot/html/pages/dataease/dataList_proxy.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Demo</title>
+    <!-- 请勿在项目正式环境中引用该 layui.css 地址 -->
+    <link href="../js/layui/css/layui.css" rel="stylesheet">
+    <style>
+        .woo-tool-text-delimiter {
+            width: 1px;
+            height: 12px;
+            background: #EEEEEE;
+            display: inline-block;
+            margin: 0 6px 0 4px;
+        }
+
+        .woo-theme-color {
+            color: #1e9fff !important;
+        }
+
+        .woo-tool-span {
+            margin: 0 3px;
+            position: relative;
+            top: -1px;
+            cursor: pointer;
+        }
+
+        .layui-card-body .layui-form {
+            margin-top: 0 !important;
+        }
+
+        .layui-form-select {
+            width: 300px;
+        }
+
+        .layui-card {
+            margin-bottom: 15px;
+            border-radius: 2px;
+            background-color: #fff;
+            box-shadow: none;
+        }
+    </style>
+</head>
+
+<body class="layui-form">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <table id="data-table"></table>
+
+            <script type="text/html" id="table-bar">
+                <span class="woo-tool-span woo-tool-text-span" lay-event="uploadData"><a
+                    class="woo-theme-color">上传数据</a></span>  
+                <i class="woo-tool-text-delimiter"></i>
+                <span class="woo-tool-span woo-tool-text-span" lay-event="downloadSample"><a
+                    class="woo-theme-color">下载样例模板</a></span>  
+                <i class="woo-tool-text-delimiter"></i>
+                <span class="woo-tool-span woo-tool-text-span" lay-event="downloadData"><a
+                    class="woo-theme-color">下载数据</a></span>  
+                <i class="woo-tool-text-delimiter"></i>
+                    <span class="woo-tool-span woo-tool-text-span" lay-event="mod"><a
+                        class="woo-theme-color">数据维护</a></span>
+                    
+            </script>
+
+
+
+        </div>
+    </div>
+
+    <!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
+    <script src="../js/layui/layui.js"></script>
+    <script>
+        layui.use('table', function () {
+            var table = layui.table;
+            var $ = layui.jquery;
+
+
+            table.render({
+                elem: '#data-table',
+                url: '/dsBase/dataease/getDataSetByCity',
+                height: 'full-35',
+                page: {
+                    limit: 20
+                    , layout: ['count', 'prev', 'page', 'next', 'skip']
+                    , prev: "上一页"
+                    , next: "下一页"
+                },
+                cols: [[
+                    { title: '序号', align: 'center', width: "5%", type: 'numbers' },
+                    { title: '分类', field: 'parent_name', align: 'center' },
+                    { title: '数据集', field: 'dataset_name', align: 'center' },
+                    { title: '已填数据(条)', field: 'fill_count', align: 'center' },
+                    // { title: '表名', field: 'table_name', align: 'center' },
+                    { title: '操作', toolbar: '#table-bar', align: 'center', width: 390 }
+                ]],
+                skin: 'line',
+                defaultToolbar: [],
+                parseData: function (res) {
+                    var data = res.data;
+                    for (var i = 0; i < data.length; i++) {
+                        if (data[i].fill_count > 0) {
+                            data[i].LAY_CHECKED = true;
+                        }
+                    }
+                    return res;
+                }
+            });
+
+            table.on('tool(data-table)', function (obj) {
+                window.location.href = "./dataMod.html?id=" + obj.data.id;
+            });
+
+
+            table.on('tool(data-table)', function (obj) {
+                if (obj.event === 'uploadData') {
+                    layer.open({
+                        type: 2,
+                        title: '上传数据',
+                        area: ['600px', '230px'],
+                        shade: 0.1,
+                        content: './upload.html?id=' + obj.data.id
+                    });
+
+                } else if (obj.event === 'downloadSample') {
+                    window.location.href = "/dsBase/dataease/downSampleExcel?id=" + obj.data.id;
+                } else if (obj.event === 'downloadData') {
+                    window.location.href = "/dsBase/dataease/downloadExcel?id=" + obj.data.id;
+                } else {
+                    window.location.href = "./dataMod_proxy.html?id=" + obj.data.id
+                }
+            });
+        });
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebRoot/html/pages/dataease/dataMod_proxy.html b/WebRoot/html/pages/dataease/dataMod_proxy.html
new file mode 100644
index 00000000..c54dd7c5
--- /dev/null
+++ b/WebRoot/html/pages/dataease/dataMod_proxy.html
@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Demo</title>
+    <!-- 请勿在项目正式环境中引用该 layui.css 地址 -->
+    <link href="../js/layui/css/layui.css" rel="stylesheet">
+    <style>
+        .woo-tool-text-delimiter {
+            width: 1px;
+            height: 12px;
+            background: #EEEEEE;
+            display: inline-block;
+            margin: 0 6px 0 4px;
+        }
+
+        .woo-theme-color {
+            color: #1e9fff !important;
+        }
+
+        .woo-tool-span {
+            margin: 0 3px;
+            position: relative;
+            top: -1px;
+            cursor: pointer;
+        }
+
+        .layui-card-body .layui-form {
+            margin-top: 0 !important;
+        }
+
+        .layui-form-select {
+            width: 300px;
+        }
+
+        .layui-card {
+            margin-bottom: 15px;
+            border-radius: 2px;
+            background-color: #fff;
+            box-shadow: none;
+        }
+
+        .layui-fixbar li {
+            height: 38px;
+            line-height: 38px;
+            border: 1px solid transparent;
+            padding: 0 18px;
+            background-color: #16baaa;
+            color: #fff;
+            white-space: nowrap;
+            text-align: center;
+            font-size: 14px !important;
+            border-radius: 2px;
+            cursor: pointer;
+        }
+
+        .fix {
+            position: fixed;
+            top: 0;
+            right: 10px;
+            background-color: white;
+            padding: 10px;
+            z-index: 1000;
+        }
+    </style>
+</head>
+
+<body class="layui-form">
+    <div class="layui-card" style="margin-top: 50px;">
+        <div class="layui-card-body">
+            <!-- <button type="button" class="layui-btn" id="getData">获取数据</button> -->
+            <div class="fix">
+                <button type="button" class="layui-btn" id="saveData">保存</button>
+                <button type="button" class="layui-btn" id="back">返回</button>
+            </div>
+            <table id="ID-table-demo-data"></table>
+
+            <script type="text/html" id="table-bar">
+                <span class="woo-tool-span woo-tool-text-span" lay-event="add"><a
+                    class="woo-theme-color">向下插入</a></span>   
+                    <span class="woo-tool-span woo-tool-text-span" lay-event="delete"><a
+                        class="woo-theme-color">删除</a></span>   
+            </script>
+
+
+
+        </div>
+    </div>
+
+    <!-- 请勿在项目正式环境中引用该 layui.js 地址 -->
+    <script src="../js/layui/layui.js"></script>
+    <script>
+        layui.use('table', function () {
+            var table = layui.table;
+            var $ = layui.jquery;
+            var util = layui.util;
+
+            var id = GetQueryString("id");
+
+            // var id = "3";
+
+            var _data = [];
+
+
+            $.ajax({
+                type: "GET",
+                async: false,
+                url: '/dsBase/dataease/getDataSetContentByCity?id=' + id,
+                dataType: "json",
+                success: function (res) {
+                    _data = res.data;
+                }
+            });
+
+
+            var _emptyData = {};
+            var _cols = [];
+            let keys = Object.keys(_data[0]);
+
+            keys.forEach((item, index) => {
+                _emptyData[item] = "";
+                var _obj = { field: item, title: item, edit: 'text', align: 'center' }
+                _cols.push(_obj);
+            });
+            _cols.push({ title: '操作', align: 'center', toolbar: '#table-bar' });
+
+            table.render({
+                elem: '#ID-table-demo-data',
+                id: 'ID-table-demo-data',
+                page: false,
+                cols: [_cols],
+                data: _data
+            });
+
+            table.on('tool(ID-table-demo-data)', function (obj) {
+                if (obj.event === 'add') {
+                    _data.splice(obj.index + 1, 0, _emptyData);
+                    table.cache['ID-table-demo-data'] = _data;
+                    table.renderData('ID-table-demo-data');
+                } else {
+                    var cacheData = table.cache['ID-table-demo-data'];
+                    cacheData.splice(obj.index, 1)
+                    table.renderData('ID-table-demo-data');
+                }
+            });
+
+            $("#saveData").click(function () {
+
+                const cleanedData = table.cache['ID-table-demo-data'].map(item => {
+                    const { LAY_NUM, LAY_INDEX, ...rest } = item;
+                    return rest;
+                });
+
+                $.ajax({
+                    type: "POST",
+                    dataType: "json",
+                    async: false,
+                    url: '/dsBase/dataease/saveDataSetByCity',
+                    data: {
+                        "id": id,
+                        "data": JSON.stringify(cleanedData)
+                    },
+                    success: function (res) {
+                        if (res.success) {
+                            layer.msg("保存成功！", {
+                                icon: 1,
+                                time: 1300
+                            });
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 2,
+                                time: 2000
+                            });
+                        }
+                    }
+                });
+            });
+
+
+            $("#back").click(function () {
+                history.back();
+            });
+            
+
+            function GetQueryString(name, istop) {
+                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+                var r = window.location.search.substr(1).match(reg);
+                if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
+
+                if (r != null) return unescape(r[2]);
+                return null;
+            }
+        });
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebRoot/upload/27C066F2-4E9A-47D1-BCC8-A7B87F451501.xlsx b/WebRoot/upload/27C066F2-4E9A-47D1-BCC8-A7B87F451501.xlsx
new file mode 100644
index 00000000..9a780a8a
Binary files /dev/null and b/WebRoot/upload/27C066F2-4E9A-47D1-BCC8-A7B87F451501.xlsx differ
diff --git a/WebRoot/upload/4AE1714B-DBE6-4210-9B9D-9185CB657D83.xlsx b/WebRoot/upload/4AE1714B-DBE6-4210-9B9D-9185CB657D83.xlsx
new file mode 100644
index 00000000..9a780a8a
Binary files /dev/null and b/WebRoot/upload/4AE1714B-DBE6-4210-9B9D-9185CB657D83.xlsx differ