Browse Source

fix:1、案件核查2、涉企涉冻

master
pengwei 4 months ago
parent
commit
b38e70372d
  1. 5
      src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java
  2. 1
      src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java
  3. 6
      src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java
  4. 2
      src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java
  5. 1
      src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java
  6. BIN
      src/main/resources/static/templates/案件核查问题台账(模板).xlsx

5
src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java

@ -65,8 +65,11 @@ public class DataCaseVerifImportDto {
@NotBlank(message = "具体内容为空") @NotBlank(message = "具体内容为空")
private String thingDesc; private String thingDesc;
@ExcelProperty({"问题基本信息", "涉企涉冻"})
private String involvedIssue;
private String state; private String state;
private String errMsg; private String errMsg;
} }

1
src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java

@ -93,6 +93,7 @@ public class DataPetitionComplaintImportDto {
private String petitionProcessingStatus; private String petitionProcessingStatus;
@ExcelIgnore @ExcelIgnore
private String departId; private String departId;

6
src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java

@ -64,7 +64,7 @@ public class DataCaseVerif {
@TableField("thing_desc") @TableField("thing_desc")
private String thingDesc; private String thingDesc;
// //
@TableField("create_time") @TableField("create_time")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm")
private LocalDateTime createTime; private LocalDateTime createTime;
@ -89,4 +89,6 @@ public class DataCaseVerif {
// 状态 // 状态
private String crxState; private String crxState;
} private String involvedIssue;
}

2
src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java

@ -39,4 +39,6 @@ public class DataPetitionComplaintQueryParam extends BasePage {
// 初重信访 // 初重信访
private String initialPetition; private String initialPetition;
private String involvedIssue;
} }

1
src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java

@ -57,6 +57,7 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
.like(StrUtil.isNotBlank(queryParam.getThingDesc()), "pc.thing_desc", queryParam.getThingDesc()) .like(StrUtil.isNotBlank(queryParam.getThingDesc()), "pc.thing_desc", queryParam.getThingDesc())
.eq(StrUtil.isNotBlank(queryParam.getDistributionState()), "pc.distribution_state", queryParam.getDistributionState()) .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), "pc.distribution_state", queryParam.getDistributionState())
.eq(StrUtil.isNotBlank(queryParam.getInitialPetition()), "pc.initial_petition", queryParam.getInitialPetition()) .eq(StrUtil.isNotBlank(queryParam.getInitialPetition()), "pc.initial_petition", queryParam.getInitialPetition())
.eq(StrUtil.isNotBlank(queryParam.getInvolvedIssue()),"pc.involved_issue",queryParam.getInvolvedIssue())
.orderByDesc("pc.discovery_time"); .orderByDesc("pc.discovery_time");
if (queryParam.getDiscoveryTime().size() == 2) { if (queryParam.getDiscoveryTime().size() == 2) {
queryWrapper.between("pc.discovery_time", queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1)); queryWrapper.between("pc.discovery_time", queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1));

BIN
src/main/resources/static/templates/案件核查问题台账(模板).xlsx

Binary file not shown.
Loading…
Cancel
Save