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

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

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2024-01-10 12:00:30 +08:00
commit 9c5ea47f1c
4 changed files with 136 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,6 +477,44 @@
<if test="custodianPhone != null and custodianPhone != ''"> <if test="custodianPhone != null and custodianPhone != ''">
custodian_phone = #{custodianPhone}, custodian_phone = #{custodianPhone},
</if> </if>
<if test="ownerPopulationId == null or ownerPopulationId == ''">
owner_population_id = '',
</if>
<if test="homeowner == null or homeowner == ''">
homeowner = '',
</if>
<if test="documentId == null or documentId == ''">
document_id = '',
</if>
<if test="documentName == null or documentName == ''">
document_name = '',
</if>
<if test="documentNum == null or documentNum == ''">
document_num = '',
</if>
<if test="phone == null or phone == ''">
phone = '',
</if>
<if test="custodianPopulationId == null or custodianPopulationId == ''">
custodian_population_id = '',
</if>
<if test="custodian == null or custodian == ''">
custodian = '',
</if>
<if test="custodianDocumentId == null or custodianDocumentId == ''">
custodian_document_id = '',
</if>
<if test="custodianDocumentName == null or custodianDocumentName == ''">
custodian_document_name = '',
</if>
<if test="custodianDocumentNum == null or custodianDocumentNum == ''">
custodian_document_num = '',
</if>
<if test="custodianPhone == null or custodianPhone == ''">
custodian_phone = '',
</if>
<if test="relationshipHomeowner != null and relationshipHomeowner != ''"> <if test="relationshipHomeowner != null and relationshipHomeowner != ''">
relationship_homeowner = #{relationshipHomeowner}, relationship_homeowner = #{relationshipHomeowner},
</if> </if>

2
src/main/resources/templates/house/list-popu.html
View File

