日期格式发布

zgzt-sys-java/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -68,7 +68,12 @@ public class DateUtils extends PropertyEditorSupport {
             return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         }
     };
-
+    public static ThreadLocal<SimpleDateFormat> datetime_T_format = new ThreadLocal<SimpleDateFormat>() {
+        @Override
+        protected SimpleDateFormat initialValue() {
+            return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        }
+    };
     /**
      * 以毫秒表示的时间
      */

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -65,6 +65,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -178,7 +179,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			billetLiftingBill.setShift(shift);
 			billetLiftingBill.setVehicleNumber(vehicleNumber);
 			if (oConvertUtils.isNotEmpty(liftingTime)){
-				billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+				if (liftingTime.contains("T")){
+					billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetime_T_format.get()));
+				}else {
+					billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+				}
 			}
 			billetLiftingBill.setLocation(location);
 			billetLiftingBill.setCreateTime(new Date());
@@ -356,7 +361,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		billetLiftingBill.setPositionNum(Integer.valueOf(positionNum));
 		billetLiftingBill.setPlateOrStack(plateOrStack);
 		if (oConvertUtils.isNotEmpty(liftingTime)){
-			billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+			if (liftingTime.contains("T")){
+				billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetime_T_format.get()));
+			}else {
+				billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+			}
 		}
 		billetLiftingBill.setRemark("热装吊运单");
 		billetLiftingBill.setBilletWeight(0.00);

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -346,7 +346,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         billetLiftingBill.setLocation(jsonObject.getString("location"));
         String liftingTime = jsonObject.getString("liftingTime");
         if (oConvertUtils.isNotEmpty(liftingTime)){
-            billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+            if (liftingTime.contains("T")){
+                billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetime_T_format.get()));
+            }else {
+                billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+            }
         }
         billetLiftingBill.setDestination("车位" + positionNum);
         billetLiftingBill.setRemark("自动化垛位装车吊运单");
@@ -1351,7 +1355,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         billetLiftingBill.setDestination(jsonObject.getString("plateOrStack"));
         String liftingTime = jsonObject.getString("liftingTime");
         if (oConvertUtils.isNotEmpty(liftingTime)){
-            billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+            if (liftingTime.contains("T")){
+                billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetime_T_format.get()));
+            }else {
+                billetLiftingBill.setLiftingTime(DateUtils.str2Date(liftingTime, DateUtils.datetimeFormat.get()));
+            }
         }
         billetLiftingBill.setCreateTime(new Date());
         return billetLiftingBill;