From 3452c0838a2a1672c2e56cfea81867addd499988 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 23:46:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
index e83ff25..736b975 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
@@ -1,7 +1,9 @@
package com.ycl.domain.form;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
+import com.ycl.common.utils.StringUtils;
import com.ycl.system.domain.base.AbsForm;
import com.ycl.domain.entity.ProjectEngineering;
import com.ycl.system.domain.base.AbsUUIDForm;
@@ -44,10 +46,26 @@
@ApiModelProperty("鐘舵��")
private String status;
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private Long department;
+
+ @ApiModelProperty("涓氫富鍗曚綅")
+ private Long unit;
+
+ @ApiModelProperty("骞翠唤")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date year;
+
+ @ApiModelProperty("鐖跺伐绋�")
+ private String parent;
+
public static ProjectEngineering getEntityByForm(@NonNull ProjectEngineeringForm form, ProjectEngineering entity) {
if(entity == null) {
entity = new ProjectEngineering();
}
+ if (StringUtils.isEmpty(form.parent)){
+ form.setParent("0");
+ }
BeanUtils.copyProperties(form, entity);
return entity;
}
--
Gitblit v1.8.0