@ -264,7 +264,7 @@
console.log(data) console.log(data)
var loadLayerIndex; var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/populationinfo/get/{populationInfoId}', [data.populationInfoId]), {}, null, function(code, data) { top.restAjax.get(top.restAjax.path('api/populationinfo/get/{populationInfoId}', [data.populationInfoId]), {}, null, function(code, data) {
top.dialog.dialogData.popuData = checkData; top.dialog.dialogData.popuData = data;
var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引 var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
parent.layer.close(index); parent.layer.close(index);
}, function(code, data) { }, function(code, data) {

45
src/main/resources/templates/house/save.html
View File

@ -280,11 +280,16 @@
<div class="div-base-population-info"> <div class="div-base-population-info">
<blockquote class="layui-elem-quote">房主</blockquote> <blockquote class="layui-elem-quote">房主</blockquote>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class=""> <div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;"> <div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn homeownerSearch">搜索</button> <button type="button" class="layui-btn homeownerSearch">搜索</button>
</div> </div>
</div> </div>
<div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn clearOwner">清除数据</button>
</div>
</div>
</div> </div>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class="layui-col-xs6"> <div class="layui-col-xs6">
@ -327,11 +332,16 @@
<div class="div-base-population-info"> <div class="div-base-population-info">
<blockquote class="layui-elem-quote">托管人</blockquote> <blockquote class="layui-elem-quote">托管人</blockquote>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class=""> <div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;"> <div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn custodianSearch">搜索</button> <button type="button" class="layui-btn custodianSearch">搜索</button>
</div> </div>
</div> </div>
<div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn clearCustodian">清除数据</button>
</div>
</div>
</div> </div>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class="layui-col-xs6"> <div class="layui-col-xs6">
@ -545,12 +555,23 @@
var popuData = top.dialog.dialogData.popuData; var popuData = top.dialog.dialogData.popuData;
$('#homeowner').val(popuData.name); $('#homeowner').val(popuData.name);
$('#documentId').val('b7d74045-d984-4822-b0f3-711b15b933ca'); $('#documentId').val('b7d74045-d984-4822-b0f3-711b15b933ca');
$('#documentName').val('居民身份证');
$('#documentNum').val(popuData.idcard); $('#documentNum').val(popuData.idcard);
$('#phone').val(popuData.phone); $('#phone').val(popuData.phone);
$('#ownerPopulationId').val(popuData.populationInfoId);
} }
}); });
} }
function clearOwner() {
$('#homeowner').val('');
$('#documentId').val('');
$('#documentName').val('');
$('#documentNum').val('');
$('#phone').val('');
$('#ownerPopulationId').val('');
}
var cohabitArray = new Array(); var cohabitArray = new Array();
// 同住人搜索 // 同住人搜索
function cohabitSearch() { function cohabitSearch() {
@ -650,12 +671,23 @@
var popuData = top.dialog.dialogData.popuData; var popuData = top.dialog.dialogData.popuData;
$('#custodian').val(popuData.name); $('#custodian').val(popuData.name);
$('#custodianDocumentId').val('b7d74045-d984-4822-b0f3-711b15b933ca'); $('#custodianDocumentId').val('b7d74045-d984-4822-b0f3-711b15b933ca');
$('#custodianDocumentName').val('居民身份证');
$('#custodianDocumentNum').val(popuData.idcard); $('#custodianDocumentNum').val(popuData.idcard);
$('#custodianPhone').val(popuData.phone); $('#custodianPhone').val(popuData.phone);
$('#custodianPopulationId').val(popuData.populationInfoId);
} }
}); });
} }
function clearCustodian() {
$('#custodian').val('');
$('#custodianDocumentId').val('');
$('#custodianDocumentName').val('');
$('#custodianDocumentNum').val('');
$('#custodianPhone').val('');
$('#custodianPopulationId').val('');
}
// 初始化单元/列数下拉列表 // 初始化单元/列数下拉列表
function initAffiliationUnit(num) { function initAffiliationUnit(num) {
var html = '<option></option>'; var html = '<option></option>';
@ -946,10 +978,19 @@
homeownerSearch(); homeownerSearch();
}); });
// 清除数据
$('.clearOwner').on('click', function() {
clearOwner();
});
$('.custodianSearch').on('click', function() { $('.custodianSearch').on('click', function() {
custodianSearch(); custodianSearch();
}); });
$('.clearCustodian').on('click', function() {
clearCustodian();
});
$('.cohabitSearch').on('click', function() { $('.cohabitSearch').on('click', function() {
cohabitSearch(); cohabitSearch();
}); });

56
src/main/resources/templates/house/update.html
View File

