fix(设备注销)：修改接口返回值，完成页面展示用

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

@@ -112,4 +112,14 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "设备代号")
     private String equList;
 
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategoryDesc;
+
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
+    @ApiModelProperty(value = "设备地址")
+    private String fullAddress;
+
 }

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

@@ -30,6 +30,12 @@ public class JgScrapCancel extends BaseEntity {
     private String cancelType;
 
     /**
+     * 注销类型（1报废注销，2移装注销）
+     */
+    @TableField(exist = false)
+    private String cancelTypeDesc;
+
+    /**
      * 申请编号
      */
     @TableField("apply_no")
@@ -157,4 +163,16 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(exist = false)
     private String equList;
 
+    @TableField(exist = false)
+    private String equListDesc;
+
+    @TableField(exist = false)
+    private String equCategoryDesc;
+
+    @TableField(exist = false)
+    private String productName;
+
+    @TableField(exist = false)
+    private String fullAddress;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -244,6 +244,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
         jgRelationEquip.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
         jgScrapCancelEqService.save(jgRelationEquip);
+        String equListName = EquipmentClassifityEnum.getNameByCode(jgScrapCancel.getEquList());
+        jgScrapCancel.setEquListDesc(equListName);
+        jgScrapCancel.setCancelTypeDesc("1".equals(jgScrapCancel.getCancelType()) ? "报废注销" : "移装注销");
         return jgScrapCancel;
     }