Browse Source

解决扫码日志无法返回广告信息问题

云殇忆 1 year ago
parent
commit
f91fce15e5

+ 5 - 0
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Statistics.java

@@ -32,6 +32,9 @@ public class Statistics {
     @TableField("equipment_code")
     private String equipmentCode;
 
+    @TableField("addr_info")
+    private String addrInfo;
+
     @TableField("goods_id")
     private String goodsId;
     @TableField("goods_name")
@@ -69,6 +72,7 @@ public class Statistics {
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentCode = bo.getEquipmentCode();
         this.equipmentName = equipment.getEquipmentName();
+        this.addrInfo = equipment.getAddrInfo();
         this.goodsId = bo.getGoodsId();
         this.goodsName = bo.getGoodsName();
         this.vendorId = bo.getVendorId();
@@ -87,6 +91,7 @@ public class Statistics {
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentCode = bo.getEquipmentCode();
         this.equipmentName = equipment.getEquipmentName();
+        this.addrInfo = equipment.getAddrInfo();
         this.goodsId = bo.getGoodsId();
         this.goodsName = bo.getGoodsName();
         this.vendorId = bo.getVendorId();

+ 4 - 4
ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ScanListVo.java

@@ -12,8 +12,8 @@ import java.time.LocalDateTime;
 
 @Data
 public class ScanListVo {
-    private String planId;
-    private String planName;
+    private String goodsId;
+    private String goodsName;
     private String equipmentId;
     private String equipmentName;
     private String equipmentCode;
@@ -28,8 +28,8 @@ public class ScanListVo {
 
     public ScanListVo(){}
     public ScanListVo(Statistics statistics){
-        this.planId = statistics.getPlanId();
-        this.planName = statistics.getPlanName();
+        this.goodsId = statistics.getGoodsId();
+        this.goodsName = statistics.getGoodsName();
         this.equipmentId = statistics.getEquipmentId();
         this.equipmentName = statistics.getEquipmentName();
         this.equipmentCode = statistics.getEquipmentCode();