From b42d6beb4e4b74b6319e872f62ab5295cee76b08 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:43:37 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#3897=20=E3=80=90=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=20=E4=BF=AE=E5=A4=8DOA=20=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=A8=A1=E6=9D=BF=E4=B8=AD=20DateRange=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cp/bean/oa/WxCpOaApprovalTemplateResult.java | 4 ++++ .../cp/bean/oa/templatedata/TemplateConfig.java | 4 ++++ .../cp/bean/oa/templatedata/TemplateDateRange.java | 13 +++++++++++++ 3 files changed, 21 insertions(+) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpOaApprovalTemplateResult.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpOaApprovalTemplateResult.java index b92653900..647f976d9 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpOaApprovalTemplateResult.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpOaApprovalTemplateResult.java @@ -6,6 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateDateRange; import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateTips; import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateTitle; import me.chanjar.weixin.cp.bean.oa.templatedata.control.*; @@ -84,6 +85,9 @@ public class WxCpOaApprovalTemplateResult implements Serializable { private TemplateDate date; + @SerializedName("date_range") + private TemplateDateRange dateRange; + private TemplateSelector selector; private TemplateContact contact; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java index 91ee8b7cd..bd656e3b1 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java @@ -10,6 +10,7 @@ import java.io.Serializable; * 模板控件配置,包含了部分控件类型的附加类型、属性,详见附录说明。 * 目前有配置信息的控件类型有: * Date-日期/日期+时间; + * DateRange-时长; * Selector-单选/多选; * Contact-成员/部门; * Table-明细; @@ -24,6 +25,9 @@ public class TemplateConfig implements Serializable { private TemplateDate date; + @SerializedName("date_range") + private TemplateDateRange dateRange; + private TemplateSelector selector; private TemplateContact contact; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateDateRange.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateDateRange.java index 05b54650c..852de0461 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateDateRange.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateDateRange.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.cp.bean.oa.templatedata; +import com.google.gson.annotations.SerializedName; import lombok.Data; import java.io.Serializable; @@ -18,4 +19,16 @@ public class TemplateDateRange implements Serializable { * 时间刻度:hour-精确到分钟, halfday—上午/下午 */ private String type; + + /** + * 是否考虑法定节假日:0-不考虑,1-考虑 + */ + @SerializedName("official_holiday") + private Integer officialHoliday; + + /** + * 每天工作时长(秒),halfday模式下有效 + */ + @SerializedName("perday_duration") + private Integer perdayDuration; }