From f43019ba66b56e24b61dff43e6394bcbaa372af5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 08:06:08 +0000 Subject: [PATCH 1/2] Initial plan From 68763bd1e2d6bf0e8e9c195f3b259fe62bdbfe77 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 08:09:59 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?DateRange=E6=8E=A7=E4=BB=B6=E5=B1=9E=E6=80=A7=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com> --- .../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 b926539008..647f976d91 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.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 static 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/TemplateConfig.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java index 91ee8b7cde..bd656e3b1b 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 @@ * 模板控件配置,包含了部分控件类型的附加类型、属性,详见附录说明。 * 目前有配置信息的控件类型有: * 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 05b54650c6..852de04613 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; }