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

房屋内录入人员信息时必填项修改 --renpc

Browse Source
This commit is contained in:
Renpc-kilig 2023-11-13 15:38:29 +08:00
parent ac6d27ce77
commit d57a723b65
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
View File

@ -240,9 +240,11 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
} }
// 获取人口详情 // 获取人口详情
PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId()); if(StringUtils.isNotEmpty(populationDTO.getPopulationInfoId())) {
if(null != populationInfoDTO) { PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
populationDTO.setPopulationInfoDTO(populationInfoDTO); if (null != populationInfoDTO) {
populationDTO.setPopulationInfoDTO(populationInfoDTO);
}
} }
} }
} }
@ -257,15 +259,17 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
// 获取人口详情 // 获取人口详情
for (PopulationDTO populationDTO : overList) { for (PopulationDTO populationDTO : overList) {
PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId()); if(StringUtils.isNotEmpty(populationDTO.getPopulationInfoId())) {
PopulationInfoHouseDTO populationInfoHouseDTO = new PopulationInfoHouseDTO(); PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
BeanUtils.copyProperties(populationInfoDTO, populationInfoHouseDTO); PopulationInfoHouseDTO populationInfoHouseDTO = new PopulationInfoHouseDTO();
BeanUtils.copyProperties(populationInfoDTO, populationInfoHouseDTO);
// 获取人员 // 获取人员
PopulationInfoBaseDTO base = populationInfoService.getBase(populationDTO.getPopulationInfoId()); PopulationInfoBaseDTO base = populationInfoService.getBase(populationDTO.getPopulationInfoId());
populationInfoHouseDTO.setPopulationInfoBaseDTO(base); populationInfoHouseDTO.setPopulationInfoBaseDTO(base);
populationDTO.setPopulationInfoHouseDTO(populationInfoHouseDTO); populationDTO.setPopulationInfoHouseDTO(populationInfoHouseDTO);
}
// 获取房屋详情 // 获取房屋详情
HouseDTO houseDTO = houseService.get(populationDTO.getHouseId()); HouseDTO houseDTO = houseService.get(populationDTO.getHouseId());

3
src/main/resources/templates/population/list.html
View File

@ -31,6 +31,9 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent"> <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
<i class="fa fa-lg fa-plus"></i> 新增 <i class="fa fa-lg fa-plus"></i> 新增
</button> </button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
<i class="fa fa-lg fa-edit"></i> 编辑
</button>
<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent"> <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
<i class="fa fa-lg fa-trash"></i> 删除 <i class="fa fa-lg fa-trash"></i> 删除
</button> </button>

4
src/main/resources/templates/population/save.html
View File

@ -33,13 +33,13 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="36"> <input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="36">
<input type="hidden" id="houseId" name="houseId" class="layui-input" value="" maxlength="36"> <input type="hidden" id="houseId" name="houseId" class="layui-input" value="" maxlength="36">
<input type="text" readonly id="name" name="name" class="layui-input" value="" placeholder="请输入姓名" maxlength="255"> <input type="text" id="name" name="name" class="layui-input" value="" placeholder="请输入姓名" maxlength="255">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">证件号码</label> <label class="layui-form-label">证件号码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" readonly id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码" maxlength="20"> <input type="text" id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码" maxlength="20">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">

4
src/main/resources/templates/population/update.html
View File

@ -33,13 +33,13 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="36"> <input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="36">
<input type="hidden" id="houseId" name="houseId" class="layui-input" value="" maxlength="36"> <input type="hidden" id="houseId" name="houseId" class="layui-input" value="" maxlength="36">
<input type="text" readonly id="name" name="name" class="layui-input" value="" placeholder="请输入姓名" maxlength="255"> <input type="text" id="name" name="name" class="layui-input" value="" placeholder="请输入姓名" maxlength="255">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">证件号码</label> <label class="layui-form-label">证件号码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" readonly id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码" maxlength="20"> <input type="text" id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码" maxlength="20">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">