From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index 519ccee..9b08277 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -1,24 +1,28 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 鏈堝彴_鍒嗙粍淇℃伅琛�
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Data
@ApiModel("鏈堝彴_鍒嗙粍淇℃伅琛�")
@TableName("`platform_group`")
-public class PlatformGroup {
+public class PlatformGroup extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,7 +35,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,13 +44,25 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "绫诲瀷 1瀹夋嘲鐗╂祦瑁呰揣 0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�", example = "1")
+ @ExcelColumn(name="绫诲瀷 1瀹夋嘲鐗╂祦瑁呰揣 0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�")
+ private Integer type;
+ @ApiModelProperty(value = "宸ヤ綔寮�濮嬫椂闂�")
+ @ExcelColumn(name="宸ヤ綔寮�濮嬫椂闂�")
+ private String startTime;
+ @ApiModelProperty(value = "宸ヤ綔缁撴潫鏃堕棿")
+ @ExcelColumn(name="宸ヤ綔缁撴潫鏃堕棿")
+ private String endTime;
+ @ApiModelProperty(value = "绛夊緟鍙彿鏃堕棿锛堝垎閽燂級")
+ @ExcelColumn(name="绛夊緟鍙彿鏃堕棿锛堝垎閽燂級")
+ private Integer waitCallTime;
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
private String name;
@@ -63,4 +79,51 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "鏄惁鑷姩鍙彿 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鑷姩鍙彿 0鍚� 1鏄�")
+ private Integer autoCall;
+
+ @ApiModelProperty(value = "鏄惁铏氭嫙鏈堝彴 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁铏氭嫙鏈堝彴 0鍚� 1鏄�")
+ private Integer isVirtual;
+ @ApiModelProperty(value = "鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�", example = "1")
+ @ExcelColumn(name="鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�")
+ private String autoCallStartTime;
+ @ApiModelProperty(value = "鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�", example = "1")
+ @ExcelColumn(name="鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�")
+ private String autoCallEndTime;
+ @ApiModelProperty(value = "鏈堝彴缁勪笅鐨勬湀鍙�")
+ @TableField(exist = false)
+ private List<Platform> platformList;
+
+ @ApiModelProperty(value = "杞﹁締绛惧埌寰俊閫氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ private String signInNoticeUsers;
+
+ @ApiModelProperty(value = "浣滀笟鏈畬鎴愬井淇￠�氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ private String unFinishNoticeUsers;
+
+
+
+ @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
+ @TableField(exist = false)
+ private List<PlatformJob> workJobList;
+
+ @ApiModelProperty(value = "宸茬鍒版帓闃熻溅杈�", example = "1")
+ @TableField(exist = false)
+ private List<PlatformJob> signJobList;
+ @ApiModelProperty(value = "璁″垝鏀惰揣鏁伴噺(wms)", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalNum;
+ @ApiModelProperty(value = "璁″垝鏀惰揣鏁伴噺(闈瀢ms)", example = "1")
+ @TableField(exist = false)
+ private BigDecimal ortherTotalNum;
+
+
+ @ApiModelProperty(value = "杞﹁締绛惧埌寰俊閫氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String signInNoticeUserNames;
+
+ @ApiModelProperty(value = "浣滀笟鏈畬鎴愬井淇￠�氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String unFinishNoticeUserNames;
}
--
Gitblit v1.9.3