调整基础人口导入

src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java

@@ -148,6 +148,10 @@ public class BasePopulationInfoServiceImpl extends AbstractService implements IB
                 break;
             default : dataObj.put("gender", "01fffb32-73ca-4872-9d2f-abb2158f0e07");
         }
+        if(dataObj.get("updateCreator") != null){
+            dataObj.put("creator", dataObj.get("updateCreator"));
+            dataObj.put("modifier", dataObj.get("updateCreator"));
+        }
         basePopulationInfoDao.saveBasePopulationInfo(dataObj);
     }
 

src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java

@@ -49,6 +49,7 @@ public class PopulationBaseInfoUploadListener extends AnalysisEventListener<Map<
         dataObj.put("areaCode",data.get(13));
         dataObj.put("areaNames",data.get(14));
         dataObj.put("currentResidenceAddr",data.get(15)  == null ? "" : data.get(15).toString());
+        dataObj.put("uploadCreator",data.get(16)  == null ? "" : data.get(16).toString());
         try {
             service.saveBasePopulationInfoImport(dataObj);
         } catch (Exception e){

src/main/resources/static/route/addicts/list-addicts.html

@@ -26,9 +26,9 @@
                         <button type="button" id="downloadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-download"></i> 下载模板
                         </button>
-                        <button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
+                        <!--<button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-upload"></i> 导入数据
-                        </button>
+                        </button>-->
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->

src/main/resources/static/route/aids/list-aids.html

@@ -32,9 +32,9 @@
                         <button type="button" id="downloadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-download"></i> 下载模板
                         </button>
-                        <button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
+                        <!--<button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-upload"></i> 导入数据
-                        </button>
+                        </button>-->
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->

src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html

@@ -26,9 +26,9 @@
                         <button type="button" id="downloadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-download"></i> 下载模板
                         </button>
-                        <button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
+                        <!--<button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-upload"></i> 导入数据
-                        </button>
+                        </button>-->
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->

src/main/resources/static/route/communitycorrection/list-communitycorrection.html

@@ -26,9 +26,9 @@
                         <button type="button" id="downloadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-download"></i> 下载模板
                         </button>
-                        <button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
+                        <!--<button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-upload"></i> 导入数据
-                        </button>
+                        </button>-->
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->

src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html

@@ -26,9 +26,9 @@
                         <button type="button" id="downloadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-download"></i> 下载模板
                         </button>
-                        <button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
+                        <!--<button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-upload"></i> 导入数据
-                        </button>
+                        </button>-->
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->

src/main/resources/static/route/releaseaftersentence/list-releaseaftersentence.html

@@ -26,9 +26,9 @@
                         <button type="button" id="downloadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-download"></i> 下载模板
                         </button>
-                        <button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
+                        <!--<button type="button" id="uploadTemplate" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-upload"></i> 导入数据
-                        </button>
+                        </button>-->
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->