diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java index a7d554f..8618bc7 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeBlameVo.java @@ -104,4 +104,13 @@ public class ExportNegativeBlameVo { // 问题类型 @ExcelProperty({"问题类型"}) private String problemType; + + + @ExcelProperty("督察措施") + private String superviseMeasuresName; + + + @ExcelProperty({"禁闭时长"}) + private String confinementTime; + } diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java index b1c5c66..4457755 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java @@ -63,6 +63,8 @@ public class NegativeTaskService extends ServiceImpl page(NegativeTaskQueryParam param) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() @@ -203,7 +205,9 @@ public class NegativeTaskService extends ServiceImpl