diff --git a/src/com/engine/organization/common/LocalDateRange.java b/src/com/engine/organization/common/LocalDateRange.java new file mode 100644 index 00000000..b7dc3eda --- /dev/null +++ b/src/com/engine/organization/common/LocalDateRange.java @@ -0,0 +1,28 @@ +package com.engine.organization.common; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.util.Date; + +@Data +@Builder +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +public class LocalDateRange { + + //"开始日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date fromDate; + + //结束日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; + + +} diff --git a/src/com/engine/organization/util/OrganizationDateUtil.java b/src/com/engine/organization/util/OrganizationDateUtil.java index 2f0f9991..b4aa41a3 100644 --- a/src/com/engine/organization/util/OrganizationDateUtil.java +++ b/src/com/engine/organization/util/OrganizationDateUtil.java @@ -1,6 +1,6 @@ package com.engine.organization.util; -import com.engine.salary.common.LocalDateRange; +import com.engine.organization.common.LocalDateRange; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils;