From c7b3341a13a6f2e38fb05d6ca3df9b5cb19c58b5 Mon Sep 17 00:00:00 2001
From: fcli <fcli@che300.com>
Date: Thu, 1 Dec 2022 17:41:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/salaryBill/param/SalarySendInfoQueryParam.java | 6 ++++++
 .../salary/enums/salarybill/SalarySendStatusEnum.java     | 7 ++++++-
 .../salary/mapper/salarybill/SalarySendInfoMapper.xml     | 8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
index 3153759e3..2bac2f3c5 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
@@ -58,6 +58,12 @@ public class SalarySendInfoQueryParam extends BaseQueryParam {
 //    @ApiModelProperty("发送状态")
     private SalarySendStatusEnum sendStatus;
 
+    /**
+     * true= [已发送]
+     * false= [未发送，已撤回]
+     */
+    private Boolean isGranted;
+
     /**
      * 发送状态
      */
diff --git a/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java b/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java
index d31bc3011..aa6ef65f7 100644
--- a/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java
+++ b/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java
@@ -1,5 +1,7 @@
 package com.engine.salary.enums.salarybill;
 
+import com.engine.salary.enums.BaseEnum;
+
 import java.util.Arrays;
 
 /**
@@ -7,7 +9,7 @@ import java.util.Arrays;
  * @Author: wangxiangzhong
  * @Date: 2021/12/9 15:56
  */
-public enum SalarySendStatusEnum {
+public enum SalarySendStatusEnum implements BaseEnum<Integer> {
 
     UNSEND(0, "未发放", 93286),
     ALREADYSEND(1, "已发放", 93212),
@@ -25,14 +27,17 @@ public enum SalarySendStatusEnum {
         this.labelId = labelId;
     }
 
+    @Override
     public Integer getValue() {
         return value;
     }
 
+    @Override
     public String getDefaultLabel() {
         return defaultLabel;
     }
 
+    @Override
     public Integer getLabelId() {
         return labelId;
     }
diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index 4cfd0cd94..412175d23 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -318,6 +318,14 @@
         <!-- 发送状态 -->
         <if test="param.sendStatusVal != null">
             AND t1.send_status = #{param.sendStatusVal}
+            </if>
+        <if test="param.isGranted != null">
+            <if test="param.isGranted">
+                and t1.send_status = 1
+            </if>
+            <if test="!param.isGranted">
+                and t1.send_status in (0, 2)
+            </if>
         </if>
         <include refid="paramSql"/>
         <!-- 排序 -->