Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelEqDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -27,4 +29,10 @@ public class JgScrapCancelEqDto  extends BaseDto {
     @ApiModelProperty(value = "设备id")
     private String equId;
 
+    @ApiModelProperty(value = "使用登记id")
+    private String certificateSeq;
+
+    @ApiModelProperty(value = "设备信息")
+    private JSONArray equipInfo;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancelEq.java

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -34,4 +36,17 @@ public class JgScrapCancelEq extends BaseEntity {
 	@TableField("equ_id")
     private String equId;
 
+
+    /**
+     * 使用登记id
+     */
+    @TableField("certificate_seq")
+    private String certificateSeq;
+
+    /**
+     * 设备信息
+     */
+    @TableField("equip_info")
+    private String equipInfo;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelTypeEnum.java

@@ -8,11 +8,11 @@ public enum CancelTypeEnum {
     /**
      * 报废注销
      */
-    SCRAPPED("1", "报废注销"),
+    SCRAPPED("1", "报废"),
     /**
      * 移装注销
      */
-    TRANSFER("2", "移装注销");
+    TRANSFER("2", "注销");
 
     private final String code;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CertificateStatusEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum CertificateStatusEnum {
+    /**
+     * 设备状态枚举
+     *
+     */
+
+    YIDENGJI("已登记",0),
+    YIZHUXIAO("已注销",1);
+    String name;
+    Integer code;
+
+    public static Map<Integer,String> getName=new HashMap<>();
+    public static Map<String,Integer> getCode=new HashMap<>();
+
+    static {
+        for (CertificateStatusEnum e : CertificateStatusEnum.values()){
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+
+    }
+}