diff --git a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java index bf35495..95d4031 100644 --- a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java +++ b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java @@ -133,7 +133,12 @@ public class DataPetitionComplaintController { if (StringUtil.isNotEmpty(data.getMassVisits())) { updateWrapper.set(DataPetitionComplaint::getMassVisits, data.getMassVisits().contains("是")); } - dataPetitionComplaintService.update(updateWrapper); + if (StrUtil.isNotEmpty(data.getReceivingLeaderName())){ + updateWrapper.set(DataPetitionComplaint::getReceivingLeaderName,data.getReceivingLeaderName()); + } + if(StrUtil.isNotEmpty(data.getOriginId())){ + dataPetitionComplaintService.update(updateWrapper); + } } @Override @@ -145,6 +150,8 @@ public class DataPetitionComplaintController { } + + @PostMapping("gab") @Transactional(rollbackFor = Exception.class) public Result add(@RequestBody List list) { diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintReplenishDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintReplenishDto.java index f7b0e66..f004445 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintReplenishDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintReplenishDto.java @@ -11,16 +11,21 @@ public class DataPetitionComplaintReplenishDto { /** * 信访编号 * */ - @ExcelProperty(index = 2) + @ExcelProperty(value = "信访件编号") private String originId; /** * 初重信访 * */ - @ExcelProperty(index = 24) + @ExcelProperty(value = "初重信访") private String initialPetition; /** * 群众集访 * */ - @ExcelProperty(index = 26) + @ExcelProperty(value = "是否集访") private String massVisits; + /** + * 领导姓名 + * */ + @ExcelProperty(value = "领导姓名") + private String receivingLeaderName; } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java b/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java index a8d2b40..9306062 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java @@ -70,7 +70,9 @@ public class DataPetitionComplaint { // 具体内容 @TableField("thing_desc") private String thingDesc; - + //接访领导单位 + @TableField("receiving_leader_name") + private String receivingLeaderName; //--------------------- @@ -102,4 +104,5 @@ public class DataPetitionComplaint { // 信访办理情况 private String petitionProcessingStatus; + } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java index ed9c11b..1ae7c96 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java @@ -28,6 +28,8 @@ public class DataPetitionComplaintVo { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") private LocalDateTime discoveryTime; + //接访领导姓名 + private String receivingLeaderName; // 投诉人 private String responderName; @@ -84,4 +86,4 @@ public class DataPetitionComplaintVo { // 信访办理情况 private String petitionProcessingStatus; -} \ No newline at end of file +} diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 39b0463..c35b464 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ logs - + diff --git a/src/main/resources/static/templates/公安部信访集访导入模板.xlsx b/src/main/resources/static/templates/公安部信访集访导入模板.xlsx new file mode 100644 index 0000000..9891139 Binary files /dev/null and b/src/main/resources/static/templates/公安部信访集访导入模板.xlsx differ diff --git a/src/main/resources/static/templates/公安部信访领导接访导入模板.xlsx b/src/main/resources/static/templates/公安部信访领导接访导入模板.xlsx new file mode 100644 index 0000000..d154c92 Binary files /dev/null and b/src/main/resources/static/templates/公安部信访领导接访导入模板.xlsx differ