From d5be58391845ab9af93b2e37667b115f14b628ee Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Thu, 6 Jun 2024 21:31:25 +0800
Subject: [PATCH] fix

---
 .../module/entity/PlayClerkUserReturnVo.java  | 27 +++++++++++++++++++
 .../module/vo/PlayClerkUserStateEditVo.java   |  9 +++++++
 .../module/vo/PlayClerkWagesInfoReturnVo.java |  1 +
 .../impl/PlayClerkWagesInfoServiceImpl.java   |  2 +-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
index 1f6f8e3..13ead76 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java
@@ -179,6 +179,33 @@ public class PlayClerkUserReturnVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime resignationTime;
 
+    /**
+     * 是否推荐状态（1：已推荐，0：未推荐）
+     */
+    private String recommendationState;
+
+    /**
+     * 是否置顶状态（1：已置顶，0：未置顶）
+     */
+    private String pinToTopState;
+
+    /**
+     * 显示状态【1：显示，0：隐藏】
+     */
+    private String displayState;
+
+    /**
+     * 是否固定等级(0:固定等级，1:不固定)
+     */
+    private String fixingLevel;
+
+
+    /**
+     * 在职状态（1：在职，0：离职）
+     */
+    private String onboardingState;
+
+
     /**
      * 在职天数
      */
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
index cb04d8e..87e4a36 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkUserStateEditVo.java
@@ -68,4 +68,13 @@ public class PlayClerkUserStateEditVo {
      */
     private String onboardingState = "1";
 
+
+    /**
+     * 在职状态（1：在职，0：离职）
+     */
+    private String levelId;
+
+
+    private String remark;
+
 }
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
index 6510e91..5d165d9 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkWagesInfoReturnVo.java
@@ -74,6 +74,7 @@ public class PlayClerkWagesInfoReturnVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime settlementDate;
 
+
     /**
      * 订单总数
      */
diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java
index 28ec5e5..ca13cda 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkWagesInfoServiceImpl.java
@@ -78,7 +78,7 @@ public class PlayClerkWagesInfoServiceImpl extends ServiceImpl<PlayClerkWagesInf
     public IPage<PlayClerkWagesInfoReturnVo> selectHistoricalByPage(PlayClerkWagesInfoQueryVo vo) {
         MPJLambdaWrapper<PlayClerkWagesInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>();
         lambdaWrapper.selectAll(PlayClerkWagesInfoEntity.class);
-        //凭借店员表
+        //拼接店员表
         lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname");
         lambdaWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayClerkWagesInfoEntity::getClerkId);
         if (StrUtil.isNotBlank(vo.getGroupId())) {