|
@@ -85,8 +85,15 @@ public class HandlerFormDataUtils {
|
|
for (GenTableColumn column : allColumns) {
|
|
for (GenTableColumn column : allColumns) {
|
|
String columnName = column.getColumnName();
|
|
String columnName = column.getColumnName();
|
|
String columnType = column.getColumnType();
|
|
String columnType = column.getColumnType();
|
|
- if (containsKeyIgnoreCase(jsonObject, columnName) && NEED_CONVERT_DATE_LIST.contains(columnType)) {
|
|
|
|
|
|
+
|
|
|
|
+ if (!containsKeyIgnoreCase(jsonObject, columnName)) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (DATE.equals(columnType)) {
|
|
jsonObject.put(columnName, getStrDate(jsonObject.getTimestamp(columnName)));
|
|
jsonObject.put(columnName, getStrDate(jsonObject.getTimestamp(columnName)));
|
|
|
|
+ } else if (DATETIME.equals(columnType)) {
|
|
|
|
+ jsonObject.put(columnName, getStrTimeStamp(jsonObject.getTimestamp(columnName)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -166,6 +173,19 @@ public class HandlerFormDataUtils {
|
|
|
|
|
|
return DateUtils.dateTime(date);
|
|
return DateUtils.dateTime(date);
|
|
}
|
|
}
|
|
|
|
+ /**
|
|
|
|
+ * 功能描述: yyyy-MM-dd
|
|
|
|
+ *
|
|
|
|
+ * @param date date
|
|
|
|
+ * @return java.lang.String
|
|
|
|
+ */
|
|
|
|
+ public static String getStrTimeStamp(Date date) {
|
|
|
|
+ if (null == date) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return DateUtils.getTime1(date);
|
|
|
|
+ }
|
|
|
|
|
|
public static JSONObject getFkInfoForQueryList(Map<String, Object> fkInfoMap, Object value) {
|
|
public static JSONObject getFkInfoForQueryList(Map<String, Object> fkInfoMap, Object value) {
|
|
Object fkTableName = fkInfoMap.get(FK_TABLE_NAME);
|
|
Object fkTableName = fkInfoMap.get(FK_TABLE_NAME);
|