Browse Source

新增用户打卡数据列表接口
新增考勤对应多打卡详情接口
新增批量更新考勤数据接口
新增修改考勤对应多打卡接口

anderx 1 year ago
parent
commit
d640fc6c07

+ 9 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.system.domain.UserClockDetailsInput;
 import com.ruoyi.system.domain.selectUserClockInput;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -316,6 +317,14 @@ public class SysUserController extends BaseController
         return AjaxResult.success(userService.UserClockDetails(id));
     }
 
+    /**
+     * 修改考勤对应多打卡
+     */
+    @PostMapping("/updateUserClockDetails")
+    public AjaxResult updateUserClockDetails(@RequestBody UserClockDetailsInput in) {
+        userService.updateUserClockDetails(in);
+        return AjaxResult.success();
+    }
 
     /**
      * 批量更新考勤

+ 28 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserClockDetailsInput.java

@@ -0,0 +1,28 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.project.domain.ProjectStaffRecord;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+public class UserClockDetailsInput {
+    @NotNull(message = "编号必须存在")
+    private Long id;
+    private List<ProjectStaffRecord> list;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public List<ProjectStaffRecord> getList() {
+        return list;
+    }
+
+    public void setList(List<ProjectStaffRecord> list) {
+        this.list = list;
+    }
+}

+ 3 - 4
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -4,10 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.system.domain.UserClockDtails;
-import com.ruoyi.system.domain.UserRecord;
-import com.ruoyi.system.domain.UserRecordOut;
-import com.ruoyi.system.domain.selectUserClockInput;
+import com.ruoyi.system.domain.*;
 
 /**
  * 用户 业务层
@@ -229,4 +226,6 @@ public interface ISysUserService
      * @param type 0缺卡处理 1非加班 2加班
      */
     void updateAllUserClock(Integer type);
+
+    void updateUserClockDetails(UserClockDetailsInput in);
 }

+ 11 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -885,4 +885,15 @@ public class SysUserServiceImpl implements ISysUserService
         userRecordMapper.updateTypeDuration(SecurityUtils.getUserId(),type);
     }
 
+    @Override
+    public void updateUserClockDetails(UserClockDetailsInput in) {
+        for (ProjectStaffRecord projectStaffRecord : in.getList()) {
+            projectStaffRecordMapper.updateByPrimaryKeySelective(projectStaffRecord);
+        }
+        UserRecord ur =new UserRecord();
+        ur.setId(in.getId());
+        ur.setClockStatus(3);
+        userRecordMapper.updateByPrimaryKeySelective(ur);
+    }
+
 }