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

人口基本信息- 增加了自定义Excel导出功能

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2024-02-01 10:11:01 +08:00
parent cefcbc439c
commit 466e52648c
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/mybatis/mapper/house/house-mapper.xml
View File

@ -849,13 +849,13 @@
</if> </if>
<if test="populationInfoId != null and populationInfoId != ''"> <if test="populationInfoId != null and populationInfoId != ''">
AND AND
t1.house_id IN ( t1.house_id IN (
SELECT SELECT
hp.house_id hp.house_id
FROM FROM
house_population hp house_population hp
WHERE WHERE
1 = 1 hp.is_delete = 0 AND hp.out_house != '1'
<if test="populationInfoId != null and populationInfoId != ''"> <if test="populationInfoId != null and populationInfoId != ''">
AND hp.population_info_id = #{populationInfoId} AND hp.population_info_id = #{populationInfoId}
</if> </if>
@ -863,13 +863,13 @@
</if> </if>
<if test="cardNum != null and cardNum != ''"> <if test="cardNum != null and cardNum != ''">
AND AND
t1.house_id IN ( t1.house_id IN (
SELECT SELECT
hp.house_id hp.house_id
FROM FROM
house_population hp house_population hp
WHERE WHERE
1 = 1 hp.is_delete = 0 AND hp.out_house != '1'
<if test="cardNum != null and cardNum != ''"> <if test="cardNum != null and cardNum != ''">
AND hp.card_num = #{cardNum} AND hp.card_num = #{cardNum}
</if> </if>

29
src/main/resources/templates/populationinfo/bind.html
View File

@ -32,6 +32,7 @@
<input type="text" id="name" class="layui-input search-item" placeholder="请输入姓名"> <input type="text" id="name" class="layui-input search-item" placeholder="请输入姓名">
</div> </div>
<div class="layui-inline layui-form search-item" id="idcardTypeSelectTemplateBox" lay-filter="idcardTypeSelectTemplateBox"></div> <div class="layui-inline layui-form search-item" id="idcardTypeSelectTemplateBox" lay-filter="idcardTypeSelectTemplateBox"></div>
<div class="layui-inline layui-form search-item" id="creatorSelectTemplateBox" lay-filter="creatorSelectTemplateBox"></div>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号"> <input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号">
</div> </div>
@ -56,14 +57,22 @@
</div> </div>
</div> </div>
</div> </div>
<script id="idcardTypeSelectTemplate" type="text/html" lay-search> <script id="idcardTypeSelectTemplate" type="text/html" >
<select id="idcardType" name="idcardType"> <select id="idcardType" name="idcardType" lay-search>
<option value="">请选择证件类型</option> <option value="">请选择证件类型</option>
{{# for(var i = 0, item; item = d[i++];) { }} {{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dictionaryName}}">{{item.dictionaryName}}</option> <option value="{{item.dictionaryName}}">{{item.dictionaryName}}</option>
{{# } }} {{# } }}
</select> </select>
</script> </script>
<script id="creatorSelectTemplate" type="text/html" >
<select id="creator" name="creator" lay-search>
<option value="">请选择认领人员</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.userId}}">{{item.userName}}</option>
{{# } }}
</select>
</script>
<script src="assets/layuiadmin/layui/layui.js"></script> <script src="assets/layuiadmin/layui/layui.js"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script> <script>
@ -93,6 +102,18 @@
} }
}, 500); }, 500);
// 人员列表
function initCreatorSelect() {
top.restAjax.get(top.restAjax.path('http://219.147.99.164:8082/datahouse/app/query/sqlrelease/q5d56f90', []), {}, {headers: {PKEY: 'a0a25c1e-818a-489e-98c0-0f3a282a49d2', PPASS: '5be81fdf-2c5d-4ee6-ae45-ffe82b5db2ff'}}, function(code, data, args) {
laytpl(document.getElementById('creatorSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('creatorSelectTemplateBox').innerHTML = html;
});
form.render('select', 'creatorSelectTemplateBox');
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化证件类型下拉选择 // 初始化证件类型下拉选择
function initIdcardTypeSelect() { function initIdcardTypeSelect() {
top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
@ -105,6 +126,7 @@
}); });
} }
initIdcardTypeSelect(); initIdcardTypeSelect();
initCreatorSelect();
// 初始化表格 // 初始化表格
function initTable() { function initTable() {
@ -209,7 +231,8 @@
where: { where: {
name: $('#name').val(), name: $('#name').val(),
idcardType: $('#idcardType').val(), idcardType: $('#idcardType').val(),
idcard: $('#idcard').val() idcard: $('#idcard').val(),
creator: $('#creator').val()
}, },
page: { page: {
curr: currentPage curr: currentPage