From 11754a27bbb24a0a9401caf4e2040a4bd1d9a4cc Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sun, 12 May 2024 10:28:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96-0512-=E5=A2=9E=E5=8A=A0=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/dev/DeviceInfoController.java | 4 ++-- .../glxp/api/entity/dev/DeviceChangeOrderEntity.java | 8 +++++++- .../com/glxp/api/req/dev/DeviceChangeOrderParam.java | 5 +++++ .../api/req/dev/DeviceInfoDetailByDeptCodeQuery.java | 2 +- .../java/com/glxp/api/vo/dev/DeviceChangeOrderVo.java | 11 +++++++++++ src/main/resources/schemas/schema_v2.4.sql | 3 +++ 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 5c206de22..5592ea459 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -151,6 +151,8 @@ public class DeviceInfoController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/device/info/detailByDeptCode/page") public BaseResponse detailByDeptCode(@RequestBody @Valid DeviceInfoDetailByDeptCodeQuery query) { + AuthAdmin user = super.getUser(); + query.setDeptCode(user.getLocDeptCode()); List list = deviceInfoService.detail(query); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse page = new PageSimpleResponse(); @@ -168,8 +170,6 @@ public class DeviceInfoController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/device/detailInfo/page") public BaseResponse detailInfoPage(@RequestBody DeviceInfoDetailQuery query) { - AuthAdmin user = super.getUser(); - query.setDeptCode(user.getLocDeptCode()); List list = deviceInfoService.detail(query); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse page = new PageSimpleResponse(); diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java index d97fa3137..7ec450165 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java @@ -107,4 +107,10 @@ public class DeviceChangeOrderEntity implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file + + /** + * 移除类型 + */ + @TableField(value = "destroyType") + private Integer destroyType; +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java index 0e8312e3a..5aade9ce7 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java @@ -112,6 +112,11 @@ public class DeviceChangeOrderParam { @TableField(value = "createTime") private LocalDateTime createTime; + /** + * 移除类型 + */ + private Integer destroyType; + @Data public static class Item { /** diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java index be65cbc2c..dbf5317f6 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java @@ -19,7 +19,7 @@ public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest { /** * 部门编码 */ - @NotBlank(message = "缺少部门编码") +// @NotBlank(message = "缺少部门编码") private String deptCode; /** diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceChangeOrderVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceChangeOrderVo.java index ed3923bfa..56882a788 100644 --- a/src/main/java/com/glxp/api/vo/dev/DeviceChangeOrderVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DeviceChangeOrderVo.java @@ -1,6 +1,7 @@ package com.glxp.api.vo.dev; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import lombok.Data; @Data @@ -17,6 +18,16 @@ public class DeviceChangeOrderVo extends DeviceChangeOrderEntity { public String getTypeName() { if (super.getType() != null) { + DeviceChangeTypeEnum type = super.getType(); + if (type.equals(DeviceChangeTypeEnum.DESTROY)){ + if (super.getDestroyType()!= null){ + if (super.getDestroyType() == 1){ + return "报废"; + }else { + return "销毁"; + } + } + } return super.getType().getDesc(); } return typeName; diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 2677d3bfc..248713ff1 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2501,3 +2501,6 @@ ALTER TABLE device_repair CALL Pro_Temp_ColumnWork('device_check_detail', 'applyId', 'bigint DEFAULT NULL COMMENT''报修单id''', 1); +CALL Pro_Temp_ColumnWork('device_change_order', 'destroyType', + 'bigint DEFAULT NULL COMMENT''移除类型 1报废；2销毁''', + 1);