8月17日筛选员工数据标志

src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java

@@ -71,4 +71,6 @@ public class ConsumeUser implements Serializable {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 地区列表
+    @ExcelProperty
+    private Integer flag; //是否为员工号
 }

src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java

@@ -89,4 +89,6 @@ public class RechargeUser {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 地区列表
+    @ExcelProperty
+    private Integer flag; //是否为员工号
 }

src/main/java/com/example/demo/domain/vo/coin/RefundUser.java

@@ -74,4 +74,6 @@ public class RefundUser {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 地区列表
+    @ExcelProperty
+    private Integer flag; //是否为员工号
 }

src/main/resources/mapper/ConsumeMapper.xml

@@ -94,13 +94,16 @@
         left join market m ON u.market = m.id
 
         <where>
-            ugr.type = 1 AND ugr.flag = 1 AND u.flag = 1
+            ugr.type = 1 AND ugr.flag = 1
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>
             </if>
+            <if test="flag != 0">
+                AND u.flag = 1
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>

src/main/resources/mapper/RechargeMapper.xml

@@ -99,7 +99,6 @@
         <where>
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
-            AND u.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
@@ -107,6 +106,9 @@
                     #{market}
                 </foreach>
             </if>
+            <if test="flag != 0">
+                AND u.flag = 1
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>

src/main/resources/mapper/RefundMapper.xml

@@ -97,7 +97,7 @@
         admin a ON ugr.admin_id = a.id
         left join market m ON u.market = m.id
         <where>
-            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 AND u.flag = 1
+            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
@@ -105,6 +105,9 @@
                     #{market}
                 </foreach>
             </if>
+            <if test="flag != 0">
+                AND u.flag = 1
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>