瀏覽代碼

🎨 #1457 企业微信OA审批相关类优化,增加缺失的@Data注解

* 增加@Data注解
* 增加control类型为Attendance的数据结构
dev1
Ray 5 年之前
committed by GitHub
父節點
當前提交
5b934c0e0d
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 3 個文件被更改,包括 30 次插入4 次删除
  1. +25
    -0
      weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
  2. +3
    -0
      weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java
  3. +2
    -4
      weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java

+ 25
- 0
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<ContentValue.Child> children; private List<ContentValue.Child> children;


private Attendance attendance;

@Data @Data
public static class Date implements Serializable { public static class Date implements Serializable {
private static final long serialVersionUID = -6181554080062231138L; private static final long serialVersionUID = -6181554080062231138L;
@@ -91,4 +93,27 @@ public class ContentValue implements Serializable {
private List<Content> list; private List<Content> 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;
}
}



} }

+ 3
- 0
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; package me.chanjar.weixin.cp.bean.oa.templatedata;


import lombok.Data;

import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;


/** /**
* @author gyv123@163.com * @author gyv123@163.com
*/ */
@Data
public class TemplateOptions implements Serializable { public class TemplateOptions implements Serializable {


private static final long serialVersionUID = -7883792668568772078L; private static final long serialVersionUID = -7883792668568772078L;


+ 2
- 4
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; package me.chanjar.weixin.cp.bean.oa.templatedata;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName; 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.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Map;


/** /**
* @author gyv12345@163.com * @author gyv12345@163.com
*/ */
@Data
public class TemplateProperty implements Serializable { public class TemplateProperty implements Serializable {


private static final long serialVersionUID = -3429251158540167453L; private static final long serialVersionUID = -3429251158540167453L;


Loading…
取消
儲存