导出数据的时候添加考勤组条件

zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkAttendanceGroupController.java

@@ -52,4 +52,9 @@ public class DkAttendanceGroupController extends BaseController {
     public R<Void> delUser(@PathVariable long id) {
         return toAjax(dkAttendanceGroupService.deleteConfig(id));
     }
+
+    @GetMapping("/queryAttendanceGroup")
+    public R<List<DkAttendanceGroupDTO>> queryAttendanceGroup() {
+        return R.ok(dkAttendanceGroupService.queryAttendanceGroup());
+    }
 }

zs-manager/src/main/java/com/ruoyi/zhushi/entity/DkCheckInRecordDTO.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @ExcelIgnoreUnannotated
@@ -65,8 +66,11 @@ public class DkCheckInRecordDTO extends BaseEntity {
     private String modelType;
 
     // 考勤组id
-    private String attendanceGroupId;
+    private long attendanceGroupId;
 
     // 考勤组名称
     private String attendanceGroupName;
+
+    // 考勤组ids
+    private List<Long> attendanceGroupIds;
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/DkAttendanceGroupService.java

@@ -19,4 +19,6 @@ public interface DkAttendanceGroupService {
     public AppDTO queryAttendanceGroupBYUserId(long useId);
 
     public int deleteConfig(long id);
+
+    public List<DkAttendanceGroupDTO> queryAttendanceGroup();
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkAttendanceGroupServiceImpl.java

@@ -104,4 +104,10 @@ public class DkAttendanceGroupServiceImpl implements DkAttendanceGroupService {
         return dkAttendanceGroupAndUserMapper.deleteById(id);
 
     }
+
+    @Override
+    public List<DkAttendanceGroupDTO> queryAttendanceGroup() {
+        LambdaQueryWrapper<DkAttendanceGroup> queryWrapper = Wrappers.lambdaQuery();
+        return dkAttendanceGroupMapper.selectVoList(queryWrapper);
+    }
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java

@@ -74,6 +74,7 @@ public class DkRecordServiceImpl implements DkRecordService {
         }
         if(flag != null){
             queryWrapper.select(DkCheckInRecord::getSysUserName, DkCheckInRecord::getSysUserId);
+            queryWrapper.in(DkCheckInRecord::getAttendanceGroupId, dkCheckInRecordDTO.getAttendanceGroupIds());
             queryWrapper.groupBy(DkCheckInRecord::getSysUserName).groupBy(DkCheckInRecord::getSysUserId);
         }else{
             queryWrapper.orderByDesc(DkCheckInRecord::getSysUserName).orderByDesc(DkCheckInRecord::getCheckInTime);