DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CRM提交更新

Browse Source
This commit is contained in:
hdka
2025-03-12 21:14:46 +08:00
parent 6fbac23101
commit 0ce49d1504
52 changed files with 2918 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeFilesController.java
View File

@@ -42,7 +42,6 @@ public class EmployeeFilesController extends BaseController {
/**
* 查询文件档案管理列表
*/
@SaCheckPermission("oa:files:list")
@GetMapping("/list")
public TableDataInfo<FileUser> list(EmployeeFilesBo bo, PageQuery pageQuery) {
return iEmployeeFilesService.queryPageList(bo, pageQuery);
@@ -53,7 +52,6 @@ public class EmployeeFilesController extends BaseController {
*
* @param userId 主键
*/
@SaCheckPermission("oa:files:query")
@GetMapping("/{userId}")
public R<UserFilesVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("userId") Long userId) {
@@ -63,7 +61,6 @@ public class EmployeeFilesController extends BaseController {
/**
* 新增文件档案管理
*/
@SaCheckPermission("oa:files:add")
@Log(title = "文件档案管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeOffboardingController.java
View File

@@ -42,7 +42,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 查询离职管理列表
*/
@SaCheckPermission("system:offboarding:list")
@GetMapping("/list")
public TableDataInfo<EmployeeOffboardingVo> list(EmployeeOffboardingBo bo, PageQuery pageQuery) {
return iEmployeeOffboardingService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 导出离职管理列表
*/
@SaCheckPermission("system:offboarding:export")
@Log(title = "离职管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(EmployeeOffboardingBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class EmployeeOffboardingController extends BaseController {
*
* @param offboardingId 主键
*/
@SaCheckPermission("system:offboarding:query")
@GetMapping("/{offboardingId}")
public R<EmployeeOffboardingVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long offboardingId) {
@@ -74,7 +71,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 新增离职管理
*/
@SaCheckPermission("system:offboarding:add")
@Log(title = "离职管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 修改离职管理
*/
@SaCheckPermission("system:offboarding:edit")
@Log(title = "离职管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class EmployeeOffboardingController extends BaseController {
*
* @param offboardingIds 主键串
*/
@SaCheckPermission("system:offboarding:remove")
@Log(title = "离职管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{offboardingIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeOnboardingController.java
View File

@@ -43,7 +43,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 查询入职管理列表
*/
@SaCheckPermission("system:onboarding:list")
@GetMapping("/list")
public TableDataInfo<EmployeeOnboardingVo> list(EmployeeOnboardingBo bo, PageQuery pageQuery) {
return iEmployeeOnboardingService.queryPageList(bo, pageQuery);
@@ -52,7 +51,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 导出入职管理列表
*/
@SaCheckPermission("system:onboarding:export")
@Log(title = "入职管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(EmployeeOnboardingBo bo, HttpServletResponse response) {
@@ -65,7 +63,6 @@ public class EmployeeOnboardingController extends BaseController {
*
* @param userId 主键
*/
@SaCheckPermission("system:onboarding:query")
@GetMapping("/{userId}")
public R<EmployeeOnboardingVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long userId) {
@@ -75,7 +72,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 新增入职管理
*/
@SaCheckPermission("system:onboarding:add")
@Log(title = "入职管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -86,7 +82,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 修改入职管理
*/
@SaCheckPermission("system:onboarding:edit")
@Log(title = "入职管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -99,7 +94,6 @@ public class EmployeeOnboardingController extends BaseController {
*
* @param onboardingIds 主键串
*/
@SaCheckPermission("system:onboarding:remove")
@Log(title = "入职管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{onboardingIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

15
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBusinessController.java
View File

@@ -43,16 +43,22 @@ public class OaBusinessController extends BaseController {
/**
* 查询CRM 商机列表
*/
@SaCheckPermission("oa:business:list")
@GetMapping("/list")
public TableDataInfo<OaBusinessVo> list(OaBusinessBo bo, PageQuery pageQuery) {
return iOaBusinessService.queryPageList(bo, pageQuery);
}
/**
* 查询CRM 商机列表
*/
@GetMapping("/listByCustomer")
public TableDataInfo<OaBusinessVo> listByCustomer(OaBusinessBo bo, PageQuery pageQuery) {
return iOaBusinessService.queryPageList(bo, pageQuery);
}
/**
* 导出CRM 商机列表
*/
@SaCheckPermission("oa:business:export")
@Log(title = "CRM 商机", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaBusinessBo bo, HttpServletResponse response) {
@@ -65,7 +71,6 @@ public class OaBusinessController extends BaseController {
*
* @param businessId 主键
*/
@SaCheckPermission("oa:business:query")
@GetMapping("/{businessId}")
public R<OaBusinessVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long businessId) {
@@ -75,7 +80,6 @@ public class OaBusinessController extends BaseController {
/**
* 新增CRM 商机
*/
@SaCheckPermission("oa:business:add")
@Log(title = "CRM 商机", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -86,7 +90,6 @@ public class OaBusinessController extends BaseController {
/**
* 修改CRM 商机
*/
@SaCheckPermission("oa:business:edit")
@Log(title = "CRM 商机", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -99,7 +102,6 @@ public class OaBusinessController extends BaseController {
*
* @param businessIds 主键串
*/
@SaCheckPermission("oa:business:remove")
@Log(title = "CRM 商机", businessType = BusinessType.DELETE)
@DeleteMapping("/{businessIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -111,7 +113,6 @@ public class OaBusinessController extends BaseController {
/**
* 联查商机与产品以及其关联表
*/
@SaCheckPermission("oa:business:query")
@GetMapping("/BusinessProducts")
public TableDataInfo<OaProductVo> getBusinessProducts(OaBusinessBo bo) {
return iOaBusinessService.getBusinessProducts(bo);

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBusinessProductController.java
View File

@@ -42,7 +42,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 查询CRM 商机产品关联列表
*/
@SaCheckPermission("oa:businessProduct:list")
@GetMapping("/list")
public TableDataInfo<OaBusinessProductVo> list(OaBusinessProductBo bo, PageQuery pageQuery) {
return iOaBusinessProductService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 导出CRM 商机产品关联列表
*/
@SaCheckPermission("oa:businessProduct:export")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaBusinessProductBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaBusinessProductController extends BaseController {
*
* @param businessProductId 主键
*/
@SaCheckPermission("oa:businessProduct:query")
@GetMapping("/{businessProductId}")
public R<OaBusinessProductVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long businessProductId) {
@@ -74,7 +71,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 新增CRM 商机产品关联
*/
@SaCheckPermission("oa:businessProduct:add")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 修改CRM 商机产品关联
*/
@SaCheckPermission("oa:businessProduct:edit")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class OaBusinessProductController extends BaseController {
*
* @param businessProductIds 主键串
*/
@SaCheckPermission("oa:businessProduct:remove")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{businessProductIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

8
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaClueController.java
View File

@@ -42,16 +42,14 @@ public class OaClueController extends BaseController {
/**
* 查询CRM 线索列表
*/
@SaCheckPermission("oa:clue:list")
@GetMapping("/list")
public TableDataInfo<OaClueVo> list(OaClueBo bo, PageQuery pageQuery) {
return iOaClueService.queryPageList(bo, pageQuery);
return iOaClueService.queryPageListVo(bo, pageQuery);
}
/**
* 导出CRM 线索列表
*/
@SaCheckPermission("oa:clue:export")
@Log(title = "CRM 线索", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaClueBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaClueController extends BaseController {
*
* @param clueId 主键
*/
@SaCheckPermission("oa:clue:query")
@GetMapping("/{clueId}")
public R<OaClueVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long clueId) {
@@ -74,7 +71,6 @@ public class OaClueController extends BaseController {
/**
* 新增CRM 线索
*/
@SaCheckPermission("oa:clue:add")
@Log(title = "CRM 线索", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class OaClueController extends BaseController {
/**
* 修改CRM 线索
*/
@SaCheckPermission("oa:clue:edit")
@Log(title = "CRM 线索", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class OaClueController extends BaseController {
*
* @param clueIds 主键串
*/
@SaCheckPermission("oa:clue:remove")
@Log(title = "CRM 线索", businessType = BusinessType.DELETE)
@DeleteMapping("/{clueIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

18
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaCustomerController.java
View File

@@ -42,16 +42,22 @@ public class OaCustomerController extends BaseController {
/**
* 查询CRM 客户列表
*/
@SaCheckPermission("oa:customer:list")
@GetMapping("/list")
public TableDataInfo<OaCustomerVo> list(OaCustomerBo bo, PageQuery pageQuery) {
return iOaCustomerService.queryPageList(bo, pageQuery);
return iOaCustomerService.queryPageListToUser(bo, pageQuery);
}
/**
* 查询CRM 客户列表
*/
@GetMapping("/list-sea")
public TableDataInfo<OaCustomerVo> seaList(OaCustomerBo bo, PageQuery pageQuery) {
return iOaCustomerService.queryPageListToSea(bo, pageQuery);
}
/**
* 导出CRM 客户列表
*/
@SaCheckPermission("oa:customer:export")
@Log(title = "CRM 客户", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaCustomerBo bo, HttpServletResponse response) {
@@ -64,7 +70,6 @@ public class OaCustomerController extends BaseController {
*
* @param customerId 主键
*/
@SaCheckPermission("oa:customer:query")
@GetMapping("/{customerId}")
public R<OaCustomerVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long customerId) {
@@ -74,7 +79,6 @@ public class OaCustomerController extends BaseController {
/**
* 新增CRM 客户
*/
@SaCheckPermission("oa:customer:add")
@Log(title = "CRM 客户", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +89,7 @@ public class OaCustomerController extends BaseController {
/**
* 修改CRM 客户
*/
@SaCheckPermission("oa:customer:edit")
@Log(title = "CRM 客户", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +102,7 @@ public class OaCustomerController extends BaseController {
*
* @param customerIds 主键串
*/
@SaCheckPermission("oa:customer:remove")
@Log(title = "CRM 客户", businessType = BusinessType.DELETE)
@DeleteMapping("/{customerIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

25
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFollowUpRecordController.java
View File

@@ -1,9 +1,12 @@
package com.ruoyi.oa.controller;
import java.util.Collections;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.service.IOaBusinessProductService;
import com.ruoyi.oa.service.IOaBusinessService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -34,15 +37,17 @@ import com.ruoyi.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/followUpRecord")
@RequestMapping("/oa/followUpRecord")
public class OaFollowUpRecordController extends BaseController {
private final IOaFollowUpRecordService iOaFollowUpRecordService;
private final IOaBusinessService iOaBusinessService;
/**
* 查询CRM 跟进记录列表
*/
@SaCheckPermission("system:followUpRecord:list")
@GetMapping("/list")
public TableDataInfo<OaFollowUpRecordVo> list(OaFollowUpRecordBo bo, PageQuery pageQuery) {
return iOaFollowUpRecordService.queryPageList(bo, pageQuery);
@@ -51,7 +56,6 @@ public class OaFollowUpRecordController extends BaseController {
/**
* 导出CRM 跟进记录列表
*/
@SaCheckPermission("system:followUpRecord:export")
@Log(title = "CRM 跟进记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaFollowUpRecordBo bo, HttpServletResponse response) {
@@ -64,17 +68,26 @@ public class OaFollowUpRecordController extends BaseController {
*
* @param followId 主键
*/
@SaCheckPermission("system:followUpRecord:query")
@GetMapping("/{followId}")
public R<OaFollowUpRecordVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long followId) {
return R.ok(iOaFollowUpRecordService.queryById(followId));
}
/**
* CRM 商机
*
* @param businessIds 主键串
*/
@GetMapping("/listByIds/{businessIds}")
public R<List<OaFollowUpRecordVo>> selectByBusinessIds(
@PathVariable("businessIds") Long[] businessIds) {
return R.ok(iOaFollowUpRecordService.selectByBusinessIds(Arrays.asList(businessIds)));
}
/**
* 新增CRM 跟进记录
*/
@SaCheckPermission("system:followUpRecord:add")
@Log(title = "CRM 跟进记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +98,6 @@ public class OaFollowUpRecordController extends BaseController {
/**
* 修改CRM 跟进记录
*/
@SaCheckPermission("system:followUpRecord:edit")
@Log(title = "CRM 跟进记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +110,6 @@ public class OaFollowUpRecordController extends BaseController {
*
* @param followIds 主键串
*/
@SaCheckPermission("system:followUpRecord:remove")
@Log(title = "CRM 跟进记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{followIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProductController.java
View File

@@ -42,7 +42,6 @@ public class OaProductController extends BaseController {
/**
* 查询CRM 产品列表
*/
@SaCheckPermission("oa:product:list")
@GetMapping("/list")
public TableDataInfo<OaProductVo> list(OaProductBo bo, PageQuery pageQuery) {
return iOaProductService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class OaProductController extends BaseController {
/**
* 导出CRM 产品列表
*/
@SaCheckPermission("oa:product:export")
@Log(title = "CRM 产品", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaProductBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaProductController extends BaseController {
*
* @param productId 主键
*/
@SaCheckPermission("oa:product:query")
@GetMapping("/{productId}")
public R<OaProductVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long productId) {
@@ -74,7 +71,6 @@ public class OaProductController extends BaseController {
/**
* 新增CRM 产品
*/
@SaCheckPermission("oa:product:add")
@Log(title = "CRM 产品", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class OaProductController extends BaseController {
/**
* 修改CRM 产品
*/
@SaCheckPermission("oa:product:edit")
@Log(title = "CRM 产品", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class OaProductController extends BaseController {
*
* @param productIds 主键串
*/
@SaCheckPermission("oa:product:remove")
@Log(title = "CRM 产品", businessType = BusinessType.DELETE)
@DeleteMapping("/{productIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryController.java
View File

@@ -42,7 +42,6 @@ public class OaSalaryController extends BaseController {
/**
* 查询薪资管理列表
*/
@SaCheckPermission("oa:salary:list")
@GetMapping("/list-staff")
public TableDataInfo<OaSalaryVo> list(OaSalaryBo bo, PageQuery pageQuery) {
return iOaSalaryService.queryPageList(bo, pageQuery);
@@ -50,7 +49,6 @@ public class OaSalaryController extends BaseController {
/**
* 查询薪资管理列表
*/
@SaCheckPermission("oa:salary:list")
@GetMapping("/list-worker")
public TableDataInfo<OaSalaryVo> listWorker(OaSalaryBo bo, PageQuery pageQuery) {
return iOaSalaryService.listWorker(bo, pageQuery);
@@ -67,7 +65,6 @@ public class OaSalaryController extends BaseController {
/**
* 导出薪资管理列表
*/
@SaCheckPermission("oa:salary:export")
@Log(title = "薪资管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaSalaryBo bo, HttpServletResponse response) {
@@ -79,7 +76,6 @@ public class OaSalaryController extends BaseController {
* 获取薪资管理详细信息
*
*/
@SaCheckPermission("oa:salary:query")
@GetMapping("/detail")
public R<OaSalaryVo> getInfo(@RequestBody OaSalaryBo bo) {
return R.ok(iOaSalaryService.queryById(bo.getSalaryId(),bo.getPayTime()));
@@ -88,7 +84,6 @@ public class OaSalaryController extends BaseController {
/**
* 新增薪资管理
*/
@SaCheckPermission("oa:salary:add")
@Log(title = "薪资管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -99,7 +94,6 @@ public class OaSalaryController extends BaseController {
/**
* 修改薪资管理
*/
@SaCheckPermission("oa:salary:edit")
@Log(title = "薪资管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -112,7 +106,6 @@ public class OaSalaryController extends BaseController {
*
* @param salaryIds 主键串
*/
@SaCheckPermission("oa:salary:remove")
@Log(title = "薪资管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{salaryIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryItemController.java
View File

@@ -42,7 +42,6 @@ public class OaSalaryItemController extends BaseController {
/**
* 查询薪水详情列表
*/
@SaCheckPermission("oa:salaryItem:list")
@GetMapping("/list")
public TableDataInfo<OaSalaryItemVo> list(OaSalaryItemBo bo, PageQuery pageQuery) {
return iOaSalaryItemService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class OaSalaryItemController extends BaseController {
/**
* 导出薪水详情列表
*/
@SaCheckPermission("oa:salaryItem:export")
@Log(title = "薪水详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaSalaryItemBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaSalaryItemController extends BaseController {
*
* @param salaryItemId 主键
*/
@SaCheckPermission("oa:salaryItem:query")
@GetMapping("/{salaryItemId}")
public R<OaSalaryItemVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long salaryItemId) {
@@ -74,7 +71,6 @@ public class OaSalaryItemController extends BaseController {
/**
* 新增薪水详情
*/
@SaCheckPermission("oa:salaryItem:add")
@Log(title = "薪水详情", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,7 @@ public class OaSalaryItemController extends BaseController {
/**
* 修改薪水详情
*/
@SaCheckPermission("oa:salaryItem:edit")
@Log(title = "薪水详情", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +94,6 @@ public class OaSalaryItemController extends BaseController {
*
* @param salaryItemIds 主键串
*/
@SaCheckPermission("oa:salaryItem:remove")
@Log(title = "薪水详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{salaryItemIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

9
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaCostController.java
View File

@@ -46,7 +46,6 @@ public class SysOaCostController extends BaseController {
/**
* 查询项目成本分析列表
*/
@SaCheckPermission("oa:oaCost:list")
@GetMapping("/list1")
public TableDataInfo<SysOaCostVo> list1(SysOaCostBo bo, PageQuery pageQuery) {
return iSysOaCostService.queryPageList(bo, pageQuery);
@@ -55,7 +54,6 @@ public class SysOaCostController extends BaseController {
/**
* 导出项目成本分析列表
*/
@SaCheckPermission("oa:oaCost:export")
@Log(title = "项目成本分析", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaCostBo bo, HttpServletResponse response) {
@@ -68,7 +66,6 @@ public class SysOaCostController extends BaseController {
*
* @param costId 主键
*/
@SaCheckPermission("oa:oaCost:query")
@GetMapping("/old/{costId}")
public R<SysOaCostVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long costId) {
@@ -78,7 +75,6 @@ public class SysOaCostController extends BaseController {
/**
* 新增项目成本分析
*/
@SaCheckPermission("oa:oaCost:add")
@Log(title = "项目成本分析", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -89,7 +85,6 @@ public class SysOaCostController extends BaseController {
/**
* 修改项目成本分析
*/
@SaCheckPermission("oa:oaCost:edit")
@Log(title = "项目成本分析", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -111,7 +106,6 @@ public class SysOaCostController extends BaseController {
/**
* 查询所有项目成本
*/
@SaCheckPermission("oa:oaCost:list")
@GetMapping("/list")
public TableDataInfo<SysOaCostAllVo> AllList(SysOaCostBo bo,PageQuery pageQuery) {
return iSysOaCostService.calcProjectCostList(bo,pageQuery);
@@ -123,7 +117,6 @@ public class SysOaCostController extends BaseController {
/**
* 查询详情
*/
@SaCheckPermission("oa:oaCost:query")
@GetMapping("/{projectId}")
public R<SysOaCostRow> getDetail(@NotNull(message = "项目id不能为空")
@PathVariable Long projectId) {
@@ -133,7 +126,6 @@ public class SysOaCostController extends BaseController {
/**
* 新增成本
*/
@SaCheckPermission("oa:oaCost:add")
@Log(title = "项目成本分析", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/add")
@@ -146,7 +138,6 @@ public class SysOaCostController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("oa:cost:remove")
@Log(title = "项目成本分析", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFileController.java
View File

@@ -42,7 +42,6 @@ public class SysOaFileController extends BaseController {
/**
* 查询文件存储列表
*/
@SaCheckPermission("system:oaFile:list")
@GetMapping("/list")
public TableDataInfo<SysOaFileVo> list(SysOaFileBo bo, PageQuery pageQuery) {
return iSysOaFileService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class SysOaFileController extends BaseController {
/**
* 导出文件存储列表
*/
@SaCheckPermission("system:oaFile:export")
@Log(title = "文件存储", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaFileBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class SysOaFileController extends BaseController {
*
* @param fileId 主键
*/
@SaCheckPermission("system:oaFile:query")
@GetMapping("/{fileId}")
public R<SysOaFileVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long fileId) {
@@ -74,7 +71,6 @@ public class SysOaFileController extends BaseController {
/**
* 新增文件存储
*/
@SaCheckPermission("system:oaFile:add")
@Log(title = "文件存储", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class SysOaFileController extends BaseController {
/**
* 修改文件存储
*/
@SaCheckPermission("system:oaFile:edit")
@Log(title = "文件存储", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class SysOaFileController extends BaseController {
*
* @param fileIds 主键串
*/
@SaCheckPermission("system:oaFile:remove")
@Log(title = "文件存储", businessType = BusinessType.DELETE)
@DeleteMapping("/{fileIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")