wangliang před 1 rokem
rodič
revize
0f9ba04a74

+ 12 - 0
sop-business/src/main/java/com/qmth/sop/business/entity/TBDingHistory.java

@@ -2,6 +2,7 @@ package com.qmth.sop.business.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.sop.common.enums.DingDateTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -31,6 +32,9 @@ public class TBDingHistory implements Serializable {
     @ApiModelProperty(value = "签到日期")
     private String signDate;
 
+    @ApiModelProperty(value = "日期类型:WEEKDAY(工作日),WEEKEND(周末),LEGAL_HOLIDAYS(法定节假日)")
+    private DingDateTypeEnum dateType;
+
     @ApiModelProperty(value = "签到时间")
     private Long signInTime;
 
@@ -62,6 +66,14 @@ public class TBDingHistory implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Long createTime;
 
+    public DingDateTypeEnum getDateType() {
+        return dateType;
+    }
+
+    public void setDateType(DingDateTypeEnum dateType) {
+        this.dateType = dateType;
+    }
+
     public Long getId() {
         return id;
     }

+ 4 - 1
sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -510,4 +510,7 @@ ALTER TABLE t_b_ding_apply ADD CONSTRAINT t_b_ding_apply_UN_ding_exception_no UN
 ALTER TABLE t_b_product CHANGE COLUMN code code VARCHAR(100)
     COMMENT '编码,OFFICE:教务处,CLOUD_MARK:云阅卷' NOT NULL;
 
-ALTER TABLE t_b_session MODIFY COLUMN `type` varchar(500) CHARACTER SET utf8mb4 NOT NULL COMMENT '用户类型';
+ALTER TABLE t_b_session MODIFY COLUMN `type` varchar(500) CHARACTER SET utf8mb4 NOT NULL COMMENT '用户类型';
+
+ALTER TABLE t_b_ding_history ADD date_type varchar(20) NULL COMMENT '日期类型:WEEKDAY("工作日"),WEEKEND("周末"),LEGAL_HOLIDAYS("法定节假日")';
+ALTER TABLE t_b_ding_history CHANGE date_type date_type varchar(20) NULL COMMENT '日期类型:WEEKDAY("工作日"),WEEKEND("周末"),LEGAL_HOLIDAYS("法定节假日")' AFTER sign_date;