wangming vor 1 Jahr
Ursprung
Commit
c79cf26b6c

+ 18 - 15
business-common/src/main/java/com/rongwei/bscommon/sys/utils/XlsSheetUtil.java

@@ -470,21 +470,24 @@ public class XlsSheetUtil {
                     case "d":{
                         //日期
                         Date _d=null;
-                        String v=getByDBObject(dbObject,"m");
-                        if(v.length()==0){
-                            v=getByDBObject(dbObject,"v");
-                        }
-                        if(v.length()>0){
-                            if(v.indexOf("-")>-1){
-                                if(v.indexOf(":")>-1){
-                                    _d= ConstantUtil.stringToDateTime(v);
-                                }else{
-                                    _d= ConstantUtil.stringToDate(v);
-                                }
-                            }else{
-                                _d= ConstantUtil.toDate(v);
-                            }
-                        }
+//                        String v=getByDBObject(dbObject,"m");
+//                        if(v.length()==0){
+//                            v=getByDBObject(dbObject,"v");
+//                        }
+//                        if(v.length()>0){
+//                            if(v.indexOf("-")>-1){
+//                                if(v.indexOf(":")>-1){
+//                                    _d= ConstantUtil.stringToDateTime(v);
+//                                }else{
+//                                    _d= ConstantUtil.stringToDate(v);
+//                                }
+//                            }else{
+//                                _d= ConstantUtil.toDate(v);
+//                            }
+//                        }
+
+                        _d = LuckySheet4SummaryHelp.getDateDefaultNull(dbObject, "m");
+
                         if(_d!=null){
                             //能转换为日期
                             cell.setCellValue(_d);