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-21 16:51:35 +08:00
parent f83df1cd20
commit f6f88840ec
23 changed files with 101 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/cm/population/pojo/dtos/petition/PetitionDTO.java
View File

@ -30,6 +30,8 @@ public class PetitionDTO {
private String stabilizeLevel;
@ApiModelProperty(name = "type", value = "上访类型")
private String type;
@ApiModelProperty(name = "puttime", value = "采集时间")
private String puttime;
@ApiModelProperty(name = "reason", value = "上访原因")
private String reason;
@ApiModelProperty(name = "reasonOther", value = "上访原因(其他)")
@ -55,6 +57,14 @@ public class PetitionDTO {
private String coordinateName;
private String talkName;
public String getPuttime() {
return puttime;
}
public void setPuttime(String puttime) {
this.puttime = puttime;
}
public String getCoordinateName() {
return coordinateName;
}

2
src/main/java/com/cm/population/pojo/vos/correct/CorrectVO.java
View File

@ -19,6 +19,7 @@ public class CorrectVO {
@CheckEmptyAnnotation(name = "人员信息")
private String populationInfoId;
@ApiModelProperty(name = "charge", value = "罪名")
@CheckEmptyAnnotation(name = "罪名")
private String charge;
@ApiModelProperty(name = "prisonTerm", value = "刑期")
private String prisonTerm;
@ -29,6 +30,7 @@ public class CorrectVO {
@ApiModelProperty(name = "superviseTime", value = "监管时间")
private String superviseTime;
@ApiModelProperty(name = "isRelease", value = "是否释放")
@CheckEmptyAnnotation(name = "是否释放")
private String isRelease;
@ApiModelProperty(name = "releaseTime", value = "释放时间")
private String releaseTime;

1
src/main/java/com/cm/population/pojo/vos/cult/CultVO.java
View File

@ -34,6 +34,7 @@ public class CultVO {
@ApiModelProperty(name = "cultAreaName", value = "居住地址区域名称")
private String cultAreaName;
@ApiModelProperty(name = "puttime", value = "采集时间")
@CheckEmptyAnnotation(name = "采集时间")
private String puttime;
@ApiModelProperty(name = "docontinue", value = "是否继续邪教")
private String docontinue;

2
src/main/java/com/cm/population/pojo/vos/dispute/DisputeVO.java
View File

@ -17,10 +17,12 @@ import io.swagger.annotations.ApiModelProperty;
public class DisputeVO {
@ApiModelProperty(name = "caseName", value = "事件名称")
@CheckEmptyAnnotation(name = "事件名称")
private String caseName;
@ApiModelProperty(name = "caseTitle", value = "事件标题")
private String caseTitle;
@ApiModelProperty(name = "caseTime", value = "发生时间")
@CheckEmptyAnnotation(name = "发生时间")
private String caseTime;
@ApiModelProperty(name = "caseAddress", value = "发生详细地点")
private String caseAddress;

1
src/main/java/com/cm/population/pojo/vos/drug/DrugVO.java
View File

@ -20,6 +20,7 @@ public class DrugVO {
@CheckEmptyAnnotation(name = "人员信息")
private String populationInfoId;
@ApiModelProperty(name = "startTime", value = "初次发现日期")
@CheckEmptyAnnotation(name = "初次发现日期")
private String startTime;
@ApiModelProperty(name = "control", value = "管控情况")
private String control;

10
src/main/java/com/cm/population/pojo/vos/petition/PetitionVO.java
View File

@ -29,6 +29,9 @@ public class PetitionVO {
private String stabilizeStatus;
@ApiModelProperty(name = "stabilizeLevel", value = "涉稳等级")
private String stabilizeLevel;
@ApiModelProperty(name = "puttime", value = "采集时间")
@CheckEmptyAnnotation(name ="采集时间")
private String puttime;
@ApiModelProperty(name = "type", value = "上访类型")
private String type;
@ApiModelProperty(name = "reason", value = "上访原因")
@ -43,6 +46,13 @@ public class PetitionVO {
private String coordinate;
@ApiModelProperty(name = "talk", value = "谈话教育训诫情况")
private String talk;
public String getPuttime() {
return puttime;
}
public void setPuttime(String puttime) {
this.puttime = puttime;
}
public String getPopulationInfoId() {
return populationInfoId == null ? "" : populationInfoId.trim();

2
src/main/java/com/cm/population/pojo/vos/release/ReleaseVO.java
View File

@ -19,6 +19,7 @@ public class ReleaseVO {
@CheckEmptyAnnotation(name = "人口")
private String populationInfoId;
@ApiModelProperty(name = "charge", value = "罪名")
@CheckEmptyAnnotation(name = "罪名")
private String charge;
@ApiModelProperty(name = "prisonTerm", value = "刑期")
private String prisonTerm;
@ -29,6 +30,7 @@ public class ReleaseVO {
@ApiModelProperty(name = "superviseTime", value = "监管时间")
private String superviseTime;
@ApiModelProperty(name = "isRelease", value = "是否释放")
@CheckEmptyAnnotation(name = "是否释放")
private String isRelease;
@ApiModelProperty(name = "releaseTime", value = "释放时间")
private String releaseTime;

8
src/main/resources/mybatis/mapper/petition/petition-mapper.xml
View File

@ -11,6 +11,7 @@
<result column="stabilize_status" property="stabilizeStatus"/>
<result column="stabilize_level" property="stabilizeLevel"/>
<result column="type" property="type"/>
<result column="puttime" property="puttime"/>
<result column="reason" property="reason"/>
<result column="reason_other" property="reasonOther"/>
<result column="onduty" property="onduty"/>
@ -80,6 +81,7 @@
economy,
stabilize_status,
stabilize_level,
puttime,
type,
reason,
reason_other,
@ -100,6 +102,7 @@
#{economy},
#{stabilizeStatus},
#{stabilizeLevel},
#{puttime},
#{type},
#{reason},
#{reasonOther},
@ -164,6 +167,9 @@
<if test="stabilizeLevel != null">
stabilize_level = #{stabilizeLevel},
</if>
<if test="puttime != null">
puttime = #{puttime},
</if>
<if test="type != null">
type = #{type},
</if>
@ -201,6 +207,7 @@
t1.economy,
t1.stabilize_status,
t1.stabilize_level,
t1.puttime,
t1.type,
t1.reason,
t1.reason_other,
@ -302,6 +309,7 @@
t1.economy,
t1.stabilize_status,
t1.stabilize_level,
t1.puttime,
t1.type,
t1.reason,
t1.reason_other,

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

@ -24,7 +24,7 @@
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<input type="hidden" id="populationInfoId" name="charge" class="layui-input" value="" maxlength="50">
<div class="layui-form-item">
<label class="layui-form-label">罪名</label>
<label class="layui-form-label">罪名<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="charge" name="charge" class="layui-input" value="" placeholder="请输入罪名" maxlength="50">
</div>
@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-form-item" pane="">
<label class="layui-form-label">是否释放</label>
<label class="layui-form-label">是否释放<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="radio" name="isRelease" value="是" title="是">
<input type="radio" name="isRelease" value="否" title="否">

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

@ -24,7 +24,7 @@
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="50">
<div class="layui-form-item">
<label class="layui-form-label">罪名</label>
<label class="layui-form-label">罪名<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="charge" name="charge" class="layui-input" value="" placeholder="请输入罪名" maxlength="50">
</div>
@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-form-item" pane="">
<label class="layui-form-label">是否释放</label>
<label class="layui-form-label">是否释放<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="radio" name="isRelease" value="是" title="是">
<input type="radio" name="isRelease" value="否" title="否">

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

@ -77,7 +77,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">采集时间</label>
<label class="layui-form-label">采集时间<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="puttime" readonly style="cursor: pointer;" name="puttime" class="layui-input" value="" placeholder="请输入采集时间" maxlength="20">
</div>

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

@ -77,7 +77,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">采集时间</label>
<label class="layui-form-label">采集时间<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="puttime" readonly style="cursor: pointer;" name="puttime" class="layui-input" value="" placeholder="请输入采集时间" maxlength="20">
</div>

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

@ -35,7 +35,7 @@
<div class="layui-row">
<div class="layui-col-md4 layui-col-lg4" >
<div class="layui-form-item">
<label class="layui-form-label">事件名称</label>
<label class="layui-form-label">事件名称<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="caseName" name="caseName" class="layui-input" value="" placeholder="请输入事件名称" maxlength="200">
</div>
@ -51,7 +51,7 @@
</div>
<div class="layui-col-md4 layui-col-lg4" >
<div class="layui-form-item">
<label class="layui-form-label">发生日期</label>
<label class="layui-form-label">发生日期<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="caseTime" name="caseTime" class="layui-input" value="" placeholder="请选择发生日期" readonly style="cursor: pointer;">
</div>

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

@ -36,7 +36,7 @@
<div class="layui-row">
<div class="layui-col-md4 layui-col-lg4" >
<div class="layui-form-item">
<label class="layui-form-label">事件名称</label>
<label class="layui-form-label">事件名称<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="caseName" name="caseName" class="layui-input" value="" placeholder="请输入事件名称" maxlength="200">
</div>
@ -52,7 +52,7 @@
</div>
<div class="layui-col-md4 layui-col-lg4" >
<div class="layui-form-item">
<label class="layui-form-label">发生日期</label>
<label class="layui-form-label">发生日期<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="caseTime" name="caseTime" class="layui-input" value="" placeholder="请选择发生日期" readonly style="cursor: pointer;">
</div>

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

@ -32,7 +32,7 @@
<div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<div class="layui-form-item">
<label class="layui-form-label">初次发现日期</label>
<label class="layui-form-label">初次发现日期<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="startTime" name="startTime" class="layui-input" value="" placeholder="请选择初次发现日期" readonly style="cursor: pointer;">
</div>

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

@ -32,7 +32,7 @@
<div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<div class="layui-form-item">
<label class="layui-form-label">初次发现日期</label>
<label class="layui-form-label">初次发现日期<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="200">
<input type="text" id="startTime" name="startTime" class="layui-input" value="" placeholder="请选择初次发现日期" readonly style="cursor: pointer;">

9
src/main/resources/templates/petition/list.html
View File

@ -300,6 +300,15 @@
return rowData;
}
},
{field: 'puttime', width: 180, title: '采集时间', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'onduty', width: 180, title: '在位情况', align:'center',
templet: function(row) {
var rowData = row[this.field];

19
src/main/resources/templates/petition/save.html
View File

@ -130,6 +130,14 @@
</script>
</div>
</div>
<div class="layui-col-md4 layui-col-lg4" >
<div class="layui-form-item">
<label class="layui-form-label">采集时间<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="puttime" readonly style="cursor: pointer;" name="puttime" class="layui-input" value="" placeholder="请输入采集时间" maxlength="20">
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-form-text ">
<label class="layui-form-label">上访原因(其他)</label>
@ -412,6 +420,16 @@
});
}
// 初始化采集时间
function initPuttime() {
laydate.render({
elem: '#puttime',
type: 'date',
value: '',
trigger: 'click'
});
}
// 初始化内容
function initData() {
initActivationSelect();
@ -425,6 +443,7 @@
initHandleSelect();
initCoordinateSelect();
initTalkSelect();
initPuttime();
}
initData();

19
src/main/resources/templates/petition/update.html
View File

@ -122,6 +122,14 @@
</script>
</div>
</div>
<div class="layui-col-md4 layui-col-lg4" >
<div class="layui-form-item">
<label class="layui-form-label">采集时间<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="puttime" readonly style="cursor: pointer;" name="puttime" class="layui-input" value="" placeholder="请输入采集时间" maxlength="20">
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-form-text ">
<label class="layui-form-label">上访原因(其他)</label>
@ -449,6 +457,16 @@
});
}
// 初始化采集时间
function initPuttime(value) {
laydate.render({
elem: '#puttime',
type: 'date',
value: value,
trigger: 'click'
});
}
// 初始化内容
function initData() {
var loadLayerIndex;
@ -470,6 +488,7 @@
initHandleSelect(data['handle']);
initCoordinateSelect(data['coordinate']);
initTalkSelect(data['talk']);
initPuttime(data['puttime']);
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {

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

@ -24,7 +24,7 @@
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<input type="hidden" id="populationInfoId" name="charge" class="layui-input" value="" maxlength="50">
<div class="layui-form-item">
<label class="layui-form-label">罪名</label>
<label class="layui-form-label">罪名<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="charge" name="charge" class="layui-input" value="" placeholder="请输入罪名" maxlength="50">
</div>
@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-form-item" pane="">
<label class="layui-form-label">是否释放</label>
<label class="layui-form-label">是否释放<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="radio" name="isRelease" value="是" title="是">
<input type="radio" name="isRelease" value="否" title="否">

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

@ -24,7 +24,7 @@
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="50">
<div class="layui-form-item">
<label class="layui-form-label">罪名</label>
<label class="layui-form-label">罪名<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="charge" name="charge" class="layui-input" value="" placeholder="请输入罪名" maxlength="50">
</div>
@ -59,7 +59,7 @@
</div>
</div>
<div class="layui-form-item" pane="">
<label class="layui-form-label">是否释放</label>
<label class="layui-form-label">是否释放<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="radio" name="isRelease" value="是" title="是">
<input type="radio" name="isRelease" value="否" title="否">

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

@ -39,7 +39,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">时间</label>
<label class="layui-form-label">时间<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="time" name="time" class="layui-input" value="" placeholder="请选择时间" readonly style="cursor: pointer;" lay-verify="required">
</div>

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

@ -40,7 +40,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">时间</label>
<label class="layui-form-label">时间<span style="color: red">*</span></label>
<div class="layui-input-block">
<input type="text" id="time" name="time" class="layui-input" value="" placeholder="请选择时间" readonly style="cursor: pointer;" lay-verify="required">
</div>