|
|
@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import com.ruoyi.system.domain.selectUserClockInput;
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
@@ -302,8 +303,8 @@ public class SysUserController extends BaseController
|
|
|
* 考勤与打卡核对表
|
|
|
*/
|
|
|
@GetMapping("/selectUserClock")
|
|
|
- public AjaxResult selectUserClock(@RequestParam(name = "status", required = false)Integer status) {
|
|
|
- return AjaxResult.success(userService.selectUserClock(status));
|
|
|
+ public AjaxResult selectUserClock(selectUserClockInput in) {
|
|
|
+ return AjaxResult.success(userService.selectUserClock(in));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -314,4 +315,15 @@ public class SysUserController extends BaseController
|
|
|
|
|
|
return AjaxResult.success(userService.UserClockDetails(id));
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 批量更新考勤
|
|
|
+ * @param type 0缺卡处理 1非加班 2加班
|
|
|
+ */
|
|
|
+ @PostMapping("/updateAllUserClock")
|
|
|
+ public AjaxResult updateAllUserClock(@RequestParam("type") Integer type) {
|
|
|
+ userService.updateAllUserClock(type);
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
}
|