From f8ce7aa161ef2ef316357ead8208bc60de938ead Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 三月 2025 09:36:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/domain/form/ProcessCodingForm.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/domain/form/ProcessCodingForm.java b/flowable/src/main/java/com/ycl/domain/form/ProcessCodingForm.java
index 933a331..5f21334 100644
--- a/flowable/src/main/java/com/ycl/domain/form/ProcessCodingForm.java
+++ b/flowable/src/main/java/com/ycl/domain/form/ProcessCodingForm.java
@@ -41,16 +41,23 @@
@NotNull(message = "鍙橀粍鐮佺殑澶╂暟涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍙橀粍鐮佺殑澶╂暟")
- private Integer yellowTime;
+ private String yellowTime;
@NotNull(message = "鍙樼孩鐮佺殑澶╂暟涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍙樼孩鐮佺殑澶╂暟")
- private Integer redTime;
+ private String redTime;
+ @NotNull(message = "澶勭悊鏈熼檺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("澶勭悊鏈熼檺")
+ private String overtime;
@NotNull(message = "浠诲姟鐘舵��", groups = {Add.class, Update.class})
@ApiModelProperty("浠诲姟鐘舵�乬reen/yellow/red")
private String status;
+ @NotNull(message = "浠诲姟瓒呮椂鐘舵��", groups = {Add.class, Update.class})
+ @ApiModelProperty("浠诲姟瓒呮椂鐘舵�乶ormal/willOvertime/overtime")
+ private String overtimeStatus;
+
public static ProcessCoding getEntityByForm(@NonNull ProcessCodingForm form, ProcessCoding entity) {
if(entity == null) {
entity = new ProcessCoding();
--
Gitblit v1.8.0