From e4bc13f0603a9917281379ced1141d4dce89e450 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 16 Apr 2025 16:59:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3769)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=A5=E6=9C=9F=E7=BB=84=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/cmd/CustomGetFormInstanceModelCmd.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetFormInstanceModelCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetFormInstanceModelCmd.java index ed8089fd9..d81e50f59 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetFormInstanceModelCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetFormInstanceModelCmd.java @@ -130,7 +130,7 @@ public class CustomGetFormInstanceModelCmd extends GetFormInstanceModelCmd { try { if (org.apache.commons.lang3.StringUtils.isNotEmpty(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) { 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 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) { field.setValue(DATE_FORMAT.format(((Date) variableValue).toInstant())); } 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"; + } + } }