@ -280,11 +280,16 @@
<div class="div-base-population-info"> <div class="div-base-population-info">
<blockquote class="layui-elem-quote">房主</blockquote> <blockquote class="layui-elem-quote">房主</blockquote>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class=""> <div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;"> <div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn homeownerSearch">搜索</button> <button type="button" class="layui-btn homeownerSearch">搜索</button>
</div> </div>
</div> </div>
<div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn clearOwner">清除数据</button>
</div>
</div>
</div> </div>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class="layui-col-xs6"> <div class="layui-col-xs6">
@ -327,11 +332,16 @@
<div class="div-base-population-info"> <div class="div-base-population-info">
<blockquote class="layui-elem-quote">托管人</blockquote> <blockquote class="layui-elem-quote">托管人</blockquote>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class=""> <div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;"> <div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn custodianSearch">搜索</button> <button type="button" class="layui-btn custodianSearch">搜索</button>
</div> </div>
</div> </div>
<div class="layui-col-xs1">
<div class="layui-footer" style="left: 98%;">
<button type="button" class="layui-btn clearCustodian">清除数据</button>
</div>
</div>
</div> </div>
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class="layui-col-xs6"> <div class="layui-col-xs6">
@ -521,19 +531,32 @@
var popuData = top.dialog.dialogData.popuData; var popuData = top.dialog.dialogData.popuData;
$('#homeowner').val(popuData.name); $('#homeowner').val(popuData.name);
$('#documentId').val('b7d74045-d984-4822-b0f3-711b15b933ca'); $('#documentId').val('b7d74045-d984-4822-b0f3-711b15b933ca');
$('#documentName').val('居民身份证');
$('#documentNum').val(popuData.idcard); $('#documentNum').val(popuData.idcard);
$('#phone').val(popuData.phone); $('#phone').val(popuData.phone);
$('#ownerPopulationId').val(popuData.populationInfoId);
var selectObj = {}; var selectObj = {};
selectObj['homeowner'] = popuData.name; selectObj['homeowner'] = popuData.name;
selectObj['documentId'] = 'b7d74045-d984-4822-b0f3-711b15b933ca'; selectObj['documentId'] = 'b7d74045-d984-4822-b0f3-711b15b933ca';
selectObj['documentName'] = '居民身份证';
selectObj['documentNum'] = popuData.idcard; selectObj['documentNum'] = popuData.idcard;
selectObj['phone'] = popuData.phone; selectObj['phone'] = popuData.phone;
selectObj['ownerPopulationId'] = popuData.populationInfoId;
form.val('dataForm', selectObj); form.val('dataForm', selectObj);
} }
}); });
} }
function clearOwner() {
$('#homeowner').val('');
$('#documentId').val('');
$('#documentName').val('');
$('#documentNum').val('');
$('#phone').val('');
$('#ownerPopulationId').val('');
}
// 托管人搜索 // 托管人搜索
function custodianSearch() { function custodianSearch() {
top.dialog.open({ top.dialog.open({
@ -545,12 +568,32 @@
var popuData = top.dialog.dialogData.popuData; var popuData = top.dialog.dialogData.popuData;
$('#custodian').val(popuData.name); $('#custodian').val(popuData.name);
$('#custodianDocumentId').val('b7d74045-d984-4822-b0f3-711b15b933ca'); $('#custodianDocumentId').val('b7d74045-d984-4822-b0f3-711b15b933ca');
$('#custodianDocumentName').val('居民身份证');
$('#custodianDocumentNum').val(popuData.idcard); $('#custodianDocumentNum').val(popuData.idcard);
$('#custodianPhone').val(popuData.phone); $('#custodianPhone').val(popuData.phone);
$('#custodianPopulationId').val(popuData.populationInfoId);
var selectObj = {};
selectObj['custodian'] = popuData.name;
selectObj['custodianDocumentId'] = 'b7d74045-d984-4822-b0f3-711b15b933ca';
selectObj['custodianDocumentName'] = '居民身份证';
selectObj['custodianDocumentNum'] = popuData.idcard;
selectObj['custodianPhone'] = popuData.phone;
selectObj['custodianPopulationId'] = popuData.populationInfoId;
form.val('dataForm', selectObj);
} }
}); });
} }
function clearCustodian() {
$('#custodian').val('');
$('#custodianDocumentId').val('');
$('#custodianDocumentName').val('');
$('#custodianDocumentNum').val('');
$('#custodianPhone').val('');
$('#custodianPopulationId').val('');
}
// 初始化单元/列数下拉列表 // 初始化单元/列数下拉列表
function initAffiliationUnit(num, selectValue) { function initAffiliationUnit(num, selectValue) {
var html = '<option></option>'; var html = '<option></option>';
@ -992,10 +1035,19 @@
homeownerSearch(); homeownerSearch();
}); });
// 清除数据
$('.clearOwner').on('click', function() {
clearOwner();
});
$('.custodianSearch').on('click', function() { $('.custodianSearch').on('click', function() {
custodianSearch(); custodianSearch();
}); });
$('.clearCustodian').on('click', function() {
clearCustodian();
});
$('.cohabitSearch').on('click', function() { $('.cohabitSearch').on('click', function() {
cohabitSearch(); cohabitSearch();
}); });