pigx-inventory/pigx-inventory-biz/src/main/java/com/pig4cloud/pigx/qa/controller/SgTimeSheetController.java

@@ -140,9 +140,9 @@ public class SgTimeSheetController {
 
         List<List<Object>> readTimeDatas = reader.read(4);
         String messages = sgTimeSheetService.uploadTimeExcel(readTimeDatas,timeMonth);
-        if (!messages.isEmpty())
+        if (messages.equals("错误"))
            {return R.failed(null, "数据表无数据，请检查！");}
-        else {return R.ok(true);}
+        else {return  R.failed(null, "已上传 "+ messages +" 条数据，请刷新后查看");}
 
 
     }

pigx-inventory/pigx-inventory-biz/src/main/java/com/pig4cloud/pigx/qa/service/impl/SgTimeSheetServiceImpl.java

@@ -46,15 +46,14 @@ public class SgTimeSheetServiceImpl extends ServiceImpl<SgTimeSheetMapper, SgTim
                     sgTimeSheet.setEId(1L);
 
                 }catch (Exception e) {
-                    return  " 错误";
+                    return  "错误";
                 }
 
              sgTimeSheets.add(sgTimeSheet);
             }
 
         sgTimeSheets.forEach(k->saveOrUpdate(k));
-        //rocketMQTemplate.convertAndSend("CSPRODUCTION:supplierQuoted",sgNewQuotes.stream().map(k->k.getPCode()).collect(Collectors.toList())+" 供应商已报价，请尽快查看_"+SecurityUtils.getUser().getUsername());
-        return "";
+        return Convert.toStr(sgTimeSheets.size());
     }