ly 3 年之前
父節點
當前提交
2f14e64c64

+ 4 - 0
master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java

@@ -89,6 +89,10 @@ public class ExcelUtils {
                     cellValue =  new SimpleDateFormat("yyyy-MM-dd").format(cell.getDateCellValue());
                 }else if("@".equals(cell.getCellStyle().getDataFormatString())){
                     cellValue = cell.getNumericCellValue() + "";
+                }else if(cell.getCellStyle().getDataFormatString().indexOf("0.0") > -1){
+                    //数字非日期
+                    System.out.println("Excel值:"+ cell.getNumericCellValue());
+                    cellValue = cell.getNumericCellValue() + "";
                 }else{
                     try {
                         cellValue =  new SimpleDateFormat("yyyy-MM-dd").format(cell.getDateCellValue());

+ 0 - 1
master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -709,7 +709,6 @@ public class SpecHomeController extends BaseController
                 .in("CHECK_CONCLUSION","符合要求","允许运行")
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
-        logger.info(all + ":::::::::::" +cc);
         String per = "0";
         if (all != 0) {
             per = new BigDecimal(cc).multiply(new BigDecimal(100)).divide(new BigDecimal(all), 2, BigDecimal.ROUND_HALF_UP).setScale(1, BigDecimal.ROUND_HALF_DOWN).toString();