feat(REQ-3769) - 调整表单日期组件格式化

This commit is contained in:
wangli 2025-04-16 16:59:01 +08:00
parent 5acd4bfe21
commit e4bc13f060

View File

@ -130,7 +130,7 @@ public class CustomGetFormInstanceModelCmd extends GetFormInstanceModelCmd {
try { try {
if (org.apache.commons.lang3.StringUtils.isNotEmpty(fieldValue)) { if (org.apache.commons.lang3.StringUtils.isNotEmpty(fieldValue)) {
LocalDate dateValue = LocalDate.parse(fieldValue); LocalDate dateValue = LocalDate.parse(fieldValue);
variables.put(field.getId(), dateValue.toString(field.getParam("fmt").toString())); variables.put(field.getId(), dateValue.toString(fmtConvert(field.getParam("fmt").toString())));
} }
} catch (Exception e) { } catch (Exception e) {
log.error("Error parsing form date value for process instance {} and task {} with value {}", processInstanceId, taskId, fieldValue, e); log.error("Error parsing form date value for process instance {} and task {} with value {}", processInstanceId, taskId, fieldValue, e);
@ -378,7 +378,7 @@ public class CustomGetFormInstanceModelCmd extends GetFormInstanceModelCmd {
if (variableValue != null) { if (variableValue != null) {
if (variableValue instanceof LocalDate) { if (variableValue instanceof LocalDate) {
field.setValue(((LocalDate) variableValue).toString(field.getParam("fmt").toString())); field.setValue(((LocalDate) variableValue).toString(fmtConvert(field.getParam("fmt").toString())));
} else if (variableValue instanceof Date) { } else if (variableValue instanceof Date) {
field.setValue(DATE_FORMAT.format(((Date) variableValue).toInstant())); field.setValue(DATE_FORMAT.format(((Date) variableValue).toInstant()));
} else { } else {
@ -391,4 +391,15 @@ public class CustomGetFormInstanceModelCmd extends GetFormInstanceModelCmd {
} }
} }
} }
private String fmtConvert(String fmt) {
switch (fmt) {
case "YYYY-MM-DD HH:mm:ss":
return "yyyy-MM-dd HH:mm:ss";
case "YYYY-MM-DD HH:mm":
return "yyyy-MM-dd HH:mm";
default:
return "yyyy-MM-dd";
}
}
} }