人口基本信息- 增加了人口查询跳转页面
人口基本信息- 增加了creator_area1字段(创建人所在街道) 人口基本信息- 增加了查看人员卡片按钮页面跳转
This commit is contained in:
java_cuibaocheng@163.com
parent
5e5f1f6052
commit
7a300e0aca
@ -33,6 +33,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
|
||||
organizationMap.put("党员", "中国共产党党员");
|
||||
organizationMap.put("共青团员", "中国共产主义青年团团员");
|
||||
organizationMap.put("预备党员", "中国共产党预备党员");
|
||||
organizationMap.put("其他", "其他");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -58,7 +59,18 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 高新区街道人口
|
||||
* 年龄 name = [0-20岁 / 21-30岁 / 31-40岁 / 41-50岁 / 50岁以上]
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("age")
|
||||
public ModelAndView age(String name) {
|
||||
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
|
||||
mv.addObject("params", "age=" + name);
|
||||
return mv;
|
||||
}
|
||||
|
||||
/**
|
||||
* 街道人口 name = [稀土路街道 / 民馨路街道 / 万水泉镇]
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("jiedao")
|
||||
@ -114,7 +126,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
|
||||
|
||||
/**
|
||||
* 宗教信仰
|
||||
* @param religion
|
||||
* @param name
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("religion")
|
||||
|
||||
@ -16,7 +16,7 @@ public class PopulationInfoBaseDTO {
|
||||
@ApiModelProperty(name = "isCult", value = "是否为涉邪人员(是或否)")
|
||||
private String isCult = "否";
|
||||
@ApiModelProperty(name = "isMinority", value = "是否为未成年(是或否)")
|
||||
private String isMinority = "否";
|
||||
private String isMinority = "";
|
||||
@ApiModelProperty(name = "isSeriousIllness", value = "是否为重病(是或否)")
|
||||
private String isSeriousIllness = "否";
|
||||
@ApiModelProperty(name = "isDrug", value = "是否为吸毒人员(是或否)")
|
||||
@ -112,12 +112,12 @@ public class PopulationInfoBaseDTO {
|
||||
this.healthStatus = healthStatus;
|
||||
}
|
||||
|
||||
/*public String getIsMinority() {
|
||||
public String getIsMinority() {
|
||||
if (getAge() < 18) {
|
||||
return "是";
|
||||
}
|
||||
return "否";
|
||||
}*/
|
||||
}
|
||||
|
||||
public void setIsMinority(String isMinority) {
|
||||
this.isMinority = isMinority;
|
||||
@ -134,14 +134,17 @@ public class PopulationInfoBaseDTO {
|
||||
this.isSeriousIllness = isSeriousIllness;
|
||||
}
|
||||
|
||||
/*public Integer getAge() {
|
||||
if (StringUtils.isBlank(this.getBirthday())) {
|
||||
public Integer getAge() {
|
||||
if (StringUtils.isBlank(this.getBirthday()) || this.getBirthday().contains("*")) {
|
||||
return 0;
|
||||
}
|
||||
if (!StringUtils.isEmpty(isMinority)) {
|
||||
return 0;
|
||||
}
|
||||
LocalDate birthDate = LocalDate.parse(this.birthday);
|
||||
Period period = Period.between(birthDate, LocalDate.now());
|
||||
return period.getYears();
|
||||
}*/
|
||||
}
|
||||
|
||||
public void setAge(Integer age) {
|
||||
this.age = age;
|
||||
@ -276,7 +279,7 @@ public class PopulationInfoBaseDTO {
|
||||
}
|
||||
|
||||
public String getBirthday() {
|
||||
return birthday;
|
||||
return birthday == null ? "" : birthday;
|
||||
}
|
||||
|
||||
public void setBirthday(String birthday) {
|
||||
|
||||
@ -1125,6 +1125,21 @@
|
||||
<if test="teshu != null and teshu != '' and teshu == '刑满释放'">
|
||||
AND EXISTS (SELECT 1 FROM population_release temp WHERE temp.is_delete = 0 AND temp.population_info_id = t1.population_info_id)
|
||||
</if>
|
||||
<if test="age != null and age != '' and age == '0-20岁'">
|
||||
AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) < 21
|
||||
</if>
|
||||
<if test="age != null and age != '' and age == '21-30岁'">
|
||||
AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) >= 21 AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) <= 30
|
||||
</if>
|
||||
<if test="age != null and age != '' and age == '31-40岁'">
|
||||
AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) >= 31 AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) <= 40
|
||||
</if>
|
||||
<if test="age != null and age != '' and age == '41-50岁'">
|
||||
AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) >= 41 AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) <= 50
|
||||
</if>
|
||||
<if test="age != null and age != '' and age == '50岁以上'">
|
||||
AND TIMESTAMPDIFF(YEAR,DATE(t1.birthday),CURDATE()) > 50
|
||||
</if>
|
||||
<if test="jiedao != null and jiedao != ''">
|
||||
AND t1.creator_area1 = #{jiedao}
|
||||
</if>
|
||||
|
||||
@ -403,7 +403,7 @@
|
||||
<input type="text" readonly class="layui-input" value="{{item.name}}" placeholder="请输入姓名" maxLength="255">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-col-md4 layui-col-xs4">
|
||||
<div class="layui-col-md3 layui-col-xs3">
|
||||
<label class="layui-form-label">证件号码</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" readonly class="layui-input" value="{{item.cardNum}}" placeholder="请输入证件号码" maxLength="255">
|
||||
@ -415,7 +415,7 @@
|
||||
<input type="text" readonly class="layui-input" value="{{item.phone}}" placeholder="请输入联系电话" maxLength="11">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-col-md2 layui-col-xs2" style="text-align: center;">
|
||||
<div class="layui-col-md3 layui-col-xs3" style="text-align: center;">
|
||||
<div class="layui-form-item" style="height: 33px;padding-top: 3px;" pane="">
|
||||
<!--<button type="button" class="layui-btn layui-btn-sm out-population" data-population="{{item.populationInfoId}}">搬离房屋</button>-->
|
||||
<button type="button" class="layui-btn layui-btn-sm layui-btn-danger delete-population" data-population="{{item.populationInfoId}}">录错删除</button>
|
||||
|
||||
@ -405,7 +405,7 @@
|
||||
<input type="text" readonly class="layui-input" value="{{item.name}}" placeholder="请输入姓名" maxLength="255">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-col-md4 layui-col-xs4">
|
||||
<div class="layui-col-md3 layui-col-xs3">
|
||||
<label class="layui-form-label">证件号码</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" readonly class="layui-input" value="{{item.cardNum}}" placeholder="请输入证件号码" maxLength="255">
|
||||
@ -417,7 +417,7 @@
|
||||
<input type="text" readonly class="layui-input" value="{{item.phone}}" placeholder="请输入联系电话" maxLength="11">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-col-md2 layui-col-xs2" style="text-align: center;">
|
||||
<div class="layui-col-md3 layui-col-xs3" style="text-align: center;">
|
||||
<div class="layui-form-item" style="height: 33px;padding-top: 3px;" pane="">
|
||||
{{# if(item.populationId != '') { }}
|
||||
<button type="button" class="layui-btn layui-btn-sm out-population" data-population="{{item.populationInfoId}}">搬离房屋</button>
|
||||
|
||||
@ -79,9 +79,9 @@
|
||||
<button type="button" class="layui-btn layui-btn-sm" lay-event="petitionEvent">
|
||||
重点上访户
|
||||
</button>
|
||||
<!-- <button type="button" class="layui-btn layui-btn-sm" lay-event="tiaoshiEvent">-->
|
||||
<!-- 调试-->
|
||||
<!-- </button>-->
|
||||
<button type="button" class="layui-btn layui-btn-sm" lay-event="tiaoshiEvent">
|
||||
调试
|
||||
</button>
|
||||
</div>
|
||||
</script>
|
||||
</div>
|
||||
@ -525,7 +525,6 @@
|
||||
});
|
||||
}
|
||||
}else if(layEvent === 'tiaoshiEvent') {
|
||||
|
||||
top.layer.open({
|
||||
type: 2,
|
||||
title: "调试",
|
||||
@ -533,7 +532,7 @@
|
||||
area: ['95%', '95%'],
|
||||
shadeClose: true,
|
||||
anim: 2,
|
||||
content: top.restAjax.path('route/populationinfo-data/organization?organization=党员', []),
|
||||
content: top.restAjax.path('route/populationinfo-data/age?name=未填写', []),
|
||||
end: function() {
|
||||
reloadTable();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user