From f23da1e915df7046637178140e57d5ce1a2d7fe1 Mon Sep 17 00:00:00 2001
From: kanade <3136520963@qq.com>
Date: Thu, 9 Jun 2022 17:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zh/project0512/controller/ScheduleController.java  |  5 ++++-
 .../zh/project0512/model/QywxDepartmentUserLink.java   |  5 +++++
 src/main/java/com/zh/project0512/model/Rank.java       | 10 +++++++++-
 .../java/com/zh/project0512/model/vo/RankListVo.java   |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/ScheduleController.java b/src/main/java/com/zh/project0512/controller/ScheduleController.java
index 9a1d5bd..98b11e3 100644
--- a/src/main/java/com/zh/project0512/controller/ScheduleController.java
+++ b/src/main/java/com/zh/project0512/controller/ScheduleController.java
@@ -51,7 +51,8 @@ public class ScheduleController {
         taskService.update(ew);
     }
 
-    @Scheduled(cron = "0 0 0 1 1/1 ?")
+//    @Scheduled(cron = "0 0 0 1 1/1 ?")
+    @Scheduled(cron = "0 0/1 * * * ? ")
     public void taskRank() {
         //获取开始时间和结束时间
         Calendar cal = Calendar.getInstance();
@@ -80,6 +81,7 @@ public class ScheduleController {
                 }
                 Rank rank2 = new Rank();
                 PropertyUtils.copyProperties(rankListVo,rank2);
+                rank2.setType(2);//2.员工
                 rank2.setDateStart(timeStart);
                 rank2.setDateEnd(timeEnd);
                 rank2.setCreateDate(new Date());
@@ -105,6 +107,7 @@ public class ScheduleController {
                 }
                 Rank rank2 = new Rank();
                 PropertyUtils.copyProperties(rankListVo,rank2);
+                rank2.setType(1);//1.经销商
                 rank2.setDateStart(timeStart);
                 rank2.setDateEnd(timeEnd);
                 rank2.setCreateDate(new Date());
diff --git a/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java b/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java
index 06894ab..ce22dbd 100644
--- a/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java
+++ b/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java
@@ -1,5 +1,8 @@
 package com.zh.project0512.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,6 +21,7 @@ public class QywxDepartmentUserLink implements Serializable {
     /**
      * 主键id
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 用户小程序唯一标识
@@ -26,5 +30,6 @@ public class QywxDepartmentUserLink implements Serializable {
     /**
      * 部门主键id
      */
+    @TableField("departmentId")
     private Integer departmentId;
 }
diff --git a/src/main/java/com/zh/project0512/model/Rank.java b/src/main/java/com/zh/project0512/model/Rank.java
index c9f9f32..d05d366 100644
--- a/src/main/java/com/zh/project0512/model/Rank.java
+++ b/src/main/java/com/zh/project0512/model/Rank.java
@@ -1,5 +1,8 @@
 package com.zh.project0512.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,11 +19,13 @@ public class Rank implements Serializable {
     /**
      * 主键id
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 关联主键id（用户主键id,经销商主键id）
      */
-    private Integer linkId;
+    @TableField("linkId")
+    private String linkId;
     /**
      * 类型：1.经销商，2.员工
      */
@@ -40,13 +45,16 @@ public class Rank implements Serializable {
     /**
      * 开始时间
      */
+    @TableField("dateStart")
     private Date dateStart;
     /**
      * 结束时间
      */
+    @TableField("dateEnd")
     private Date dateEnd;
     /**
      * 创建时间
      */
+    @TableField("createDate")
     private Date createDate;
 }
diff --git a/src/main/java/com/zh/project0512/model/vo/RankListVo.java b/src/main/java/com/zh/project0512/model/vo/RankListVo.java
index c901e46..77be9ce 100644
--- a/src/main/java/com/zh/project0512/model/vo/RankListVo.java
+++ b/src/main/java/com/zh/project0512/model/vo/RankListVo.java
@@ -1,5 +1,6 @@
 package com.zh.project0512.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,7 +19,7 @@ public class RankListVo implements Serializable {
     /**
      * 关联主键id（用户主键id,经销商主键id）
      */
-    private Integer linkId;
+    private String linkId;
     /**
      * 标题
      */