@@ -4,7 +4,6 @@ import com.ruoyi.common.core.controller.BaseController; | |||
import com.ruoyi.common.core.domain.PageQuery; | |||
import com.ruoyi.common.core.domain.R; | |||
import com.ruoyi.common.core.page.TableDataInfo; | |||
import com.ruoyi.zhushi.entity.DkCheckInRecordDTO; | |||
import com.ruoyi.zhushi.entity.NjRuleConfigDTO; | |||
import com.ruoyi.zhushi.service.NjRuleConfigService; | |||
import lombok.RequiredArgsConstructor; |
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import com.ruoyi.common.core.domain.BaseEntity; | |||
import io.swagger.models.auth.In; | |||
import lombok.Data; | |||
@Data |
@@ -1,9 +1,5 @@ | |||
package com.ruoyi.zhushi.entity; | |||
import com.baomidou.mybatisplus.annotation.IdType; | |||
import com.baomidou.mybatisplus.annotation.TableField; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import com.ruoyi.common.core.domain.BaseEntity; | |||
import lombok.Data; | |||
@@ -1,9 +1,5 @@ | |||
package com.ruoyi.zhushi.entity; | |||
import com.baomidou.mybatisplus.annotation.IdType; | |||
import com.baomidou.mybatisplus.annotation.TableField; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import com.ruoyi.common.core.domain.BaseEntity; | |||
import lombok.Data; | |||
@@ -3,8 +3,6 @@ package com.ruoyi.zhushi.mapper; | |||
import com.ruoyi.common.core.mapper.BaseMapperPlus; | |||
import com.ruoyi.zhushi.entity.DkCheckInConfig; | |||
import com.ruoyi.zhushi.entity.DkCheckInConfigDTO; | |||
import com.ruoyi.zhushi.entity.DkCheckInRecord; | |||
import com.ruoyi.zhushi.entity.DkCheckInRecordDTO; | |||
import org.apache.ibatis.annotations.Mapper; | |||
@Mapper |
@@ -1,9 +1,6 @@ | |||
package com.ruoyi.zhushi.service; | |||
import com.ruoyi.common.core.domain.PageQuery; | |||
import com.ruoyi.common.core.page.TableDataInfo; | |||
import com.ruoyi.zhushi.entity.DkCheckInConfigDTO; | |||
import com.ruoyi.zhushi.entity.DkCheckInRecordDTO; | |||
import java.util.List; | |||
@@ -6,7 +6,6 @@ import com.ruoyi.zhushi.entity.DkCheckInRecord; | |||
import com.ruoyi.zhushi.mapper.DkAttendanceGroupMapper; | |||
import com.ruoyi.zhushi.mapper.DkRecordMapper; | |||
import com.ruoyi.zhushi.service.DkAppService; | |||
import com.ruoyi.zhushi.util.GeoDistanceUtil; | |||
import com.ruoyi.zhushi.util.TimeUtils; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Service; | |||
@@ -382,7 +381,7 @@ public class DkAppServiceImpl implements DkAppService { | |||
// 判断是否已经存在打卡数据 | |||
List<DkCheckInRecord> results = new ArrayList<>(); | |||
DkCheckInRecord dkCheckInRecord = null; | |||
DkCheckInRecord dkCheckInRecord; | |||
if(dkCheckInRecords1.size() > 0){ | |||
System.out.println("已存在打卡数据"+ LocalDate.now() ); | |||
dkCheckInRecord = dkCheckInRecords1.stream().filter(dkCheckInRecord1 -> dkCheckInRecord1.getCheckInTime().toLocalDate().equals(LocalDate.now())).findFirst().orElse(null); |
@@ -2,10 +2,12 @@ package com.ruoyi.zhushi.service.impl; | |||
import cn.hutool.core.bean.BeanUtil; | |||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; | |||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||
import com.ruoyi.common.core.page.TableDataInfo; | |||
import com.ruoyi.zhushi.entity.*; | |||
import com.ruoyi.zhushi.entity.AppDTO; | |||
import com.ruoyi.zhushi.entity.DkAttendanceGroup; | |||
import com.ruoyi.zhushi.entity.DkAttendanceGroupAndUser; | |||
import com.ruoyi.zhushi.entity.DkAttendanceGroupDTO; | |||
import com.ruoyi.zhushi.mapper.DkAttendanceGroupAndUserMapper; | |||
import com.ruoyi.zhushi.mapper.DkAttendanceGroupMapper; | |||
import com.ruoyi.zhushi.service.DkAttendanceGroupService; |
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; | |||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||
import com.baomidou.mybatisplus.core.metadata.IPage; | |||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||
import com.ruoyi.common.annotation.Translation; | |||
import com.ruoyi.common.core.domain.PageQuery; | |||
import com.ruoyi.common.core.page.TableDataInfo; | |||
import com.ruoyi.zhushi.entity.*; |