diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java index 69283b7..f7e0fb9 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java @@ -65,8 +65,11 @@ public class DataCaseVerifImportDto { @NotBlank(message = "具体内容为空") private String thingDesc; + @ExcelProperty({"问题基本信息", "涉企涉冻"}) + private String involvedIssue; + private String state; private String errMsg; -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java index e3b65b5..7d47789 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java @@ -93,6 +93,7 @@ public class DataPetitionComplaintImportDto { private String petitionProcessingStatus; + @ExcelIgnore private String departId; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java b/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java index 977c239..d798f6d 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java @@ -64,7 +64,7 @@ public class DataCaseVerif { @TableField("thing_desc") private String thingDesc; - // + // @TableField("create_time") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") private LocalDateTime createTime; @@ -89,4 +89,6 @@ public class DataCaseVerif { // 状态 private String crxState; -} \ No newline at end of file + private String involvedIssue; + +} diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java index f4d4738..17c0166 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java @@ -39,4 +39,6 @@ public class DataPetitionComplaintQueryParam extends BasePage { // 初重信访 private String initialPetition; + private String involvedIssue; + } diff --git a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java index d07c5c1..a620f3a 100644 --- a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java +++ b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java @@ -57,6 +57,7 @@ public class DataPetitionComplaintService extends ServiceImpl