|
|
@@ -8,6 +8,7 @@ import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.validation.Validator;
|
|
|
|
|
|
+import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
import com.ruoyi.common.enums.UserRolesType;
|
|
|
import com.ruoyi.common.utils.bean.BeanUtils;
|
|
|
@@ -896,4 +897,38 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
userRecordMapper.updateByPrimaryKeySelective(ur);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void updateUserRecord(UserRecord in) {
|
|
|
+ UserRecord ur=new UserRecord();
|
|
|
+ ur.setId(in.getId());
|
|
|
+ ur.setCheckDuration(in.getCheckDuration());
|
|
|
+ ur.setStatus(2);
|
|
|
+ userRecordMapper.updateByPrimaryKeySelective(ur);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void userRecordMerge() {
|
|
|
+ Long userId = SecurityUtils.getUserId();
|
|
|
+ UserRecord u=new UserRecord();
|
|
|
+ u.setCreateId(userId);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public AjaxResult userRecordMergeCheck() {
|
|
|
+ Long userId = SecurityUtils.getUserId();
|
|
|
+ UserRecord u=new UserRecord();
|
|
|
+ u.setCreateId(userId);
|
|
|
+ u.setStatus(1);
|
|
|
+ int i = userRecordMapper.checkUserRecord(u);
|
|
|
+ if (i>0){
|
|
|
+ return AjaxResult.error("当前用户存在缺卡的考勤,请处理后再提交");
|
|
|
+ }
|
|
|
+ int x = userRecordMapper.checkClockUserRecord(u);
|
|
|
+ if (x>0){
|
|
|
+ return AjaxResult.error("当前用户存的考勤存在多打卡,请处理后再提交");
|
|
|
+ }
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
}
|