diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java index 732a3b5..bd066d7 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectReportController.java @@ -1,34 +1,32 @@ package com.ruoyi.oa.controller; -import java.time.LocalDate; -import java.util.List; -import java.util.Arrays; -import java.util.concurrent.TimeUnit; - -import com.ruoyi.oa.domain.vo.ProjectReportCardVo; -import com.ruoyi.oa.domain.vo.ProjectReportPieVo; -import com.ruoyi.oa.domain.vo.ProjectReportTrendVo; -import lombok.RequiredArgsConstructor; -import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; 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.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.oa.domain.vo.OaProjectReportVo; import com.ruoyi.oa.domain.bo.OaProjectReportBo; +import com.ruoyi.oa.domain.vo.OaProjectReportVo; +import com.ruoyi.oa.domain.vo.ProjectReportCardVo; +import com.ruoyi.oa.domain.vo.ProjectReportPieVo; +import com.ruoyi.oa.domain.vo.ProjectReportTrendVo; import com.ruoyi.oa.service.IOaProjectReportService; -import com.ruoyi.common.core.page.TableDataInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDate; +import java.util.Arrays; +import java.util.List; /** * 项目报工 @@ -47,7 +45,7 @@ public class OaProjectReportController extends BaseController { /** * 查询项目报工列表 */ - @SaCheckPermission("oa:projectReport:list") +// @SaCheckPermission("oa:projectReport:list") @GetMapping("/list") public TableDataInfo list(OaProjectReportBo bo, PageQuery pageQuery) { return iOaProjectReportService.queryPageList(bo, pageQuery); @@ -56,7 +54,7 @@ public class OaProjectReportController extends BaseController { /** * 查询项目报工列表 */ - @SaCheckPermission("oa:projectReport:list") +// @SaCheckPermission("oa:projectReport:list") @GetMapping("/report") public R> clearList( @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate start, @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate end) { @@ -66,7 +64,7 @@ public class OaProjectReportController extends BaseController { /** * 导出项目报工列表 */ - @SaCheckPermission("oa:projectReport:export") +// @SaCheckPermission("oa:projectReport:export") @Log(title = "项目报工", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(@RequestBody OaProjectReportBo bo, HttpServletResponse response) { @@ -93,7 +91,7 @@ public class OaProjectReportController extends BaseController { * * @param reportId 主键 */ - @SaCheckPermission("oa:projectReport:query") +// @SaCheckPermission("oa:projectReport:query") @GetMapping("/{reportId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long reportId) { @@ -103,7 +101,7 @@ public class OaProjectReportController extends BaseController { /** * 新增项目报工 */ - @SaCheckPermission("oa:projectReport:add") +// @SaCheckPermission("oa:projectReport:add") @Log(title = "项目报工", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -114,7 +112,7 @@ public class OaProjectReportController extends BaseController { /** * 修改项目报工 */ - @SaCheckPermission("oa:projectReport:edit") +// @SaCheckPermission("oa:projectReport:edit") @Log(title = "项目报工", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -127,7 +125,7 @@ public class OaProjectReportController extends BaseController { * * @param reportIds 主键串 */ - @SaCheckPermission("oa:projectReport:remove") +// @SaCheckPermission("oa:projectReport:remove") @Log(title = "项目报工", businessType = BusinessType.DELETE) @DeleteMapping("/{reportIds}") public R remove(@NotEmpty(message = "主键不能为空")