qingwudarao před 5 měsíci
rodič
revize
4b8da3dca1

+ 3 - 5
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/Attachment.java

@@ -72,7 +72,7 @@ public class Attachment {
      * 文件大小
      */
     @TableField("filesize")
-    private int fileSize;
+    private Long fileSize;
 
     /**
      * mime类型
@@ -100,12 +100,10 @@ public class Attachment {
     /**
      * 存储位置
      */
-    @TableField("storage")
-    private String ossId;
+    private String storage;
 
     /**
-     * ossId
+     * sha1
      */
-    @TableField("sha1")
     private String sha1;
 }

+ 6 - 3
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/BulkOrderList.java

@@ -89,12 +89,14 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 基本数量
     */
-    private double basicNmber;
+    @TableField("basic_nmber")
+    private double basicNumber;
 
     /**
     * 基本份数
     */
-    private double basicFenNmber;
+    @TableField("basic_fen_nmber")
+    private double basicFenNumber;
 
     /**
     * 金额
@@ -167,7 +169,8 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 工艺单价
     */
-    private double gongyiPrice;
+    @TableField("gongyi_price")
+    private double craftPrice;
 
     /**
     * 款号(大货编号)

+ 6 - 5
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/AttachmentBo.java

@@ -15,16 +15,17 @@ import java.util.Date;
 @AutoMapper(target = Attachment.class, reverseConvertGenerate = false)
 public class AttachmentBo {
 
-    public AttachmentBo(String category, Long userId, String url, String imageType, String fileName, Date createTime, Date updateTime, Date uploadTime, String ossId) {
+    public AttachmentBo(String category, Long userId, String url, String imageType, String fileName, String mimetype, Date createTime, Date updateTime, Date uploadTime) {
         this.category = category;
         this.userId = userId;
         this.url = url;
         this.imageType = imageType;
         this.fileName = fileName;
+        this.mimetype = mimetype;
         this.createTime = createTime;
         this.updateTime = updateTime;
         this.uploadTime = uploadTime;
-        this.ossId = ossId;
+        this.storage = "local";
     }
 
     /**
@@ -80,7 +81,7 @@ public class AttachmentBo {
     /**
      * 文件大小
      */
-    private int fileSize;
+    private Long fileSize;
 
     /**
      * mime类型
@@ -103,9 +104,9 @@ public class AttachmentBo {
     private Date uploadTime;
 
     /**
-     * ossId
+     * 存储位置
      */
-    private String ossId;
+    private String storage;
 
     /**
      * sha1

+ 3 - 8
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/BulkOrderListBo.java

@@ -95,12 +95,12 @@ public class BulkOrderListBo extends BaseEntity {
     /**
      * 基本数量
      */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
      * 金额
@@ -165,7 +165,7 @@ public class BulkOrderListBo extends BaseEntity {
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
      * 款号
@@ -280,9 +280,4 @@ public class BulkOrderListBo extends BaseEntity {
      * 烧花打包数量
      */
     private String shaohuaDabaoCount;
-
-    /**
-     * 商品图片
-     */
-    private String image;
 }

+ 3 - 3
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/AttachmentVo.java

@@ -66,7 +66,7 @@ public class AttachmentVo {
     /**
      * 文件大小
      */
-    private int fileSize;
+    private Long fileSize;
 
     /**
      * mime类型
@@ -89,9 +89,9 @@ public class AttachmentVo {
     private Date uploadTime;
 
     /**
-     * ossId
+     * 存储位置
      */
-    private String ossId;
+    private String storage;
 
     /**
      * sha1