diff --git a/src/main/java/com/cm/population/pojo/dtos/petition/PetitionDTO.java b/src/main/java/com/cm/population/pojo/dtos/petition/PetitionDTO.java index f9a6732..49398f1 100644 --- a/src/main/java/com/cm/population/pojo/dtos/petition/PetitionDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/petition/PetitionDTO.java @@ -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; } diff --git a/src/main/java/com/cm/population/pojo/vos/correct/CorrectVO.java b/src/main/java/com/cm/population/pojo/vos/correct/CorrectVO.java index f980bf2..20f4f2a 100644 --- a/src/main/java/com/cm/population/pojo/vos/correct/CorrectVO.java +++ b/src/main/java/com/cm/population/pojo/vos/correct/CorrectVO.java @@ -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; diff --git a/src/main/java/com/cm/population/pojo/vos/cult/CultVO.java b/src/main/java/com/cm/population/pojo/vos/cult/CultVO.java index 7d9310e..0e3a6a4 100644 --- a/src/main/java/com/cm/population/pojo/vos/cult/CultVO.java +++ b/src/main/java/com/cm/population/pojo/vos/cult/CultVO.java @@ -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; diff --git a/src/main/java/com/cm/population/pojo/vos/dispute/DisputeVO.java b/src/main/java/com/cm/population/pojo/vos/dispute/DisputeVO.java index 099433d..d9c526c 100644 --- a/src/main/java/com/cm/population/pojo/vos/dispute/DisputeVO.java +++ b/src/main/java/com/cm/population/pojo/vos/dispute/DisputeVO.java @@ -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; diff --git a/src/main/java/com/cm/population/pojo/vos/drug/DrugVO.java b/src/main/java/com/cm/population/pojo/vos/drug/DrugVO.java index dd4fa96..006f086 100644 --- a/src/main/java/com/cm/population/pojo/vos/drug/DrugVO.java +++ b/src/main/java/com/cm/population/pojo/vos/drug/DrugVO.java @@ -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; diff --git a/src/main/java/com/cm/population/pojo/vos/petition/PetitionVO.java b/src/main/java/com/cm/population/pojo/vos/petition/PetitionVO.java index 979e41f..ee2357b 100644 --- a/src/main/java/com/cm/population/pojo/vos/petition/PetitionVO.java +++ b/src/main/java/com/cm/population/pojo/vos/petition/PetitionVO.java @@ -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(); diff --git a/src/main/java/com/cm/population/pojo/vos/release/ReleaseVO.java b/src/main/java/com/cm/population/pojo/vos/release/ReleaseVO.java index dc2202f..d467b52 100644 --- a/src/main/java/com/cm/population/pojo/vos/release/ReleaseVO.java +++ b/src/main/java/com/cm/population/pojo/vos/release/ReleaseVO.java @@ -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; diff --git a/src/main/resources/mybatis/mapper/petition/petition-mapper.xml b/src/main/resources/mybatis/mapper/petition/petition-mapper.xml index 6553260..f4b242b 100644 --- a/src/main/resources/mybatis/mapper/petition/petition-mapper.xml +++ b/src/main/resources/mybatis/mapper/petition/petition-mapper.xml @@ -11,6 +11,7 @@ + @@ -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 @@ stabilize_level = #{stabilizeLevel}, + + puttime = #{puttime}, + type = #{type}, @@ -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, diff --git a/src/main/resources/templates/correct/save.html b/src/main/resources/templates/correct/save.html index 7083b6f..dd2c7b4 100644 --- a/src/main/resources/templates/correct/save.html +++ b/src/main/resources/templates/correct/save.html @@ -24,7 +24,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/src/main/resources/templates/correct/update.html b/src/main/resources/templates/correct/update.html index 15c73ca..c55f401 100644 --- a/src/main/resources/templates/correct/update.html +++ b/src/main/resources/templates/correct/update.html @@ -24,7 +24,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/src/main/resources/templates/cult/save.html b/src/main/resources/templates/cult/save.html index 03b23b2..8dea37a 100644 --- a/src/main/resources/templates/cult/save.html +++ b/src/main/resources/templates/cult/save.html @@ -77,7 +77,7 @@
- +
diff --git a/src/main/resources/templates/cult/update.html b/src/main/resources/templates/cult/update.html index 6903eb0..1f55dbc 100644 --- a/src/main/resources/templates/cult/update.html +++ b/src/main/resources/templates/cult/update.html @@ -77,7 +77,7 @@
- +
diff --git a/src/main/resources/templates/dispute/save.html b/src/main/resources/templates/dispute/save.html index c3800b3..7dea650 100644 --- a/src/main/resources/templates/dispute/save.html +++ b/src/main/resources/templates/dispute/save.html @@ -35,7 +35,7 @@
- +
@@ -51,7 +51,7 @@
- +
diff --git a/src/main/resources/templates/dispute/update.html b/src/main/resources/templates/dispute/update.html index e7b7244..3c74ad9 100644 --- a/src/main/resources/templates/dispute/update.html +++ b/src/main/resources/templates/dispute/update.html @@ -36,7 +36,7 @@
- +
@@ -52,7 +52,7 @@
- +
diff --git a/src/main/resources/templates/drug/save.html b/src/main/resources/templates/drug/save.html index 0873143..3af2fdc 100644 --- a/src/main/resources/templates/drug/save.html +++ b/src/main/resources/templates/drug/save.html @@ -32,7 +32,7 @@
- +
diff --git a/src/main/resources/templates/drug/update.html b/src/main/resources/templates/drug/update.html index 7367b57..ff642d0 100644 --- a/src/main/resources/templates/drug/update.html +++ b/src/main/resources/templates/drug/update.html @@ -32,7 +32,7 @@
- +
diff --git a/src/main/resources/templates/petition/list.html b/src/main/resources/templates/petition/list.html index 5854738..13a58b5 100644 --- a/src/main/resources/templates/petition/list.html +++ b/src/main/resources/templates/petition/list.html @@ -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]; diff --git a/src/main/resources/templates/petition/save.html b/src/main/resources/templates/petition/save.html index b7034aa..82e3ac2 100644 --- a/src/main/resources/templates/petition/save.html +++ b/src/main/resources/templates/petition/save.html @@ -130,6 +130,14 @@
+
+
+ +
+ +
+
+
@@ -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(); diff --git a/src/main/resources/templates/petition/update.html b/src/main/resources/templates/petition/update.html index ab37db9..2500ba8 100644 --- a/src/main/resources/templates/petition/update.html +++ b/src/main/resources/templates/petition/update.html @@ -122,6 +122,14 @@
+
+
+ +
+ +
+
+
@@ -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() { diff --git a/src/main/resources/templates/release/save.html b/src/main/resources/templates/release/save.html index 853a658..e85757e 100644 --- a/src/main/resources/templates/release/save.html +++ b/src/main/resources/templates/release/save.html @@ -24,7 +24,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/src/main/resources/templates/release/update.html b/src/main/resources/templates/release/update.html index a91730d..04ba765 100644 --- a/src/main/resources/templates/release/update.html +++ b/src/main/resources/templates/release/update.html @@ -24,7 +24,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/src/main/resources/templates/security/save.html b/src/main/resources/templates/security/save.html index 9d47041..e977de7 100644 --- a/src/main/resources/templates/security/save.html +++ b/src/main/resources/templates/security/save.html @@ -39,7 +39,7 @@
- +
diff --git a/src/main/resources/templates/security/update.html b/src/main/resources/templates/security/update.html index 3ee5696..3127338 100644 --- a/src/main/resources/templates/security/update.html +++ b/src/main/resources/templates/security/update.html @@ -40,7 +40,7 @@
- +