From 02b4ed90ef7392ced6b128ac6f8000bc5c4f0b17 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Wed, 20 Mar 2024 11:48:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=97=85=E9=99=A9=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B-=E6=B0=B4=E9=97=B8/=E5=A0=A4=E9=98=B2-=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/controller/DfDangerousTaskController.java | 8 ++++---- .../kms/yxgh/sz/controller/SzDangerousTaskController.java | 8 ++++---- .../main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java index 0787f066..d96172a5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java @@ -32,8 +32,8 @@ public class DfDangerousTaskController { */ @ApiOperation("堤防病险工程核查任务列表") @PostMapping("/page") - public Response> listByPage(@RequestBody SearchParam sp) { - return Response.ok(dangerousTaskService.getListByPage(sp)); + public IPage listByPage(@RequestBody SearchParam sp) { + return dangerousTaskService.getListByPage(sp); } /** @@ -43,8 +43,8 @@ public class DfDangerousTaskController { */ @ApiOperation("堤防关联的安全鉴定列表") @PostMapping("/salePage") - public Response> salePage(@RequestBody SearchParam sp) { - return Response.ok(dangerousTaskService.getAqjdListByPage(sp)); + public IPage salePage(@RequestBody SearchParam sp) { + return dangerousTaskService.getAqjdListByPage(sp); } /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java index 97179805..ac8585c5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java @@ -32,8 +32,8 @@ public class SzDangerousTaskController { */ @ApiOperation("水闸病险工程核查任务列表") @PostMapping("/page") - public Response> listByPage(@RequestBody SearchParam sp) { - return Response.ok(dangerousTaskService.getListByPage(sp)); + public IPage listByPage(@RequestBody SearchParam sp) { + return dangerousTaskService.getListByPage(sp); } /** @@ -43,8 +43,8 @@ public class SzDangerousTaskController { */ @ApiOperation("水闸关联的安全鉴定列表") @PostMapping("/salePage") - public Response> salePage(@RequestBody SearchParam sp) { - return Response.ok(dangerousTaskService.getAqjdListByPage(sp)); + public IPage salePage(@RequestBody SearchParam sp) { + return dangerousTaskService.getAqjdListByPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java index 05c123ef..ae920ba7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java @@ -14,7 +14,7 @@ import java.util.Date; * 包含安全鉴定检测等属性。 */ @Data -public class SzAqjdProjecDto extends DfProjectListDto { +public class SzAqjdProjecDto extends SzProjectListDto { @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty("鉴定日期")