oa初步完成

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java

@@ -1,8 +1,12 @@
 package com.ruoyi.oa.controller;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
 
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.oa.domain.LaborCostData;
 import com.ruoyi.oa.domain.vo.SysUserVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -38,10 +42,35 @@ public class SysOaAttendanceController extends BaseController {
 
     private final ISysOaAttendanceService iSysOaAttendanceService;
 
+
+    /**
+     * 获取当前月的天数
+     * @return
+     */
+    @GetMapping("/date")
+    public R<Long> date() {
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(DateUtils.getNowDate());
+        Long dateLength = (long) calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+
+        return R.ok(dateLength);
+    }
+
+
+    /**
+     * 获取当前月的天数
+     * @return
+     */
+    @GetMapping("/calc/{time}")
+    public R<List<LaborCostData>> calc(@PathVariable("time") Date time) {
+        return R.ok(iSysOaAttendanceService.workerCalc(time));
+    }
+
+
     /**
      * 查询人员考勤列表
      */
-    @SaCheckPermission("system:oaAttendance:list")
     @GetMapping("/list")
     public TableDataInfo<SysOaAttendanceVo> list(SysOaAttendanceBo bo, PageQuery pageQuery) {
         return iSysOaAttendanceService.queryPageList(bo, pageQuery);
@@ -52,7 +81,6 @@ public class SysOaAttendanceController extends BaseController {
     /**
      * 查询人员考勤列表
      */
-    @SaCheckPermission("system:oaAttendance:list")
     @GetMapping("/worker/list")
     public R<List<SysUserVo>> workerList(SysOaAttendanceBo bo) {
 
@@ -63,7 +91,6 @@ public class SysOaAttendanceController extends BaseController {
     /**
      * 导出人员考勤列表
      */
-    @SaCheckPermission("system:oaAttendance:export")
     @Log(title = "人员考勤", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SysOaAttendanceBo bo, HttpServletResponse response) {
@@ -76,7 +103,6 @@ public class SysOaAttendanceController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:oaAttendance:query")
     @GetMapping("/{id}")
     public R<SysOaAttendanceVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -86,7 +112,6 @@ public class SysOaAttendanceController extends BaseController {
     /**
      * 新增人员考勤
      */
-    @SaCheckPermission("system:oaAttendance:add")
     @Log(title = "人员考勤", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -97,7 +122,6 @@ public class SysOaAttendanceController extends BaseController {
     /**
      * 修改人员考勤
      */
-    @SaCheckPermission("system:oaAttendance:edit")
     @Log(title = "人员考勤", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -110,7 +134,6 @@ public class SysOaAttendanceController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:oaAttendance:remove")
     @Log(title = "人员考勤", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -122,7 +145,6 @@ public class SysOaAttendanceController extends BaseController {
     /**
      * 新增人员考勤
      */
-    @SaCheckPermission("system:oaAttendance:add")
     @Log(title = "人员考勤", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/insertBatch")