From 57cd76d861e0102a9dee9fa56a0bf4110e8c3f55 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 09:09:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Weekly.java | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Weekly.java b/src/main/java/com/zy/crm/manager/entity/Weekly.java
index bd71913..d4410f1 100644
--- a/src/main/java/com/zy/crm/manager/entity/Weekly.java
+++ b/src/main/java/com/zy/crm/manager/entity/Weekly.java
@@ -8,21 +8,6 @@
import com.zy.crm.system.entity.*;
import com.zy.crm.system.service.*;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.core.common.SpringUtils;
-import com.core.common.SpringUtils;
-import com.core.common.SpringUtils;
-import com.zy.crm.system.service.UserService;
-import com.zy.crm.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.crm.system.service.UserService;
-import com.zy.crm.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.core.common.SpringUtils;
import com.zy.crm.system.service.UserService;
import com.zy.crm.system.entity.User;
@@ -49,7 +34,6 @@
* 寮�濮嬫棩鏈�
*/
@ApiModelProperty(value= "寮�濮嬫棩鏈�")
- @TableId(value = "start_time", type = IdType.INPUT)
@TableField("start_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@@ -58,7 +42,6 @@
* 缁撴潫鏃ユ湡
*/
@ApiModelProperty(value= "缁撴潫鏃ユ湡")
- @TableId(value = "end_time", type = IdType.INPUT)
@TableField("end_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@@ -67,7 +50,6 @@
* 鎵�灞炰汉鍛�
*/
@ApiModelProperty(value= "鎵�灞炰汉鍛�")
- @TableId(value = "user_id", type = IdType.INPUT)
@TableField("user_id")
private Long userId;
@@ -142,7 +124,7 @@
/**
* update_time
*/
- @ApiModelProperty(value= "update_time")
+ @ApiModelProperty(value= "鏇存柊鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -221,6 +203,12 @@
@ApiModelProperty(value= "鍛�")
@TableField("weekly_day_month")
private String weeklyDayMonth;
+
+ /**
+ * 琛ㄥ崟鍐呭
+ */
+ @ApiModelProperty(value= "琛ㄥ崟鍐呭")
+ private String form;
public Weekly() {}
@@ -343,19 +331,19 @@
case 0:
return "榛樿";
case 1:
- return "寮�濮�";
+ return "寰呮彁浜�";
case 2:
- return "缁勯暱寰呭";
+ return "寰呭鏍�";
case 3:
- return "缁勯暱瀹℃牳";
- case 4:
- return "瑙勫垝寰呭";
- case 5:
- return "瑙勫垝瀹℃牳";
- case 6:
- return "瀹℃壒涓�";
- case 7:
- return "瀹℃壒閫氳繃";
+ return "閫氳繃";
+// case 4:
+// return "瑙勫垝寰呭";
+// case 5:
+// return "瑙勫垝瀹℃牳";
+// case 6:
+// return "瀹℃壒涓�";
+// case 7:
+// return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
}
--
Gitblit v1.9.1