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

修改证件号校验 , 人口录入页面布局 , 年龄解析

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2023-11-04 15:26:01 +08:00
parent 77e5fff71d
commit e528a85aa9
10 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cm/population/controller/api/areatree/AreaTreeController.java
View File

@ -133,7 +133,7 @@ public class AreaTreeController extends AbstractController {
for(AreaZtreeDTO dto : list) {
ArrayList<String> names = new ArrayList<>();
names.add(dto.getName());
getParent(names, dto.getpId());
getParentBaoTou(names, dto.getpId());
dto.setTitle(StringUtils.join(names, "/"));
}
return list;

12
src/main/java/com/cm/population/controller/app/api/areatree/AreaTreeAppController.java
View File

@ -91,7 +91,7 @@ public class AreaTreeAppController extends AbstractController {
* @return
*/
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("tree")
@PostMapping("tree")
public List<AreaZtreeDTO> tree(String id) {
String parentId = id;
if (StringUtils.isEmpty(id)) {
@ -101,7 +101,7 @@ public class AreaTreeAppController extends AbstractController {
for(AreaZtreeDTO dto : list) {
ArrayList<String> names = new ArrayList<>();
names.add(dto.getName());
getParent(names, dto.getpId());
getParentBaoTou(names, dto.getpId());
dto.setTitle(StringUtils.join(names, "/"));
}
return list;
@ -137,4 +137,12 @@ public class AreaTreeAppController extends AbstractController {
}
}
public void getParentBaoTou(ArrayList names, String pId) {
DataAreaDTO areaDTO = iPopulationInfoService.getAreaById(pId);
if(areaDTO != null && !areaDTO.getAreaLevel().equals("1") && !areaDTO.getAreaLevel().equals("0") ) {
names.add(0, areaDTO.getAreaName());
getParentBaoTou(names, areaDTO.getAreaParentId());
}
}
}

2
src/main/resources/templates/cult/save.html
View File

@ -166,7 +166,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

2
src/main/resources/templates/cult/update.html
View File

@ -162,7 +162,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

2
src/main/resources/templates/dispute/save.html
View File

@ -750,7 +750,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

2
src/main/resources/templates/dispute/update.html
View File

@ -754,7 +754,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

6
src/main/resources/templates/populationinfo/save.html
View File

@ -345,7 +345,7 @@
</div>
</div>
<div class="layui-row">
<div class="layui-col-md6 layui-col-xs6" >
<div class="layui-col-md12 layui-col-xs12" >
<div class="layui-form-item ">
<label class="layui-form-label">户籍地址<span style="color: red">*</span></label>
<div class="layui-input-block">
@ -362,7 +362,7 @@
</div>
</div>
</div>
<div class="layui-col-md12 layui-col-xs12" >
<div class="layui-col-md6 layui-col-xs6" >
<div class="layui-form-item ">
<label class="layui-form-label">籍贯地址</label>
<div class="layui-input-block">
@ -933,7 +933,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

8
src/main/resources/templates/populationinfo/update.html
View File

@ -344,7 +344,7 @@
</div>
</div>
<div class="layui-row">
<div class="layui-col-md6 layui-col-xs6" >
<div class="layui-col-md12 layui-col-xs12" >
<div class="layui-form-item ">
<label class="layui-form-label">户籍地址<span style="color: red">*</span></label>
<div class="layui-input-block">
@ -361,7 +361,7 @@
</div>
</div>
</div>
<div class="layui-col-md12 layui-col-xs12" >
<div class="layui-col-md6 layui-col-xs6" >
<div class="layui-form-item ">
<label class="layui-form-label">籍贯地址</label>
<div class="layui-input-block">
@ -877,7 +877,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();
@ -908,7 +908,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

2
src/main/resources/templates/security/save.html
View File

@ -243,7 +243,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();

2
src/main/resources/templates/security/update.html
View File

@ -245,7 +245,7 @@
callback : {
onClick : function (e, treeId, treeNode) {
var count = treeNode.title.split('/').length -1;
if (count > 1) {
if (count > 0) {
$('#' + name + "AreaName").val(treeNode.title);
$('#' + name + "AreaCode").val(treeNode.areaCode);
hideMenu();