From 42a51fc1bd16f03e5c55bffcb7af5f5c05e477b1 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Tue, 15 Feb 2022 16:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E7=A1=80=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasePopulationInfoServiceImpl.java                   | 4 ++++
 .../populationbaseinfo/PopulationBaseInfoUploadListener.java  | 1 +
 src/main/resources/static/route/addicts/list-addicts.html     | 4 ++--
 src/main/resources/static/route/aids/list-aids.html           | 4 ++--
 .../route/basepopulationinfo/list-basepopulationinfo.html     | 4 ++--
 .../route/communitycorrection/list-communitycorrection.html   | 4 ++--
 .../static/route/mentaldisorders/list-mentaldisorders.html    | 4 ++--
 .../route/releaseaftersentence/list-releaseaftersentence.html | 4 ++--
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java b/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java
index 8f8bf63..0234178 100644
--- a/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java
+++ b/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);
     }
 
diff --git a/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java b/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java
index a7d43e3..4c0b978 100644
--- a/src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java
+++ b/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){
diff --git a/src/main/resources/static/route/addicts/list-addicts.html b/src/main/resources/static/route/addicts/list-addicts.html
index c41a5f7..60577f5 100644
--- a/src/main/resources/static/route/addicts/list-addicts.html
+++ b/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>
                     <!-- 表头按钮组 -->
diff --git a/src/main/resources/static/route/aids/list-aids.html b/src/main/resources/static/route/aids/list-aids.html
index 2523cc3..8f6274f 100644
--- a/src/main/resources/static/route/aids/list-aids.html
+++ b/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>
                     <!-- 表头按钮组 -->
diff --git a/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html b/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html
index 749b3d0..c67ec67 100644
--- a/src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html
+++ b/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>
                     <!-- 表头按钮组 -->
diff --git a/src/main/resources/static/route/communitycorrection/list-communitycorrection.html b/src/main/resources/static/route/communitycorrection/list-communitycorrection.html
index ee30896..1948ae2 100644
--- a/src/main/resources/static/route/communitycorrection/list-communitycorrection.html
+++ b/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>
                     <!-- 表头按钮组 -->
diff --git a/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html b/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html
index 6291e56..8f6f0fd 100644
--- a/src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html
+++ b/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>
                     <!-- 表头按钮组 -->
diff --git a/src/main/resources/static/route/releaseaftersentence/list-releaseaftersentence.html b/src/main/resources/static/route/releaseaftersentence/list-releaseaftersentence.html
index 6f73191..c25eb6e 100644
--- a/src/main/resources/static/route/releaseaftersentence/list-releaseaftersentence.html
+++ b/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>
                     <!-- 表头按钮组 -->