Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Renpc-kilig 2022-02-15 16:54:06 +08:00
commit 82007e40c2
8 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

1
src/main/java/com/cm/population/uploadexcellistener/populationbaseinfo/PopulationBaseInfoUploadListener.java
View File

@ -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){

4
src/main/resources/static/route/addicts/list-addicts.html
View File

@ -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>
<!-- 表头按钮组 -->

4
src/main/resources/static/route/aids/list-aids.html
View File

@ -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>
<!-- 表头按钮组 -->

4
src/main/resources/static/route/basepopulationinfo/list-basepopulationinfo.html
View File

@ -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>
<!-- 表头按钮组 -->

4
src/main/resources/static/route/communitycorrection/list-communitycorrection.html
View File

@ -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>
<!-- 表头按钮组 -->

4
src/main/resources/static/route/mentaldisorders/list-mentaldisorders.html
View File

@ -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>
<!-- 表头按钮组 -->

4
src/main/resources/static/route/releaseaftersentence/list-releaseaftersentence.html
View File

@ -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>
<!-- 表头按钮组 -->