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

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessOpportunityController.java

@@ -215,7 +215,7 @@ public class BusinessOpportunityController {
 
     // 上传
     @RequestMapping("uploadFile")
-    public Object uploadFile(BusinessItemCustom bo, HttpServletRequest request, MultipartFile file) throws Exception {
+    public Object uploadFile(BusinessOpportunity bo, HttpServletRequest request, MultipartFile file) throws Exception {
         return bOservice.uploadFile(bo, request, file);
     }
 

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

@@ -41,7 +41,7 @@ public interface BusinessOpportunityService extends IService<BusinessOpportunity
 
     HttpRespMsg saveProduct(BusinessOpportunity bo, User user);
 
-    Object uploadFile(BusinessItemCustom bo, HttpServletRequest request, MultipartFile file);
+    Object uploadFile(BusinessOpportunity bo, HttpServletRequest request, MultipartFile file);
 
     Object downFile(UploadFile file, HttpServletRequest request, HttpServletResponse response);
 

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

@@ -236,7 +236,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
     @Value(value = "${upload.file}")
     private String filePath;
     @Override
-    public Object uploadFile(BusinessItemCustom bo, HttpServletRequest request, MultipartFile file) {
+    public Object uploadFile(BusinessOpportunity bo, HttpServletRequest request, MultipartFile file) {
         User user = userMapper.selectById(request.getHeader("token"));
         if (!file.isEmpty()) { // 检查上传的文件是否为空
             try {
@@ -257,10 +257,14 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
                 //用uuid替换原始的文件名
                 String purFName = UUID.randomUUID().toString().replaceAll("-", "");
                 realName = purFName + suffix;
-
-
-                uf.setPath(filePath + realName);
+                long size = file.getSize();
+                double v = (double) size / (1024 * 1024);
+                String format = String.format("%.2f MB", v);
+                uf.setPath("/file/" + realName);
                 uf.setCode("business");
+                System.out.println(format);
+                uf.setSize(format);
+                uf.setFileType(suffix);
                 uf.setItemId(bo.getId());
                 uf.setRealName(realName);
                 uf.setCreateTime(new Date());
@@ -291,7 +295,8 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
             HttpRespMsg msg = new HttpRespMsg();
             msg.setError("请选择上传文件");
             return msg;
-        }    }
+        }
+    }
 
     @Override
     public Object downFile(UploadFile file, HttpServletRequest request, HttpServletResponse response) {

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

@@ -290,10 +290,14 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
                 //用uuid替换原始的文件名
                 String purFName = UUID.randomUUID().toString().replaceAll("-", "");
                 realName = purFName + suffix;
-
-
-                uf.setPath(filePath + realName);
+                long size = file.getSize();
+                double v = (double) size / (1024 * 1024);
+                String format = String.format("%.2f MB", v);
+                uf.setPath("/file/" + realName);
                 uf.setCode("custom");
+                System.out.println(format);
+                uf.setSize(format);
+                uf.setFileType(suffix);
                 uf.setItemId(custom.getId());
                 uf.setRealName(realName);
                 uf.setCreateTime(new Date());

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -184,7 +184,7 @@
     "exportingTimeStatistics": "导出工时统计"
   },
   "other": {
-    "kaoqingTimeTip": "工作时长包含已提交的加班申请",
+    "kaoqingTimeTip": "工作时长包括已提交的加班和休假申请",
     "customerService": "咨询客服",
     "sweepWeChatYards": "微信扫码",
     "messageCenter": "消息中心",