From 5f30ef778bbdf59d2835ddbf86d2edc6c6e279b5 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 15:20:43 +0800
Subject: [PATCH] 获取两个时间内，除去周末周日以及法定节假日的 小时总数。
---
business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 736b975..95df8f3 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java
@@ -53,12 +53,14 @@
private Long unit;
@ApiModelProperty("骞翠唤")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date year;
+ private String year;
@ApiModelProperty("鐖跺伐绋�")
private String parent;
+ @ApiModelProperty("寤鸿鍐呭")
+ private String buildContent;
+
public static ProjectEngineering getEntityByForm(@NonNull ProjectEngineeringForm form, ProjectEngineering entity) {
if(entity == null) {
entity = new ProjectEngineering();
--
Gitblit v1.8.0