From 2868272820b2179c29b8dde428adf973091475b6 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 11 Mar 2024 11:45:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#=20=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E9=A1=B9=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/safeproduct/risk/controller/RiskCheckController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/RiskCheckController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/RiskCheckController.java index 17ae357..ca2541f 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/RiskCheckController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/controller/RiskCheckController.java @@ -48,6 +48,7 @@ public class RiskCheckController extends BladeController { @ApiOperationSupport(order = 1) public R> page(RiskCheckDTO req, Query query) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(RiskCheckEntity.class, BeanUtil.copy(req, RiskCheckEntity.class)); + queryWrapper.orderByDesc(RiskCheckEntity::getUpdateTime,RiskCheckEntity::getCreateTime); IPage page = riskCheckService.page(Condition.getPage(query), queryWrapper); page.setRecords(RiskCheckWrapper.build().listVO(page.getRecords())); return R.data(page); From c38a857ae2a0f6f5b07e6901db7bb22a41abb14d Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 11 Mar 2024 19:50:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#=20=E5=B7=A1=E6=A3=80=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzinfo/inspect/obj/vo/ObjectListQueryVO.java | 2 ++ .../src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java | 1 + 2 files changed, 3 insertions(+) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ObjectListQueryVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ObjectListQueryVO.java index dc5e130..c745c4a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ObjectListQueryVO.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ObjectListQueryVO.java @@ -44,5 +44,7 @@ public class ObjectListQueryVO implements Serializable { @ApiModelProperty(value = "支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") private String supportAutoVideo; + @ApiModelProperty(value = "所属机构") + private Long createDept; } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java index 1192887..5e63553 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java @@ -101,6 +101,7 @@ public class ObjectController extends BladeController { entity.setCode(object.getCode()); entity.setName(object.getName()); entity.setStatus(object.getStatus()); + entity.setCreateDept(object.getCreateDept()); entity.setSupportAutoVideo(object.getSupportAutoVideo()); pages.setRecords(objectService.getListPage(pages,entity)); return R.data(pages);