鞍钢工作流车辆和材料入场的时间NaN-NaN-NaN NaN:NaN:NaN解决
This commit is contained in:
parent
04d7b19be1
commit
a1f68ded9f
@ -147,7 +147,11 @@ public class CarInfoController {
|
||||
carInfo.setCarModuleType(carModuleType);
|
||||
Integer entryAndExitPermit = "单次".equals(MapUtils.getString(map, "entryAndExitPermit")) ? 0 : 1;
|
||||
carInfo.setReserveStartTime(DateUtil.parse(map.get("reserveStartTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
|
||||
try {
|
||||
carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
|
||||
} catch (Exception e) {
|
||||
carInfo.setReserveEndTime(DateUtil.offsetDay(carInfo.getReserveStartTime(), 3));
|
||||
}
|
||||
carInfo.setEntryAndExitPermit(entryAndExitPermit);
|
||||
carInfo.setCarNumber(String.valueOf(map.get("carNumber")));
|
||||
Object carColor = map.get("carColor");
|
||||
|
||||
@ -191,7 +191,11 @@ public class XzMaterialController {
|
||||
xzMaterial.setNum(index);
|
||||
}
|
||||
xzMaterial.setEntryBeginTime(DateUtil.parse(obj.getString("startTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
|
||||
try {
|
||||
xzMaterial.setEntryEndTime(DateUtil.parse(obj.getString("endTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
|
||||
} catch (Exception e) {
|
||||
xzMaterial.setEntryEndTime(DateUtil.offsetDay(xzMaterial.getEntryBeginTime(), 3));
|
||||
}
|
||||
xzMaterial.setCarNumber(obj.getString("carNumber"));
|
||||
JSONArray detail = obj.getJSONArray("detail");
|
||||
if (detail != null) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user