Skip to content

Commit b42d6be

Browse files
authored
🎨 #3897 【企业微信】 修复OA 审批模板中 DateRange控件的反序列化映射缺失问题
1 parent 65deaab commit b42d6be

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpOaApprovalTemplateResult.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.Data;
77
import lombok.NoArgsConstructor;
88
import lombok.experimental.Accessors;
9+
import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateDateRange;
910
import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateTips;
1011
import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateTitle;
1112
import me.chanjar.weixin.cp.bean.oa.templatedata.control.*;
@@ -84,6 +85,9 @@ public static class TemplateConfig implements Serializable {
8485

8586
private TemplateDate date;
8687

88+
@SerializedName("date_range")
89+
private TemplateDateRange dateRange;
90+
8791
private TemplateSelector selector;
8892

8993
private TemplateContact contact;

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* 模板控件配置,包含了部分控件类型的附加类型、属性,详见附录说明。
1111
* 目前有配置信息的控件类型有:
1212
* Date-日期/日期+时间;
13+
* DateRange-时长;
1314
* Selector-单选/多选;
1415
* Contact-成员/部门;
1516
* Table-明细;
@@ -24,6 +25,9 @@ public class TemplateConfig implements Serializable {
2425

2526
private TemplateDate date;
2627

28+
@SerializedName("date_range")
29+
private TemplateDateRange dateRange;
30+
2731
private TemplateSelector selector;
2832

2933
private TemplateContact contact;

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateDateRange.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.chanjar.weixin.cp.bean.oa.templatedata;
22

3+
import com.google.gson.annotations.SerializedName;
34
import lombok.Data;
45

56
import java.io.Serializable;
@@ -18,4 +19,16 @@ public class TemplateDateRange implements Serializable {
1819
* 时间刻度:hour-精确到分钟, halfday—上午/下午
1920
*/
2021
private String type;
22+
23+
/**
24+
* 是否考虑法定节假日:0-不考虑,1-考虑
25+
*/
26+
@SerializedName("official_holiday")
27+
private Integer officialHoliday;
28+
29+
/**
30+
* 每天工作时长(秒),halfday模式下有效
31+
*/
32+
@SerializedName("perday_duration")
33+
private Integer perdayDuration;
2134
}

0 commit comments

Comments
 (0)