Browse Source

fix:

1、新增【领导接访导入】、新增【集访导入】,根据信访编号关联更新相关字段状态。
2、补充接访领导姓名字段
master
pengwei 9 months ago
parent
commit
874cf46740
  1. 7
      src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java
  2. 11
      src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintReplenishDto.java
  3. 5
      src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java
  4. 2
      src/main/java/com/biutag/supervision/pojo/vo/DataPetitionComplaintVo.java
  5. 2
      src/main/resources/logback-spring.xml
  6. BIN
      src/main/resources/static/templates/公安部信访集访导入模板.xlsx
  7. BIN
      src/main/resources/static/templates/公安部信访领导接访导入模板.xlsx

7
src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java

@ -133,8 +133,13 @@ public class DataPetitionComplaintController {
if (StringUtil.isNotEmpty(data.getMassVisits())) { if (StringUtil.isNotEmpty(data.getMassVisits())) {
updateWrapper.set(DataPetitionComplaint::getMassVisits, data.getMassVisits().contains("是")); updateWrapper.set(DataPetitionComplaint::getMassVisits, data.getMassVisits().contains("是"));
} }
if (StrUtil.isNotEmpty(data.getReceivingLeaderName())){
updateWrapper.set(DataPetitionComplaint::getReceivingLeaderName,data.getReceivingLeaderName());
}
if(StrUtil.isNotEmpty(data.getOriginId())){
dataPetitionComplaintService.update(updateWrapper); dataPetitionComplaintService.update(updateWrapper);
} }
}
@Override @Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) { public void doAfterAllAnalysed(AnalysisContext analysisContext) {
@ -145,6 +150,8 @@ public class DataPetitionComplaintController {
} }
@PostMapping("gab") @PostMapping("gab")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result<Boolean> add(@RequestBody List<DataPetitionComplaintImportDto> list) { public Result<Boolean> add(@RequestBody List<DataPetitionComplaintImportDto> list) {

11
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; private String originId;
/** /**
* 初重信访 * 初重信访
* */ * */
@ExcelProperty(index = 24) @ExcelProperty(value = "初重信访")
private String initialPetition; private String initialPetition;
/** /**
* 群众集访 * 群众集访
* */ * */
@ExcelProperty(index = 26) @ExcelProperty(value = "是否集访")
private String massVisits; private String massVisits;
/**
* 领导姓名
* */
@ExcelProperty(value = "领导姓名")
private String receivingLeaderName;
} }

5
src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java

@ -70,7 +70,9 @@ public class DataPetitionComplaint {
// 具体内容 // 具体内容
@TableField("thing_desc") @TableField("thing_desc")
private String thingDesc; private String thingDesc;
//接访领导单位
@TableField("receiving_leader_name")
private String receivingLeaderName;
//--------------------- //---------------------
@ -102,4 +104,5 @@ public class DataPetitionComplaint {
// 信访办理情况 // 信访办理情况
private String petitionProcessingStatus; private String petitionProcessingStatus;
} }

2
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") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm")
private LocalDateTime discoveryTime; private LocalDateTime discoveryTime;
//接访领导姓名
private String receivingLeaderName;
// 投诉人 // 投诉人
private String responderName; private String responderName;

2
src/main/resources/logback-spring.xml

@ -2,7 +2,7 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<contextName>logs</contextName> <contextName>logs</contextName>
<!-- 日志位置 --> <!-- 日志位置 -->
<property name="log.path" value="/work/log"/> <property name="log.path" value="/Users/weipeng/dome/chuankei/supervision/supervision-boot/work/log"/>
<!-- 日志保留时长 --> <!-- 日志保留时长 -->
<property name="log.maxHistory" value="7"/> <property name="log.maxHistory" value="7"/>
<!-- 控制台格式化及颜色 --> <!-- 控制台格式化及颜色 -->

BIN
src/main/resources/static/templates/公安部信访集访导入模板.xlsx

Binary file not shown.

BIN
src/main/resources/static/templates/公安部信访领导接访导入模板.xlsx

Binary file not shown.
Loading…
Cancel
Save