feat: 设备管理优化-0512-增加移除类型

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<DeviceInfoVo> 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<DeviceInfoVo> list = deviceInfoService.detail(query);
         PageInfo pageInfo = new PageInfo<>(list);
         PageSimpleResponse page = new PageSimpleResponse();

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;
+
+    /**
+     * 移除类型
+     */
+    @TableField(value = "destroyType")
+    private Integer destroyType;
 }

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 {
         /**

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;
 
     /**

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;

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);