Selaa lähdekoodia

只显示打卡审核通过的记录

lutong 3 viikkoa sitten
vanhempi
commit
1198871aa3

+ 2 - 1
alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StoreBusinessServiceImpl.java

@@ -1203,9 +1203,10 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
         List<StoreStaffConfig> storeStaffConfigs = storeStaffConfigMapper.selectList(lambdaQueryWrapper);
         result.setEmployeeList(storeStaffConfigs);
 
-        // 该用户的打卡记录
+        // 该用户的打卡记录(仅审核通过 check_flag=2)
         LambdaQueryWrapper<StoreClockIn> clockInWrapper = new LambdaQueryWrapper<>();
         clockInWrapper.eq(StoreClockIn::getUserId, userId);
+        clockInWrapper.eq(StoreClockIn::getCheckFlag, 2);
         List<StoreClockIn> clockInList = storeClockInMapper.selectList(clockInWrapper);
 
         List<StoreClockIn> clockStoreList = clockInList.stream().filter(item -> item.getStoreId() == Integer.parseInt(storeId)).collect(Collectors.toList());

+ 2 - 1
alien-store/src/main/java/shop/alien/store/service/LifeUserStoreService.java

@@ -419,9 +419,10 @@ public class LifeUserStoreService {
         // 员工
         returnMap.put("employeeList", employeeList);
 
-        // 该用户的打卡记录
+        // 该用户的打卡记录(仅审核通过 check_flag=2)
         LambdaQueryWrapper<StoreClockIn> clockInWrapper = new LambdaQueryWrapper<>();
         clockInWrapper.eq(StoreClockIn::getUserId, userId);
+        clockInWrapper.eq(StoreClockIn::getCheckFlag, 2);
         List<StoreClockIn> clockInList = storeClockInMapper.selectList(clockInWrapper);
 
         List<StoreClockIn> clockStoreList = clockInList.stream().filter(item -> item.getStoreId() == Integer.parseInt(storeId)).collect(Collectors.toList());

+ 4 - 2
alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -2031,9 +2031,10 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         List<StoreStaffConfig> storeStaffConfigs = storeStaffConfigMapper.selectList(lambdaQueryWrapper);
         result.setEmployeeList(storeStaffConfigs);
 
-        // 该用户的打卡记录
+        // 该用户的打卡记录(仅审核通过 check_flag=2,未审核/审核中/拒绝均不计入)
         LambdaQueryWrapper<StoreClockIn> clockInWrapper = new LambdaQueryWrapper<>();
         clockInWrapper.eq(StoreClockIn::getUserId, userId);
+        clockInWrapper.eq(StoreClockIn::getCheckFlag, 2);
         List<StoreClockIn> clockInList = storeClockInMapper.selectList(clockInWrapper);
 
         List<StoreClockIn> clockStoreList = clockInList.stream().filter(item -> item.getStoreId() == Integer.parseInt(storeId)).collect(Collectors.toList());
@@ -5991,9 +5992,10 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             result.setIsFollowed(0); // 用户ID或店铺信息为空,默认未关注
         }
 
-        // 该用户的打卡记录
+        // 该用户的打卡记录(仅审核通过 check_flag=2)
         LambdaQueryWrapper<StoreClockIn> clockInWrapper = new LambdaQueryWrapper<>();
         clockInWrapper.eq(StoreClockIn::getUserId, userId);
+        clockInWrapper.eq(StoreClockIn::getCheckFlag, 2);
         List<StoreClockIn> clockInList = storeClockInMapper.selectList(clockInWrapper);
 
         List<StoreClockIn> clockStoreList = clockInList.stream().filter(item -> item.getStoreId() == Integer.parseInt(storeId)).collect(Collectors.toList());