Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/UploadFile.java

@@ -68,6 +68,11 @@ public class UploadFile extends Model<UploadFile> {
      */
     @TableField("create_id")
     private String createId;
+    /**
+     * 创建人id
+     */
+    @TableField("file_type")
+    private String fileType;
 
     /**
      * 模块码clue线索 business商户 custom客户

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -304,14 +304,14 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
                 //用uuid替换原始的文件名
                 String purFName = UUID.randomUUID().toString().replaceAll("-", "");
                 realName = purFName + suffix;
-
                 long size = file.getSize();
-                String s = "MB";
-                double  l = size / 1024.00 / 1024.00;
-                System.out.println(size);
+                double v = (double) size / (1024 * 1024);
+                String format = String.format("%.2f MB", v);
                 uf.setPath("/file/" + realName);
                 uf.setCode("clue");
-                uf.setSize(l+s);
+                System.out.println(format);
+                uf.setSize(format);
+                uf.setFileType(suffix);
                 uf.setItemId(clue.getId());
                 uf.setRealName(realName);
                 uf.setCreateTime(new Date());