From 5b934c0e0dbb13ca177707eda74677ea1feeb4a8 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 22 Mar 2020 11:15:38 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#1457=20=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1OA=E5=AE=A1=E6=89=B9=E7=9B=B8=E5=85=B3=E7=B1=BB?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E7=9A=84@Data=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 增加@Data注解 * 增加control类型为Attendance的数据结构 --- .../cp/bean/oa/applydata/ContentValue.java | 25 +++++++++++++++++++ .../bean/oa/templatedata/TemplateOptions.java | 3 +++ .../oa/templatedata/TemplateProperty.java | 6 ++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java index 609b8dfb7..92b47f56d 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java @@ -33,6 +33,8 @@ public class ContentValue implements Serializable { private List children; + private Attendance attendance; + @Data public static class Date implements Serializable { private static final long serialVersionUID = -6181554080062231138L; @@ -91,4 +93,27 @@ public class ContentValue implements Serializable { private List list; } + + @Data + public static class Attendance implements Serializable { + private static final long serialVersionUID = -6627566040706594166L; + @SerializedName("date_range") + private DataRange dateRange; + private Integer type; + + @Data + public static class DataRange implements Serializable { + private static final long serialVersionUID = -3411836592583718255L; + private String type; + @SerializedName("new_begin") + private Long begin; + @SerializedName("new_end") + private Long end; + @SerializedName("new_duration") + private Long duration; + } + } + + + } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java index 7dc0b41a8..42c7d811c 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java @@ -1,11 +1,14 @@ package me.chanjar.weixin.cp.bean.oa.templatedata; +import lombok.Data; + import java.io.Serializable; import java.util.List; /** * @author gyv123@163.com */ +@Data public class TemplateOptions implements Serializable { private static final long serialVersionUID = -7883792668568772078L; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java index cf33f4717..143e4ce8f 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java @@ -1,17 +1,15 @@ package me.chanjar.weixin.cp.bean.oa.templatedata; -import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; -import me.chanjar.weixin.cp.bean.oa.WxCpTemplateResult; -import me.chanjar.weixin.cp.bean.oa.templatedata.control.TemplateContact; +import lombok.Data; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @author gyv12345@163.com */ +@Data public class TemplateProperty implements Serializable { private static final long serialVersionUID = -3429251158540167453L;