将后端接口的权限都注释了
This commit is contained in:
1 parent
451332d117
commit
aec39f984b
156 files changed
+1538
-1609
No files matched your search
+15
-13
@@ -42,7 +42,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核审核列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<AssessmentApprovalVo> list(AssessmentApprovalQueryBo bo, PageQuery pageQuery) {
|
||||
return assessmentApprovalService.queryPageList(bo, pageQuery);
|
||||
@@ -51,20 +51,21 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取考核审核详情
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:query")
|
||||
@GetMapping("/detail")
|
||||
public R<AssessmentApprovalDetailVo> getApprovalDetail(
|
||||
@RequestParam @NotNull(message = "计划ID不能为空") Long planId,
|
||||
@RequestParam @NotNull(message = "班级ID不能为空") Long classId,
|
||||
@RequestParam @NotNull(message = "被评价用户ID不能为空") Long evaluatedUserId) {
|
||||
AssessmentApprovalDetailVo detail = assessmentApprovalService.getApprovalDetail(planId, classId, evaluatedUserId);
|
||||
AssessmentApprovalDetailVo detail = assessmentApprovalService.getApprovalDetail(planId, classId,
|
||||
evaluatedUserId);
|
||||
return R.ok(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交考核审核
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:approve")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:approve")
|
||||
@Log(title = "班主任考核审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/submit")
|
||||
public R<Void> submitApproval(@RequestBody @Validated AssessmentApprovalSubmitBo bo) {
|
||||
@@ -76,7 +77,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 批量审核通过
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:approve")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:approve")
|
||||
@Log(title = "班主任考核审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/batchApprove")
|
||||
public R<Void> batchApprove(@RequestBody BatchApprovalBo bo) {
|
||||
@@ -88,11 +89,12 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 批量审核拒绝
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:approve")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:approve")
|
||||
@Log(title = "班主任考核审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/batchReject")
|
||||
public R<Void> batchReject(@Validated @RequestBody BatchApprovalBo bo) {
|
||||
boolean result = assessmentApprovalService.batchReject(bo.getIds(), bo.getRejectReason(), LoginHelper.getUserId());
|
||||
boolean result = assessmentApprovalService.batchReject(bo.getIds(), bo.getRejectReason(),
|
||||
LoginHelper.getUserId());
|
||||
return result ? R.ok() : R.fail("批量审核拒绝失败");
|
||||
}
|
||||
|
||||
@@ -100,7 +102,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
* 删除异常的审批记录(管理员专用)
|
||||
* 用于清理审批列表中显示但实际已被删除的异常数据
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:delete")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:delete")
|
||||
@Log(title = "班主任考核审核", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/deleteAbnormalRecord")
|
||||
public R<Void> deleteAbnormalRecord(@RequestParam Long planId, @RequestParam Long evaluatedUserId) {
|
||||
@@ -111,7 +113,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取考核方案下拉选项
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:list")
|
||||
@GetMapping("/schemeOptions")
|
||||
public R<List<SchemeOptionVo>> getSchemeOptions() {
|
||||
List<SchemeOptionVo> options = assessmentApprovalService.getSchemeOptions();
|
||||
@@ -121,7 +123,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 导出班主任考核审核数据
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:export")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:export")
|
||||
@Log(title = "班主任考核审核", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(AssessmentApprovalQueryBo bo, HttpServletResponse response) {
|
||||
@@ -132,7 +134,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取评价等级统计数据
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentApproval:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentApproval:query")
|
||||
@GetMapping("/evaluationStats")
|
||||
public R<EvaluationLevelStatsVo> getEvaluationLevelStats(@RequestParam @NotNull(message = "计划ID不能为空") Long planId) {
|
||||
EvaluationLevelStatsVo stats = assessmentApprovalService.getEvaluationLevelStats(planId);
|
||||
@@ -145,7 +147,7 @@ public class AssessmentApprovalController extends BaseController {
|
||||
public static class BatchRejectBo {
|
||||
@NotEmpty(message = "审核ID列表不能为空")
|
||||
private List<Long> ids;
|
||||
|
||||
|
||||
@NotBlank(message = "拒绝原因不能为空")
|
||||
private String rejectReason;
|
||||
|
||||
@@ -165,4 +167,4 @@ public class AssessmentApprovalController extends BaseController {
|
||||
this.rejectReason = rejectReason;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
-12
@@ -39,7 +39,7 @@ public class BmzrAssessmentIndicatorController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核指标体系列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BmzrAssessmentIndicatorVo> list(BmzrAssessmentIndicatorBo bo, PageQuery pageQuery) {
|
||||
return bmzrAssessmentIndicatorService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class BmzrAssessmentIndicatorController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核指标体系树形结构(用于父级选择)
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:list")
|
||||
@GetMapping("/treeselect")
|
||||
public R<List<BmzrAssessmentIndicatorVo>> treeselect(BmzrAssessmentIndicatorBo bo) {
|
||||
List<BmzrAssessmentIndicatorVo> list = bmzrAssessmentIndicatorService.queryTreeList(bo);
|
||||
@@ -58,7 +58,7 @@ public class BmzrAssessmentIndicatorController extends BaseController {
|
||||
/**
|
||||
* 导出班主任考核指标体系列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:export")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:export")
|
||||
@Log(title = "班主任考核指标体系", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BmzrAssessmentIndicatorBo bo, HttpServletResponse response) {
|
||||
@@ -71,17 +71,16 @@ public class BmzrAssessmentIndicatorController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BmzrAssessmentIndicatorVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
public R<BmzrAssessmentIndicatorVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(bmzrAssessmentIndicatorService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增班主任考核指标体系
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:add")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:add")
|
||||
@Log(title = "班主任考核指标体系", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -92,7 +91,7 @@ public class BmzrAssessmentIndicatorController extends BaseController {
|
||||
/**
|
||||
* 修改班主任考核指标体系
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:edit")
|
||||
@Log(title = "班主任考核指标体系", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -105,11 +104,10 @@ public class BmzrAssessmentIndicatorController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicator:remove")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicator:remove")
|
||||
@Log(title = "班主任考核指标体系", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(bmzrAssessmentIndicatorService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
-12
@@ -39,7 +39,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核指标类型列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BmzrAssessmentIndicatorTypeVo> list(BmzrAssessmentIndicatorTypeBo bo, PageQuery pageQuery) {
|
||||
return bmzrAssessmentIndicatorTypeService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
|
||||
/**
|
||||
* 查询所有班主任考核指标类型列表(包括已逻辑删除的)
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:list")
|
||||
@GetMapping("/listAllIncludeDeleted")
|
||||
public R<List<BmzrAssessmentIndicatorTypeVo>> listAllIncludeDeleted(BmzrAssessmentIndicatorTypeBo bo) {
|
||||
List<BmzrAssessmentIndicatorTypeVo> list = bmzrAssessmentIndicatorTypeService.queryListWithDeleted(bo);
|
||||
@@ -58,7 +58,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
|
||||
/**
|
||||
* 导出班主任考核指标类型列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:export")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:export")
|
||||
@Log(title = "班主任考核指标类型", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BmzrAssessmentIndicatorTypeBo bo, HttpServletResponse response) {
|
||||
@@ -71,17 +71,16 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BmzrAssessmentIndicatorTypeVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
public R<BmzrAssessmentIndicatorTypeVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(bmzrAssessmentIndicatorTypeService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增班主任考核指标类型
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:add")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:add")
|
||||
@Log(title = "班主任考核指标类型", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -92,7 +91,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
|
||||
/**
|
||||
* 修改班主任考核指标类型
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:edit")
|
||||
@Log(title = "班主任考核指标类型", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -105,11 +104,10 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentIndicatorType:remove")
|
||||
// @SaCheckPermission("bzrkh:assessmentIndicatorType:remove")
|
||||
@Log(title = "班主任考核指标类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(bmzrAssessmentIndicatorTypeService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
}
|
||||
+11
-13
@@ -39,7 +39,7 @@ public class BmzrAssessmentPlanController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核计划列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BmzrAssessmentPlanVo> list(BmzrAssessmentPlanBo bo, PageQuery pageQuery) {
|
||||
return bmzrAssessmentPlanService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class BmzrAssessmentPlanController extends BaseController {
|
||||
/**
|
||||
* 导出班主任考核计划列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:export")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:export")
|
||||
@Log(title = "班主任考核计划", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BmzrAssessmentPlanBo bo, HttpServletResponse response) {
|
||||
@@ -59,17 +59,16 @@ public class BmzrAssessmentPlanController extends BaseController {
|
||||
/**
|
||||
* 获取班主任考核计划详细信息
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BmzrAssessmentPlanVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
public R<BmzrAssessmentPlanVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(bmzrAssessmentPlanService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增班主任考核计划
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:add")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:add")
|
||||
@Log(title = "班主任考核计划", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -80,7 +79,7 @@ public class BmzrAssessmentPlanController extends BaseController {
|
||||
/**
|
||||
* 修改班主任考核计划
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:edit")
|
||||
@Log(title = "班主任考核计划", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -91,18 +90,17 @@ public class BmzrAssessmentPlanController extends BaseController {
|
||||
/**
|
||||
* 删除班主任考核计划
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:remove")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:remove")
|
||||
@Log(title = "班主任考核计划", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(bmzrAssessmentPlanService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改考核计划状态
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:edit")
|
||||
@Log(title = "班主任考核计划", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody BmzrAssessmentPlanBo bo) {
|
||||
@@ -112,9 +110,9 @@ public class BmzrAssessmentPlanController extends BaseController {
|
||||
/**
|
||||
* 获取可用的考核方案选项
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentPlan:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentPlan:list")
|
||||
@GetMapping("/schemes/options")
|
||||
public R<List<BmzrAssessmentPlanVo>> getAvailableSchemes() {
|
||||
return R.ok(bmzrAssessmentPlanService.getAvailableSchemes());
|
||||
}
|
||||
}
|
||||
}
|
||||
+7
-7
@@ -41,7 +41,7 @@ public class BmzrAssessmentSchemeController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核方案列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentScheme:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentScheme:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BmzrAssessmentSchemeVo> list(BmzrAssessmentSchemeBo bo, PageQuery pageQuery) {
|
||||
return bmzrAssessmentSchemeService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class BmzrAssessmentSchemeController extends BaseController {
|
||||
/**
|
||||
* 导出班主任考核方案列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentScheme:export")
|
||||
// @SaCheckPermission("bzrkh:assessmentScheme:export")
|
||||
@Log(title = "班主任考核方案", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BmzrAssessmentSchemeBo bo, HttpServletResponse response) {
|
||||
@@ -63,7 +63,7 @@ public class BmzrAssessmentSchemeController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentScheme:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentScheme:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BmzrAssessmentSchemeVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(bmzrAssessmentSchemeService.queryById(id));
|
||||
@@ -72,7 +72,7 @@ public class BmzrAssessmentSchemeController extends BaseController {
|
||||
/**
|
||||
* 新增班主任考核方案
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentScheme:add")
|
||||
// @SaCheckPermission("bzrkh:assessmentScheme:add")
|
||||
@Log(title = "班主任考核方案", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -83,7 +83,7 @@ public class BmzrAssessmentSchemeController extends BaseController {
|
||||
/**
|
||||
* 修改班主任考核方案
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentScheme:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentScheme:edit")
|
||||
@Log(title = "班主任考核方案", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -94,10 +94,10 @@ public class BmzrAssessmentSchemeController extends BaseController {
|
||||
/**
|
||||
* 删除班主任考核方案
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentScheme:remove")
|
||||
// @SaCheckPermission("bzrkh:assessmentScheme:remove")
|
||||
@Log(title = "班主任考核方案", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(bmzrAssessmentSchemeService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
}
|
||||
+14
-15
@@ -39,16 +39,17 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核方案指标关联列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BmzrAssessmentSchemeIndicatorVo> list(BmzrAssessmentSchemeIndicatorBo bo, PageQuery pageQuery) {
|
||||
public TableDataInfo<BmzrAssessmentSchemeIndicatorVo> list(BmzrAssessmentSchemeIndicatorBo bo,
|
||||
PageQuery pageQuery) {
|
||||
return bmzrAssessmentSchemeIndicatorService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据方案ID查询指标关联列表(无分页)
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:list")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list")
|
||||
@GetMapping("/listBySchemeId/{schemeId}")
|
||||
public R<List<BmzrAssessmentSchemeIndicatorVo>> listBySchemeId(@PathVariable Long schemeId) {
|
||||
List<BmzrAssessmentSchemeIndicatorVo> list = bmzrAssessmentSchemeIndicatorService.queryBySchemeId(schemeId);
|
||||
@@ -58,7 +59,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
|
||||
/**
|
||||
* 导出班主任考核方案指标关联列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:export")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:export")
|
||||
@Log(title = "班主任考核方案指标关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BmzrAssessmentSchemeIndicatorBo bo, HttpServletResponse response) {
|
||||
@@ -71,17 +72,16 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:query")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BmzrAssessmentSchemeIndicatorVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
public R<BmzrAssessmentSchemeIndicatorVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(bmzrAssessmentSchemeIndicatorService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增班主任考核方案指标关联
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:add")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:add")
|
||||
@Log(title = "班主任考核方案指标关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -92,7 +92,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
|
||||
/**
|
||||
* 修改班主任考核方案指标关联
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit")
|
||||
@Log(title = "班主任考核方案指标关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -105,11 +105,10 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:remove")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:remove")
|
||||
@Log(title = "班主任考核方案指标关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] ids) {
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
return toAjax(bmzrAssessmentSchemeIndicatorService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
|
||||
@@ -119,12 +118,12 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
|
||||
* @param schemeId 方案ID
|
||||
* @param indicatorList 指标列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit")
|
||||
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:edit")
|
||||
@Log(title = "批量保存方案指标关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchSave/{schemeId}")
|
||||
public R<Void> batchSave(@PathVariable Long schemeId,
|
||||
@RequestBody List<BmzrAssessmentSchemeIndicatorBo> indicatorList) {
|
||||
@RequestBody List<BmzrAssessmentSchemeIndicatorBo> indicatorList) {
|
||||
return toAjax(bmzrAssessmentSchemeIndicatorService.batchSaveSchemeIndicators(schemeId, indicatorList));
|
||||
}
|
||||
}
|
||||
}
|
||||
+16
-13
@@ -42,7 +42,7 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 查询班主任管理的班级列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:list")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:list")
|
||||
@GetMapping("/classes")
|
||||
public R<List<TeacherClassVo>> getTeacherClasses(@RequestParam(required = false) Long teacherId) {
|
||||
// 如果没有传入teacherId,则使用当前登录用户ID
|
||||
@@ -54,9 +54,10 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 查询班主任考核计划列表
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:list")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:list")
|
||||
@GetMapping("/plans")
|
||||
public TableDataInfo<BmzrAssessmentPlanVo> getTeacherAssessmentPlans(TeacherAssessmentQueryBo bo, PageQuery pageQuery) {
|
||||
public TableDataInfo<BmzrAssessmentPlanVo> getTeacherAssessmentPlans(TeacherAssessmentQueryBo bo,
|
||||
PageQuery pageQuery) {
|
||||
// 如果没有传入teacherId,则使用当前登录用户ID
|
||||
if (bo.getTeacherId() == null) {
|
||||
bo.setTeacherId(LoginHelper.getUserId());
|
||||
@@ -67,13 +68,14 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 提交考核
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:submit")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:submit")
|
||||
@Log(title = "班主任考核管理", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/submit")
|
||||
public R<Void> submitAssessment(@RequestBody TeacherAssessmentSubmitRequest request) {
|
||||
try {
|
||||
Long teacherId = LoginHelper.getUserId();
|
||||
boolean result = teacherAssessmentService.submitAssessment(request.getPlanId(), request.getClassId(), teacherId);
|
||||
boolean result = teacherAssessmentService.submitAssessment(request.getPlanId(), request.getClassId(),
|
||||
teacherId);
|
||||
return toAjax(result);
|
||||
} catch (RuntimeException e) {
|
||||
// 返回具体的错误信息
|
||||
@@ -88,19 +90,20 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 撤销考核提交
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:withdraw")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:withdraw")
|
||||
@Log(title = "班主任考核管理", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/withdraw")
|
||||
public R<Void> withdrawAssessment(@RequestBody TeacherAssessmentSubmitRequest request) {
|
||||
Long teacherId = LoginHelper.getUserId();
|
||||
boolean result = teacherAssessmentService.withdrawAssessment(request.getPlanId(), request.getClassId(), teacherId);
|
||||
boolean result = teacherAssessmentService.withdrawAssessment(request.getPlanId(), request.getClassId(),
|
||||
teacherId);
|
||||
return toAjax(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看考核详情
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:detail")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:detail")
|
||||
@GetMapping("/detail")
|
||||
public R<Object> getAssessmentDetail(@RequestParam Long planId, @RequestParam Long classId) {
|
||||
Long teacherId = LoginHelper.getUserId();
|
||||
@@ -111,7 +114,7 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 获取考核提交详情数据
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:detail")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:detail")
|
||||
@GetMapping("/submitDetail")
|
||||
public R<AssessmentDetailVo> getAssessmentSubmitDetail(@RequestParam Long planId, @RequestParam Long classId) {
|
||||
Long teacherId = LoginHelper.getUserId();
|
||||
@@ -122,7 +125,7 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 提交考核评分数据
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:submit")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:submit")
|
||||
@Log(title = "班主任考核管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/submitScore")
|
||||
public R<Void> submitAssessmentScore(@RequestBody AssessmentSubmitBo bo) {
|
||||
@@ -153,7 +156,7 @@ public class TeacherAssessmentController extends BaseController {
|
||||
/**
|
||||
* 查询班级学生违纪记录和奖励记录
|
||||
*/
|
||||
@SaCheckPermission("bzrkh:teacherAssessment:detail")
|
||||
// @SaCheckPermission("bzrkh:teacherAssessment:detail")
|
||||
@GetMapping("/classStudentRecords")
|
||||
public R<ClassStudentRecordsVo> getClassStudentRecords(@RequestParam Long classId, @RequestParam Long planId) {
|
||||
ClassStudentRecordsVo records = teacherAssessmentService.queryClassStudentRecords(classId, planId);
|
||||
@@ -166,7 +169,7 @@ public class TeacherAssessmentController extends BaseController {
|
||||
public static class TeacherAssessmentSubmitRequest {
|
||||
@NotNull(message = "计划ID不能为空")
|
||||
private Long planId;
|
||||
|
||||
|
||||
@NotNull(message = "班级ID不能为空")
|
||||
private Long classId;
|
||||
|
||||
@@ -186,4 +189,4 @@ public class TeacherAssessmentController extends BaseController {
|
||||
this.classId = classId;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+26
-25
@@ -44,7 +44,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:list")
|
||||
//@SaCheckPermission("cw:approval:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwApprovalRecordVo> list(CwApprovalRecordBo bo, PageQuery pageQuery) {
|
||||
return approvalRecordService.queryPageList(bo, pageQuery);
|
||||
@@ -53,7 +53,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 导出审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:export")
|
||||
//@SaCheckPermission("cw:approval:export")
|
||||
@Log(title = "审批记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CwApprovalRecordBo bo, HttpServletResponse response) {
|
||||
@@ -64,7 +64,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 获取审批记录详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:query")
|
||||
//@SaCheckPermission("cw:approval:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwApprovalRecordVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -74,7 +74,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 根据申报ID查询审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:query")
|
||||
//@SaCheckPermission("cw:approval:query")
|
||||
@GetMapping("/byApplication/{applicationId}")
|
||||
public R<List<CwApprovalRecordVo>> getByApplicationId(@PathVariable Long applicationId) {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryByApplicationId(applicationId);
|
||||
@@ -84,7 +84,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询当前用户待审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:list")
|
||||
//@SaCheckPermission("cw:approval:list")
|
||||
@GetMapping("/pending")
|
||||
public R<List<CwApprovalRecordVo>> getPendingList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryPendingByCurrentUser();
|
||||
@@ -94,7 +94,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询当前用户已审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:list")
|
||||
//@SaCheckPermission("cw:approval:list")
|
||||
@GetMapping("/my")
|
||||
public R<List<CwApprovalRecordVo>> getMyApprovedList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryApprovedByCurrentUser();
|
||||
@@ -104,7 +104,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询部门待审批申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:dept")
|
||||
//@SaCheckPermission("cw:approval:dept")
|
||||
@GetMapping("/dept/pending")
|
||||
public R<List<CwApprovalRecordVo>> getDeptPendingList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryDeptPendingApprovals();
|
||||
@@ -114,7 +114,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询财务待审批申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:finance")
|
||||
//@SaCheckPermission("cw:approval:finance")
|
||||
@GetMapping("/finance/pending")
|
||||
public R<List<CwApprovalRecordVo>> getFinancePendingList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryFinancePendingApprovals();
|
||||
@@ -124,7 +124,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询财务已审批申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:finance")
|
||||
//@SaCheckPermission("cw:approval:finance")
|
||||
@GetMapping("/finance/approved")
|
||||
public R<List<CwApprovalRecordVo>> getFinanceApprovedList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryFinanceApprovedRecords();
|
||||
@@ -134,8 +134,9 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询学院领导待审批申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:leader")
|
||||
@GetMapping("/leader/pending")
|
||||
//@SaCheckPermission("cw:approval:leader")
|
||||
@GetMapping("/leader/pending")</xai:function_call name="search_replace">
|
||||
<parameter name="file_path">backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java
|
||||
public R<List<CwApprovalRecordVo>> getLeaderPendingList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryLeaderPendingApprovals();
|
||||
return R.ok(list);
|
||||
@@ -144,7 +145,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询学院领导已审批申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:leader")
|
||||
//@SaCheckPermission("cw:approval:leader")
|
||||
@GetMapping("/leader/approved")
|
||||
public R<List<CwApprovalRecordVo>> getLeaderApprovedList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryLeaderApprovedApprovals();
|
||||
@@ -154,7 +155,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询所有待审批申报列表(超级管理员专用)
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:list")
|
||||
//@SaCheckPermission("cw:approval:list")
|
||||
@GetMapping("/all/pending")
|
||||
public R<List<CwApprovalRecordVo>> getAllPendingList() {
|
||||
List<CwApprovalRecordVo> list = approvalRecordService.queryAllPendingApprovals();
|
||||
@@ -164,7 +165,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 新增审批记录
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:add")
|
||||
//@SaCheckPermission("cw:approval:add")
|
||||
@Log(title = "审批记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -175,7 +176,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 修改审批记录
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:edit")
|
||||
//@SaCheckPermission("cw:approval:edit")
|
||||
@Log(title = "审批记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -186,7 +187,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 删除审批记录
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:remove")
|
||||
//@SaCheckPermission("cw:approval:remove")
|
||||
@Log(title = "审批记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -197,7 +198,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 创建审批流程
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:create")
|
||||
//@SaCheckPermission("cw:approval:create")
|
||||
@Log(title = "创建审批流程", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/create/{applicationId}")
|
||||
public R<Void> createProcess(@PathVariable Long applicationId, @RequestParam String applicationNo) {
|
||||
@@ -215,7 +216,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 审批操作
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:process")
|
||||
//@SaCheckPermission("cw:approval:process")
|
||||
@Log(title = "审批操作", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/process")
|
||||
@@ -229,7 +230,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 部门审批
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:dept")
|
||||
//@SaCheckPermission("cw:approval:dept")
|
||||
@Log(title = "部门审批", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/dept")
|
||||
@@ -242,7 +243,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 查询当前审批节点
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:query")
|
||||
//@SaCheckPermission("cw:approval:query")
|
||||
@GetMapping("/current/{applicationId}")
|
||||
public R<CwApprovalRecordVo> getCurrentNode(@PathVariable Long applicationId) {
|
||||
CwApprovalRecordVo record = approvalRecordService.queryCurrentApprovalNode(applicationId);
|
||||
@@ -252,7 +253,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 检查审批权限
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:check")
|
||||
//@SaCheckPermission("cw:approval:check")
|
||||
@GetMapping("/check/{applicationId}")
|
||||
public R<Boolean> checkPermission(@PathVariable Long applicationId, @RequestParam String nodeCode) {
|
||||
Boolean hasPermission = approvalRecordService.checkApprovalPermission(applicationId, nodeCode);
|
||||
@@ -262,7 +263,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 检查部门审批权限
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:dept")
|
||||
//@SaCheckPermission("cw:approval:dept")
|
||||
@GetMapping("/check/dept/{applicationId}")
|
||||
public R<Boolean> checkDeptPermission(@PathVariable Long applicationId) {
|
||||
Boolean hasPermission = approvalRecordService.checkDeptApprovalPermission(applicationId);
|
||||
@@ -272,7 +273,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 获取可选审批人列表(院领导)
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:finance")
|
||||
//@SaCheckPermission("cw:approval:finance")
|
||||
@GetMapping("/approvers/{applicationId}")
|
||||
public R<List<Map<String, Object>>> getAvailableApprovers(@PathVariable Long applicationId) {
|
||||
List<Map<String, Object>> approvers = approvalRecordService.getAvailableApprovers(applicationId);
|
||||
@@ -282,7 +283,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 分管领导审批
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:leader")
|
||||
//@SaCheckPermission("cw:approval:leader")
|
||||
@PostMapping("/leader")
|
||||
public R<Void> leaderApproval(@RequestParam Long applicationId,
|
||||
@RequestParam String approveAction,
|
||||
@@ -307,7 +308,7 @@ public class CwApprovalRecordController extends BaseController {
|
||||
/**
|
||||
* 财务审批
|
||||
*/
|
||||
@SaCheckPermission("cw:approval:finance")
|
||||
//@SaCheckPermission("cw:approval:finance")
|
||||
@PostMapping("/finance")
|
||||
public R<Void> financeApproval(@RequestParam Long applicationId,
|
||||
@RequestParam String approveAction,
|
||||
|
||||
+4
-4
@@ -30,7 +30,7 @@ public class CwBudgetExecutionImportController extends BaseController {
|
||||
* @param file 导入文件
|
||||
*/
|
||||
@Log(title = "预算执行导入", businessType = BusinessType.IMPORT)
|
||||
@SaCheckPermission("cw:budgetExecutionImport:import")
|
||||
//@SaCheckPermission("cw:budgetExecutionImport:import")
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
|
||||
try (InputStream is = file.getInputStream()) {
|
||||
@@ -45,7 +45,7 @@ public class CwBudgetExecutionImportController extends BaseController {
|
||||
/**
|
||||
* 获取导入模板(导出空模板)
|
||||
*/
|
||||
@SaCheckPermission("cw:budgetExecutionImport:import")
|
||||
//@SaCheckPermission("cw:budgetExecutionImport:import")
|
||||
@PostMapping("/importTemplate")
|
||||
public void importTemplate(HttpServletResponse response) {
|
||||
ExcelUtil.exportExcel(java.util.List.of(), "预算执行导入模板", CwBudgetExecutionImportVo.class, response);
|
||||
@@ -54,7 +54,7 @@ public class CwBudgetExecutionImportController extends BaseController {
|
||||
/**
|
||||
* 查询导入批次分页列表
|
||||
*/
|
||||
@SaCheckPermission("cw:budgetExecutionImport:list")
|
||||
//@SaCheckPermission("cw:budgetExecutionImport:list")
|
||||
@GetMapping("/batch/list")
|
||||
public org.dromara.common.mybatis.core.page.TableDataInfo<?> batchList(org.dromara.common.mybatis.core.page.PageQuery pageQuery) {
|
||||
var service = org.dromara.common.core.utils.SpringUtils.getBean(org.dromara.cw.service.ICwBudgetExecutionImportService.class);
|
||||
@@ -64,7 +64,7 @@ public class CwBudgetExecutionImportController extends BaseController {
|
||||
/**
|
||||
* 查询导入明细分页列表
|
||||
*/
|
||||
@SaCheckPermission("cw:budgetExecutionImport:list")
|
||||
//@SaCheckPermission("cw:budgetExecutionImport:list")
|
||||
@GetMapping("/item/list")
|
||||
public org.dromara.common.mybatis.core.page.TableDataInfo<?> itemList(@RequestParam("batchId") Long batchId, org.dromara.common.mybatis.core.page.PageQuery pageQuery) {
|
||||
var service = org.dromara.common.core.utils.SpringUtils.getBean(org.dromara.cw.service.ICwBudgetExecutionImportService.class);
|
||||
|
||||
+6
-6
@@ -40,7 +40,7 @@ public class CwMonitoringManagementController extends BaseController {
|
||||
* 查询绩效自评列表(运行监控管理)
|
||||
* 财务管理员和学校领导可以看到所有人的数据
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoringManagement:list")
|
||||
//@SaCheckPermission("cw:monitoringManagement:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectPerformanceSelfEvaluationVo> list(CwProjectPerformanceSelfEvaluationBo bo, PageQuery pageQuery) {
|
||||
return monitoringManagementService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +49,7 @@ public class CwMonitoringManagementController extends BaseController {
|
||||
/**
|
||||
* 获取绩效自评详细信息(运行监控管理)
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoringManagement:query")
|
||||
//@SaCheckPermission("cw:monitoringManagement:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectPerformanceSelfEvaluationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(monitoringManagementService.queryById(id));
|
||||
@@ -58,7 +58,7 @@ public class CwMonitoringManagementController extends BaseController {
|
||||
/**
|
||||
* 锁定绩效自评(单个)
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoringManagement:lock")
|
||||
//@SaCheckPermission("cw:monitoringManagement:lock")
|
||||
@Log(title = "运行监控管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/lock/{id}")
|
||||
@@ -69,7 +69,7 @@ public class CwMonitoringManagementController extends BaseController {
|
||||
/**
|
||||
* 解锁绩效自评(单个)
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoringManagement:unlock")
|
||||
//@SaCheckPermission("cw:monitoringManagement:unlock")
|
||||
@Log(title = "运行监控管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/unlock/{id}")
|
||||
@@ -80,7 +80,7 @@ public class CwMonitoringManagementController extends BaseController {
|
||||
/**
|
||||
* 批量锁定绩效自评
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoringManagement:lock")
|
||||
//@SaCheckPermission("cw:monitoringManagement:lock")
|
||||
@Log(title = "运行监控管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/lock/batch")
|
||||
@@ -91,7 +91,7 @@ public class CwMonitoringManagementController extends BaseController {
|
||||
/**
|
||||
* 批量解锁绩效自评
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoringManagement:unlock")
|
||||
//@SaCheckPermission("cw:monitoringManagement:unlock")
|
||||
@Log(title = "运行监控管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/unlock/batch")
|
||||
|
||||
+5
-5
@@ -35,7 +35,7 @@ public class CwPerformanceMonitoringController extends BaseController {
|
||||
/**
|
||||
* 根据自评ID查询运行监控列表
|
||||
*/
|
||||
@SaCheckPermission("cw:performanceMonitoring:query")
|
||||
//@SaCheckPermission("cw:performanceMonitoring:query")
|
||||
@GetMapping("/list/{evaluationId}")
|
||||
public R<List<CwPerformanceMonitoringVo>> listByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) {
|
||||
return R.ok(performanceMonitoringService.queryByEvaluationId(evaluationId));
|
||||
@@ -44,7 +44,7 @@ public class CwPerformanceMonitoringController extends BaseController {
|
||||
/**
|
||||
* 获取绩效运行监控详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:performanceMonitoring:query")
|
||||
//@SaCheckPermission("cw:performanceMonitoring:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwPerformanceMonitoringVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(performanceMonitoringService.queryById(id));
|
||||
@@ -53,7 +53,7 @@ public class CwPerformanceMonitoringController extends BaseController {
|
||||
/**
|
||||
* 新增绩效运行监控
|
||||
*/
|
||||
@SaCheckPermission("cw:performanceMonitoring:add")
|
||||
//@SaCheckPermission("cw:performanceMonitoring:add")
|
||||
@Log(title = "绩效运行监控", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -64,7 +64,7 @@ public class CwPerformanceMonitoringController extends BaseController {
|
||||
/**
|
||||
* 修改绩效运行监控
|
||||
*/
|
||||
@SaCheckPermission("cw:performanceMonitoring:edit")
|
||||
//@SaCheckPermission("cw:performanceMonitoring:edit")
|
||||
@Log(title = "绩效运行监控", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -75,7 +75,7 @@ public class CwPerformanceMonitoringController extends BaseController {
|
||||
/**
|
||||
* 删除绩效运行监控
|
||||
*/
|
||||
@SaCheckPermission("cw:performanceMonitoring:remove")
|
||||
//@SaCheckPermission("cw:performanceMonitoring:remove")
|
||||
@Log(title = "绩效运行监控", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{id}")
|
||||
public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
|
||||
+20
-20
@@ -43,7 +43,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询项目预算申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:application:list")
|
||||
//@SaCheckPermission("cw:application:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectApplicationVo> list(CwProjectApplicationBo bo, PageQuery pageQuery) {
|
||||
return projectApplicationService.queryPageList(bo, pageQuery);
|
||||
@@ -52,7 +52,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询我的申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:application:list")
|
||||
//@SaCheckPermission("cw:application:list")
|
||||
@GetMapping("/myList")
|
||||
public R<List<CwProjectApplicationVo>> myList(@RequestParam(required = false) Integer year) {
|
||||
Long applicantId = LoginHelper.getUserId();
|
||||
@@ -63,7 +63,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询部门申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:application:list")
|
||||
//@SaCheckPermission("cw:application:list")
|
||||
@GetMapping("/deptList")
|
||||
public R<List<CwProjectApplicationVo>> deptList(@RequestParam Long departmentId, @RequestParam(required = false) Integer year) {
|
||||
List<CwProjectApplicationVo> list = projectApplicationService.queryDeptApplications(departmentId, year);
|
||||
@@ -73,7 +73,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询待我审批的申报列表
|
||||
*/
|
||||
@SaCheckPermission("cw:approvalRecord:list")
|
||||
//@SaCheckPermission("cw:approvalRecord:list")
|
||||
@GetMapping("/pendingList")
|
||||
public R<List<CwProjectApplicationVo>> pendingList() {
|
||||
Long approverId = LoginHelper.getUserId();
|
||||
@@ -84,7 +84,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 导出项目申报信息
|
||||
*/
|
||||
@SaCheckPermission("cw:application:export")
|
||||
//@SaCheckPermission("cw:application:export")
|
||||
@Log(title = "项目申报", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CwProjectApplicationBo bo, HttpServletResponse response) {
|
||||
@@ -95,7 +95,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 项目预算统计 - 获取项目清单
|
||||
*/
|
||||
@SaCheckPermission("cw:statistics:list")
|
||||
//@SaCheckPermission("cw:statistics:list")
|
||||
@GetMapping("/statistics/list")
|
||||
public TableDataInfo<CwProjectApplicationVo> getStatisticsList(CwProjectApplicationBo bo, PageQuery pageQuery) {
|
||||
log.info("🚀 [统计页面-项目清单] Controller接收到统计查询请求");
|
||||
@@ -113,7 +113,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 项目预算统计 - 状态统计
|
||||
*/
|
||||
@SaCheckPermission("cw:statistics:list")
|
||||
//@SaCheckPermission("cw:statistics:list")
|
||||
@GetMapping("/statistics/status")
|
||||
public R<Map<String, Object>> getStatusStatistics(@RequestParam(required = false) String budgetYear) {
|
||||
Map<String, Object> statistics = projectApplicationService.getStatusStatistics(budgetYear);
|
||||
@@ -123,7 +123,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 项目预算统计 - 部门预算汇总
|
||||
*/
|
||||
@SaCheckPermission("cw:statistics:list")
|
||||
//@SaCheckPermission("cw:statistics:list")
|
||||
@GetMapping("/statistics/department")
|
||||
public R<List<Map<String, Object>>> getDepartmentStatistics(@RequestParam(required = false) String budgetYear) {
|
||||
List<Map<String, Object>> statistics = projectApplicationService.getDepartmentStatistics(budgetYear);
|
||||
@@ -133,7 +133,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 项目预算统计 - 年度汇总
|
||||
*/
|
||||
@SaCheckPermission("cw:statistics:list")
|
||||
//@SaCheckPermission("cw:statistics:list")
|
||||
@GetMapping("/statistics/yearly")
|
||||
public R<List<Map<String, Object>>> getYearlyStatistics() {
|
||||
List<Map<String, Object>> statistics = projectApplicationService.getYearlyStatistics();
|
||||
@@ -143,7 +143,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取项目预算申报详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:application:query")
|
||||
//@SaCheckPermission("cw:application:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectApplicationVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -153,7 +153,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 根据申报编号获取详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:application:query")
|
||||
//@SaCheckPermission("cw:application:query")
|
||||
@GetMapping("/byNo/{applicationNo}")
|
||||
public R<CwProjectApplicationVo> getInfoByNo(@PathVariable String applicationNo) {
|
||||
return R.ok(projectApplicationService.queryByApplicationNo(applicationNo));
|
||||
@@ -162,7 +162,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 新增项目预算申报
|
||||
*/
|
||||
@SaCheckPermission("cw:application:add")
|
||||
//@SaCheckPermission("cw:application:add")
|
||||
@Log(title = "项目预算申报", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -180,7 +180,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 修改项目预算申报
|
||||
*/
|
||||
@SaCheckPermission("cw:application:edit")
|
||||
//@SaCheckPermission("cw:application:edit")
|
||||
@Log(title = "项目预算申报", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -191,7 +191,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 保存草稿
|
||||
*/
|
||||
@SaCheckPermission("cw:application:add")
|
||||
//@SaCheckPermission("cw:application:add")
|
||||
@Log(title = "保存申报草稿", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/saveDraft")
|
||||
@@ -213,7 +213,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 提交申报
|
||||
*/
|
||||
@SaCheckPermission("cw:application:submit")
|
||||
//@SaCheckPermission("cw:application:submit")
|
||||
@Log(title = "提交项目预算申报", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/submit/{id}")
|
||||
@@ -224,7 +224,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 撤回申报
|
||||
*/
|
||||
@SaCheckPermission("cw:application:edit")
|
||||
//@SaCheckPermission("cw:application:edit")
|
||||
@Log(title = "撤回项目预算申报", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/withdraw/{id}")
|
||||
public R<Void> withdraw(@PathVariable Long id) {
|
||||
@@ -234,7 +234,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 取消申报
|
||||
*/
|
||||
@SaCheckPermission("cw:application:remove")
|
||||
//@SaCheckPermission("cw:application:remove")
|
||||
@Log(title = "取消项目预算申报", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/cancel/{id}")
|
||||
public R<Void> cancel(@PathVariable Long id) {
|
||||
@@ -244,7 +244,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 删除项目预算申报
|
||||
*/
|
||||
@SaCheckPermission("cw:application:remove")
|
||||
//@SaCheckPermission("cw:application:remove")
|
||||
@Log(title = "项目预算申报", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -255,7 +255,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 生成申报编号
|
||||
*/
|
||||
@SaCheckPermission("cw:application:add")
|
||||
//@SaCheckPermission("cw:application:add")
|
||||
@GetMapping("/generateNo")
|
||||
public R<String> generateApplicationNo() {
|
||||
return R.ok(projectApplicationService.generateApplicationNo());
|
||||
@@ -264,7 +264,7 @@ public class CwProjectApplicationController extends BaseController {
|
||||
/**
|
||||
* 统计数据
|
||||
*/
|
||||
@SaCheckPermission("cw:application:list")
|
||||
//@SaCheckPermission("cw:application:list")
|
||||
@GetMapping("/statistics")
|
||||
public R<java.util.Map<String, Object>> statistics(@RequestParam(required = false) Integer year) {
|
||||
java.util.Map<String, Object> result = new java.util.HashMap<>();
|
||||
|
||||
+10
-10
@@ -38,7 +38,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 启动自定义审批流程
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:start")
|
||||
//@SaCheckPermission("cw:projectApproval:start")
|
||||
@Log(title = "启动审批流程", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/start")
|
||||
@@ -52,7 +52,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 执行审批操作
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:approve")
|
||||
//@SaCheckPermission("cw:projectApproval:approve")
|
||||
@Log(title = "执行审批操作", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/approve")
|
||||
@@ -63,7 +63,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取我的待审批列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@GetMapping("/pending")
|
||||
public TableDataInfo<CwApprovalRecordVo> getMyPendingApprovals(PageQuery pageQuery) {
|
||||
return projectApprovalService.getMyPendingApprovals(pageQuery);
|
||||
@@ -72,7 +72,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取我的已审批列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@GetMapping("/processed")
|
||||
public TableDataInfo<CwApprovalRecordVo> getMyProcessedApprovals(PageQuery pageQuery) {
|
||||
return projectApprovalService.getMyProcessedApprovals(pageQuery);
|
||||
@@ -81,7 +81,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 查询审批流程列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectApprovalProcessVo> list(PageQuery pageQuery) {
|
||||
return projectApprovalService.queryProcessList(pageQuery);
|
||||
@@ -90,7 +90,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取审批流程详情
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectApprovalProcessVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -100,7 +100,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@GetMapping("/records/{applicationId}")
|
||||
public R<List<CwApprovalRecordVo>> getApprovalRecords(@PathVariable Long applicationId) {
|
||||
return R.ok(projectApprovalService.getApprovalRecords(applicationId));
|
||||
@@ -109,7 +109,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 终止审批流程
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:terminate")
|
||||
//@SaCheckPermission("cw:projectApproval:terminate")
|
||||
@Log(title = "终止审批流程", businessType = BusinessType.UPDATE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> terminate(@NotEmpty(message = "主键不能为空")
|
||||
@@ -120,7 +120,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 审批流程验证
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@PostMapping("/validate")
|
||||
public R<String> validateApprovalProcess(@RequestBody CwCustomApprovalBo bo) {
|
||||
// 简单验证逻辑
|
||||
@@ -136,7 +136,7 @@ public class CwProjectApprovalController extends BaseController {
|
||||
/**
|
||||
* 审批选项查询(用于下拉选择)
|
||||
*/
|
||||
@SaCheckPermission("cw:projectApproval:query")
|
||||
//@SaCheckPermission("cw:projectApproval:query")
|
||||
@GetMapping("/options")
|
||||
public R<Object> getApprovalOptions() {
|
||||
// 返回一些选项数据,比如审批动作选项等
|
||||
|
||||
+15
-15
@@ -40,7 +40,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 查询项目审核人配置列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:list")
|
||||
//@SaCheckPermission("cw:projectAuditor:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectAuditorVo> list(CwProjectAuditorBo bo, PageQuery pageQuery) {
|
||||
return cwProjectAuditorService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +49,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 导出项目审核人配置列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:export")
|
||||
//@SaCheckPermission("cw:projectAuditor:export")
|
||||
@Log(title = "项目审核人配置", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CwProjectAuditorBo bo, HttpServletResponse response) {
|
||||
@@ -60,7 +60,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 获取项目审核人配置详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:query")
|
||||
//@SaCheckPermission("cw:projectAuditor:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectAuditorVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -70,7 +70,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 新增项目审核人配置
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:add")
|
||||
//@SaCheckPermission("cw:projectAuditor:add")
|
||||
@Log(title = "项目审核人配置", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -84,7 +84,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 修改项目审核人配置
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:edit")
|
||||
//@SaCheckPermission("cw:projectAuditor:edit")
|
||||
@Log(title = "项目审核人配置", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 删除项目审核人配置
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:remove")
|
||||
//@SaCheckPermission("cw:projectAuditor:remove")
|
||||
@Log(title = "项目审核人配置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -106,7 +106,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量添加审核人
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:add")
|
||||
//@SaCheckPermission("cw:projectAuditor:add")
|
||||
@Log(title = "批量添加审核人", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchAdd")
|
||||
@@ -122,7 +122,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 获取可用审核人列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:list")
|
||||
//@SaCheckPermission("cw:projectAuditor:list")
|
||||
@GetMapping("/available")
|
||||
public R<List<CwProjectAuditorVo>> getAvailableAuditors() {
|
||||
return R.ok(cwProjectAuditorService.getAvailableAuditors());
|
||||
@@ -131,7 +131,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 根据部门ID获取用户列表
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:list")
|
||||
//@SaCheckPermission("cw:projectAuditor:list")
|
||||
@GetMapping("/deptUsers/{deptId}")
|
||||
public R<List<Object>> getDeptUsers(@PathVariable Long deptId) {
|
||||
// 参数验证
|
||||
@@ -144,7 +144,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量更新状态
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:edit")
|
||||
//@SaCheckPermission("cw:projectAuditor:edit")
|
||||
@Log(title = "批量更新审核人状态", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/status")
|
||||
@@ -155,7 +155,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 我配置的审核人
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:list")
|
||||
//@SaCheckPermission("cw:projectAuditor:list")
|
||||
@GetMapping("/myConfig")
|
||||
public TableDataInfo<CwProjectAuditorVo> getMyConfig(CwProjectAuditorBo bo, PageQuery pageQuery) {
|
||||
bo.setConfigBy(LoginHelper.getUserId());
|
||||
@@ -165,7 +165,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 获取审核人选项(用于下拉选择)
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:list")
|
||||
//@SaCheckPermission("cw:projectAuditor:list")
|
||||
@GetMapping("/options")
|
||||
public R<List<CwProjectAuditorVo>> getAuditorOptions() {
|
||||
return R.ok(cwProjectAuditorService.getAvailableAuditors());
|
||||
@@ -174,7 +174,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量启用
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:edit")
|
||||
//@SaCheckPermission("cw:projectAuditor:edit")
|
||||
@Log(title = "批量启用审核人", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/enable/{ids}")
|
||||
public R<Void> enable(@PathVariable Long[] ids) {
|
||||
@@ -184,7 +184,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量停用
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:edit")
|
||||
//@SaCheckPermission("cw:projectAuditor:edit")
|
||||
@Log(title = "批量停用审核人", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/disable/{ids}")
|
||||
public R<Void> disable(@PathVariable Long[] ids) {
|
||||
@@ -194,7 +194,7 @@ public class CwProjectAuditorController extends BaseController {
|
||||
/**
|
||||
* 获取审核人统计数据
|
||||
*/
|
||||
@SaCheckPermission("cw:projectAuditor:list")
|
||||
//@SaCheckPermission("cw:projectAuditor:list")
|
||||
@GetMapping("/statistics")
|
||||
public R<Object> getStatistics() {
|
||||
return R.ok(cwProjectAuditorService.getStatistics());
|
||||
|
||||
+9
-9
@@ -40,7 +40,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 查询项目绩效自评指标明细列表
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:list")
|
||||
//@SaCheckPermission("cw:indicator:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectEvaluationIndicatorVo> list(CwProjectEvaluationIndicatorBo bo, PageQuery pageQuery) {
|
||||
return indicatorService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +49,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 获取项目绩效自评指标明细详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:query")
|
||||
//@SaCheckPermission("cw:indicator:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectEvaluationIndicatorVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(indicatorService.queryById(id));
|
||||
@@ -58,7 +58,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 根据自评ID查询指标明细列表
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:query")
|
||||
//@SaCheckPermission("cw:indicator:query")
|
||||
@GetMapping("/evaluation/{evaluationId}")
|
||||
public R<List<CwProjectEvaluationIndicatorVo>> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) {
|
||||
return R.ok(indicatorService.queryByEvaluationId(evaluationId));
|
||||
@@ -67,7 +67,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 根据自评ID和指标类型查询指标明细列表
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:query")
|
||||
//@SaCheckPermission("cw:indicator:query")
|
||||
@GetMapping("/evaluation/{evaluationId}/type/{indicatorType}")
|
||||
public R<List<CwProjectEvaluationIndicatorVo>> getByEvaluationIdAndType(
|
||||
@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId,
|
||||
@@ -78,7 +78,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 新增项目绩效自评指标明细
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:add")
|
||||
//@SaCheckPermission("cw:indicator:add")
|
||||
@Log(title = "项目绩效自评指标明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -89,7 +89,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 修改项目绩效自评指标明细
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:edit")
|
||||
//@SaCheckPermission("cw:indicator:edit")
|
||||
@Log(title = "项目绩效自评指标明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -100,7 +100,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 批量保存指标明细
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:edit")
|
||||
//@SaCheckPermission("cw:indicator:edit")
|
||||
@Log(title = "批量保存指标明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batch")
|
||||
@@ -111,7 +111,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 删除项目绩效自评指标明细
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:remove")
|
||||
//@SaCheckPermission("cw:indicator:remove")
|
||||
@Log(title = "项目绩效自评指标明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -121,7 +121,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
|
||||
/**
|
||||
* 导出项目绩效自评指标明细列表
|
||||
*/
|
||||
@SaCheckPermission("cw:indicator:export")
|
||||
//@SaCheckPermission("cw:indicator:export")
|
||||
@Log(title = "项目绩效自评指标明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CwProjectEvaluationIndicatorBo bo, HttpServletResponse response) {
|
||||
|
||||
+10
-10
@@ -41,7 +41,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 查询项目月度运行监控列表
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:list")
|
||||
//@SaCheckPermission("cw:monitoring:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectMonthlyMonitoringVo> list(CwProjectMonthlyMonitoringBo bo, PageQuery pageQuery) {
|
||||
return monitoringService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 获取项目月度运行监控详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:query")
|
||||
//@SaCheckPermission("cw:monitoring:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectMonthlyMonitoringVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(monitoringService.queryById(id));
|
||||
@@ -59,7 +59,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 根据自评ID查询月度监控列表
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:query")
|
||||
//@SaCheckPermission("cw:monitoring:query")
|
||||
@GetMapping("/evaluation/{evaluationId}")
|
||||
public R<List<CwProjectMonthlyMonitoringVo>> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) {
|
||||
return R.ok(monitoringService.queryByEvaluationId(evaluationId));
|
||||
@@ -68,7 +68,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 查询某个自评的全年监控数据
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:query")
|
||||
//@SaCheckPermission("cw:monitoring:query")
|
||||
@GetMapping("/year/{evaluationId}/{year}")
|
||||
public R<Map<Integer, CwProjectMonthlyMonitoringVo>> getYearlyMonitoring(
|
||||
@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId,
|
||||
@@ -79,7 +79,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 新增项目月度运行监控
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:add")
|
||||
//@SaCheckPermission("cw:monitoring:add")
|
||||
@Log(title = "项目月度运行监控", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -90,7 +90,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 修改项目月度运行监控
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:edit")
|
||||
//@SaCheckPermission("cw:monitoring:edit")
|
||||
@Log(title = "项目月度运行监控", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -101,7 +101,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 填报月度数据
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:fill")
|
||||
//@SaCheckPermission("cw:monitoring:fill")
|
||||
@Log(title = "填报月度数据", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/fill")
|
||||
@@ -112,7 +112,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 批量保存月度监控数据
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:edit")
|
||||
//@SaCheckPermission("cw:monitoring:edit")
|
||||
@Log(title = "批量保存月度监控数据", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batch")
|
||||
@@ -123,7 +123,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 删除项目月度运行监控
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:remove")
|
||||
//@SaCheckPermission("cw:monitoring:remove")
|
||||
@Log(title = "项目月度运行监控", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -133,7 +133,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
|
||||
/**
|
||||
* 导出项目月度运行监控列表
|
||||
*/
|
||||
@SaCheckPermission("cw:monitoring:export")
|
||||
//@SaCheckPermission("cw:monitoring:export")
|
||||
@Log(title = "项目月度运行监控", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CwProjectMonthlyMonitoringBo bo, HttpServletResponse response) {
|
||||
|
||||
+11
-11
@@ -43,7 +43,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 查询项目绩效自评列表
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:list")
|
||||
//@SaCheckPermission("cw:evaluation:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CwProjectPerformanceSelfEvaluationVo> list(CwProjectPerformanceSelfEvaluationBo bo, PageQuery pageQuery) {
|
||||
return evaluationService.queryPageList(bo, pageQuery);
|
||||
@@ -52,7 +52,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 获取项目绩效自评详细信息
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:query")
|
||||
//@SaCheckPermission("cw:evaluation:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<CwProjectPerformanceSelfEvaluationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(evaluationService.queryById(id));
|
||||
@@ -61,7 +61,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 新增项目绩效自评
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:add")
|
||||
//@SaCheckPermission("cw:evaluation:add")
|
||||
@Log(title = "项目绩效自评", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -76,7 +76,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 修改项目绩效自评
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:edit")
|
||||
//@SaCheckPermission("cw:evaluation:edit")
|
||||
@Log(title = "项目绩效自评", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -87,7 +87,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 保存草稿
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:add")
|
||||
//@SaCheckPermission("cw:evaluation:add")
|
||||
@Log(title = "保存自评草稿", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/saveDraft")
|
||||
@@ -98,7 +98,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 提交自评
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:submit")
|
||||
//@SaCheckPermission("cw:evaluation:submit")
|
||||
@Log(title = "提交自评", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/submit/{id}")
|
||||
@@ -109,7 +109,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 审核自评
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:approve")
|
||||
//@SaCheckPermission("cw:evaluation:approve")
|
||||
@Log(title = "审核自评", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/approve/{id}")
|
||||
@@ -122,7 +122,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 删除项目绩效自评
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:remove")
|
||||
//@SaCheckPermission("cw:evaluation:remove")
|
||||
@Log(title = "项目绩效自评", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -132,7 +132,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 查询我的自评列表
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:list")
|
||||
//@SaCheckPermission("cw:evaluation:list")
|
||||
@GetMapping("/my")
|
||||
public R<List<CwProjectPerformanceSelfEvaluationVo>> myEvaluations() {
|
||||
return R.ok(evaluationService.queryMyEvaluations(LoginHelper.getUserId()));
|
||||
@@ -141,7 +141,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 查询待审核自评列表
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:approve")
|
||||
//@SaCheckPermission("cw:evaluation:approve")
|
||||
@GetMapping("/pending")
|
||||
public R<List<CwProjectPerformanceSelfEvaluationVo>> pendingApprovals() {
|
||||
return R.ok(evaluationService.queryPendingApprovals());
|
||||
@@ -150,7 +150,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
|
||||
/**
|
||||
* 导出项目绩效自评列表
|
||||
*/
|
||||
@SaCheckPermission("cw:evaluation:export")
|
||||
//@SaCheckPermission("cw:evaluation:export")
|
||||
@Log(title = "项目绩效自评", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CwProjectPerformanceSelfEvaluationBo bo, HttpServletResponse response) {
|
||||
|
||||
+8
-8
@@ -50,7 +50,7 @@ public class TestDemoController extends BaseController {
|
||||
/**
|
||||
* 查询测试单表列表
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:list")
|
||||
// @SaCheckPermission("demo:demo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
|
||||
return testDemoService.queryPageList(bo, pageQuery);
|
||||
@@ -59,7 +59,7 @@ public class TestDemoController extends BaseController {
|
||||
/**
|
||||
* 自定义分页查询
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:list")
|
||||
// @SaCheckPermission("demo:demo:list")
|
||||
@GetMapping("/page")
|
||||
public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
|
||||
return testDemoService.customPageList(bo, pageQuery);
|
||||
@@ -71,7 +71,7 @@ public class TestDemoController extends BaseController {
|
||||
* @param file 导入文件
|
||||
*/
|
||||
@Log(title = "测试单表", businessType = BusinessType.IMPORT)
|
||||
@SaCheckPermission("demo:demo:import")
|
||||
// @SaCheckPermission("demo:demo:import")
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
|
||||
ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
|
||||
@@ -83,7 +83,7 @@ public class TestDemoController extends BaseController {
|
||||
/**
|
||||
* 导出测试单表列表
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:export")
|
||||
// @SaCheckPermission("demo:demo:export")
|
||||
@Log(title = "测试单表", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(@Validated TestDemoBo bo, HttpServletResponse response) {
|
||||
@@ -100,7 +100,7 @@ public class TestDemoController extends BaseController {
|
||||
*
|
||||
* @param id 测试ID
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:query")
|
||||
// @SaCheckPermission("demo:demo:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<TestDemoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
@@ -110,7 +110,7 @@ public class TestDemoController extends BaseController {
|
||||
/**
|
||||
* 新增测试单表
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:add")
|
||||
// @SaCheckPermission("demo:demo:add")
|
||||
@Log(title = "测试单表", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}")
|
||||
@PostMapping()
|
||||
@@ -124,7 +124,7 @@ public class TestDemoController extends BaseController {
|
||||
/**
|
||||
* 修改测试单表
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:edit")
|
||||
// @SaCheckPermission("demo:demo:edit")
|
||||
@Log(title = "测试单表", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit
|
||||
@PutMapping()
|
||||
@@ -137,7 +137,7 @@ public class TestDemoController extends BaseController {
|
||||
*
|
||||
* @param ids 测试ID串
|
||||
*/
|
||||
@SaCheckPermission("demo:demo:remove")
|
||||
// @SaCheckPermission("demo:demo:remove")
|
||||
@Log(title = "测试单表", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+6
-6
@@ -40,7 +40,7 @@ public class TestTreeController extends BaseController {
|
||||
/**
|
||||
* 查询测试树表列表
|
||||
*/
|
||||
@SaCheckPermission("demo:tree:list")
|
||||
// @SaCheckPermission("demo:tree:list")
|
||||
@GetMapping("/list")
|
||||
public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
|
||||
List<TestTreeVo> list = testTreeService.queryList(bo);
|
||||
@@ -50,7 +50,7 @@ public class TestTreeController extends BaseController {
|
||||
/**
|
||||
* 导出测试树表列表
|
||||
*/
|
||||
@SaCheckPermission("demo:tree:export")
|
||||
// @SaCheckPermission("demo:tree:export")
|
||||
@Log(title = "测试树表", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/export")
|
||||
public void export(@Validated TestTreeBo bo, HttpServletResponse response) {
|
||||
@@ -63,7 +63,7 @@ public class TestTreeController extends BaseController {
|
||||
*
|
||||
* @param id 测试树ID
|
||||
*/
|
||||
@SaCheckPermission("demo:tree:query")
|
||||
// @SaCheckPermission("demo:tree:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<TestTreeVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
@@ -73,7 +73,7 @@ public class TestTreeController extends BaseController {
|
||||
/**
|
||||
* 新增测试树表
|
||||
*/
|
||||
@SaCheckPermission("demo:tree:add")
|
||||
// @SaCheckPermission("demo:tree:add")
|
||||
@Log(title = "测试树表", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit
|
||||
@PostMapping()
|
||||
@@ -84,7 +84,7 @@ public class TestTreeController extends BaseController {
|
||||
/**
|
||||
* 修改测试树表
|
||||
*/
|
||||
@SaCheckPermission("demo:tree:edit")
|
||||
// @SaCheckPermission("demo:tree:edit")
|
||||
@Log(title = "测试树表", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit
|
||||
@PutMapping()
|
||||
@@ -97,7 +97,7 @@ public class TestTreeController extends BaseController {
|
||||
*
|
||||
* @param ids 测试树ID串
|
||||
*/
|
||||
@SaCheckPermission("demo:tree:remove")
|
||||
// @SaCheckPermission("demo:tree:remove")
|
||||
@Log(title = "测试树表", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+6
-6
@@ -41,7 +41,7 @@ public class HqHallInfoController extends BaseController {
|
||||
* 查询报告厅信息列表
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallInfo:list")
|
||||
//@SaCheckPermission("hq:hallInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqHallInfoVo> list(HqHallInfoBo bo, PageQuery pageQuery) {
|
||||
return hqHallInfoService.queryPageList(bo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class HqHallInfoController extends BaseController {
|
||||
* 导出报告厅信息列表
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallInfo:export")
|
||||
//@SaCheckPermission("hq:hallInfo:export")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqHallInfoBo bo, HttpServletResponse response) {
|
||||
@@ -65,7 +65,7 @@ public class HqHallInfoController extends BaseController {
|
||||
* @param id 主键
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallInfo:query")
|
||||
//@SaCheckPermission("hq:hallInfo:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqHallInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqHallInfoService.queryById(id));
|
||||
@@ -75,7 +75,7 @@ public class HqHallInfoController extends BaseController {
|
||||
* 新增报告厅信息
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallInfo:add")
|
||||
//@SaCheckPermission("hq:hallInfo:add")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -87,7 +87,7 @@ public class HqHallInfoController extends BaseController {
|
||||
* 修改报告厅信息
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallInfo:edit")
|
||||
//@SaCheckPermission("hq:hallInfo:edit")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -101,7 +101,7 @@ public class HqHallInfoController extends BaseController {
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallInfo:remove")
|
||||
//@SaCheckPermission("hq:hallInfo:remove")
|
||||
@Log(title = "报告厅信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
|
||||
+8
-8
@@ -44,7 +44,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* 查询报告厅预约列表
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:list")
|
||||
//@SaCheckPermission("hq:hallReservation:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqHallReservationVo> list(HqHallReservationBo bo, PageQuery pageQuery) {
|
||||
return hqHallReservationService.queryPageList(bo, pageQuery);
|
||||
@@ -54,7 +54,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* 导出报告厅预约列表
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:export")
|
||||
//@SaCheckPermission("hq:hallReservation:export")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqHallReservationBo bo, HttpServletResponse response) {
|
||||
@@ -68,7 +68,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* @param id 主键
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:query")
|
||||
//@SaCheckPermission("hq:hallReservation:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqHallReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqHallReservationService.queryById(id));
|
||||
@@ -78,7 +78,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* 新增报告厅预约
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:add")
|
||||
//@SaCheckPermission("hq:hallReservation:add")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -90,7 +90,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* 修改报告厅预约
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:edit")
|
||||
//@SaCheckPermission("hq:hallReservation:edit")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -104,7 +104,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:remove")
|
||||
//@SaCheckPermission("hq:hallReservation:remove")
|
||||
@Log(title = "报告厅预约", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -115,7 +115,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* 审核报告厅预约(批准/拒绝)
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:audit")
|
||||
//@SaCheckPermission("hq:hallReservation:audit")
|
||||
@Log(title = "报告厅预约审核", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/audit")
|
||||
@@ -127,7 +127,7 @@ public class HqHallReservationController extends BaseController {
|
||||
* 检查报告厅时间冲突
|
||||
*/
|
||||
@ApiEncrypt(response = true)
|
||||
@SaCheckPermission("hq:hallReservation:query")
|
||||
//@SaCheckPermission("hq:hallReservation:query")
|
||||
@PostMapping("/checkTimeConflict")
|
||||
public R<HqHallTimeCheckVo> checkTimeConflict(@Validated @RequestBody HqHallTimeCheckBo timeCheckBo) {
|
||||
HqHallTimeCheckVo result = hqHallReservationService.checkTimeConflict(timeCheckBo);
|
||||
|
||||
+12
-12
@@ -42,7 +42,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 查询报修附件列表
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:list")
|
||||
//@SaCheckPermission("pm:attachment:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqPmRepairAttachmentVo> list(HqPmRepairAttachmentBo bo, PageQuery pageQuery) {
|
||||
return attachmentService.queryPageList(bo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 根据工单ID获取附件列表
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:list")
|
||||
//@SaCheckPermission("pm:attachment:list")
|
||||
@GetMapping("/order/{orderId}")
|
||||
public R<List<HqPmRepairAttachmentVo>> getByOrderId(@PathVariable("orderId") Long orderId) {
|
||||
List<HqPmRepairAttachmentVo> list = attachmentService.queryByOrderId(orderId);
|
||||
@@ -61,7 +61,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 获取报修附件详细信息
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:query")
|
||||
//@SaCheckPermission("pm:attachment:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqPmRepairAttachmentVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(attachmentService.queryById(id));
|
||||
@@ -70,7 +70,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 新增报修附件
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:add")
|
||||
//@SaCheckPermission("pm:attachment:add")
|
||||
@Log(title = "报修附件", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -81,7 +81,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 修改报修附件
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:edit")
|
||||
//@SaCheckPermission("pm:attachment:edit")
|
||||
@Log(title = "报修附件", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -93,7 +93,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
* 删除报修附件
|
||||
* //
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:remove")
|
||||
//@SaCheckPermission("pm:attachment:remove")
|
||||
@Log(title = "报修附件", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -103,7 +103,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 上传单个附件文件
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:upload")
|
||||
//@SaCheckPermission("pm:attachment:upload")
|
||||
@Log(title = "上传报修附件", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/upload")
|
||||
public R<HqPmRepairAttachmentVo> uploadFile(
|
||||
@@ -127,7 +127,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 批量上传附件文件
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:upload")
|
||||
//@SaCheckPermission("pm:attachment:upload")
|
||||
@Log(title = "批量上传报修附件", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/upload/batch")
|
||||
public R<List<HqPmRepairAttachmentVo>> uploadFiles(
|
||||
@@ -152,7 +152,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 删除附件文件(包括OSS文件和数据库记录)
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:remove")
|
||||
//@SaCheckPermission("pm:attachment:remove")
|
||||
@Log(title = "删除报修附件文件", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/file/{id}")
|
||||
public R<Void> deleteAttachment(@PathVariable("id") Long id) {
|
||||
@@ -162,7 +162,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 下载附件文件
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:download")
|
||||
//@SaCheckPermission("pm:attachment:download")
|
||||
@GetMapping("/download/{id}")
|
||||
public void downloadFile(@PathVariable("id") Long id, HttpServletResponse response) {
|
||||
HqPmRepairAttachmentVo attachment = attachmentService.queryById(id);
|
||||
@@ -186,7 +186,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 更新附件的工单ID(用于新增工单时关联已上传的附件)
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:edit")
|
||||
//@SaCheckPermission("pm:attachment:edit")
|
||||
@Log(title = "更新附件工单ID", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/{attachmentId}/order/{orderId}")
|
||||
public R<Void> updateAttachmentOrderId(@PathVariable("attachmentId") Long attachmentId,
|
||||
@@ -197,7 +197,7 @@ public class HqPmRepairAttachmentController extends BaseController {
|
||||
/**
|
||||
* 批量更新附件的工单ID(用于新增工单时关联已上传的附件)
|
||||
*/
|
||||
@SaCheckPermission("pm:attachment:edit")
|
||||
//@SaCheckPermission("pm:attachment:edit")
|
||||
@Log(title = "批量更新附件工单ID", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/batch-update-order")
|
||||
public R<Void> batchUpdateAttachmentOrderId(@RequestBody BatchUpdateOrderIdRequest request) {
|
||||
|
||||
+8
-8
@@ -39,7 +39,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 查询维修类型列表
|
||||
*/
|
||||
@SaCheckPermission("pm:category:list")
|
||||
//@SaCheckPermission("pm:category:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqPmRepairCategoryVo> list(HqPmRepairCategoryBo bo, PageQuery pageQuery) {
|
||||
return repairCategoryService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 导出维修类型列表
|
||||
*/
|
||||
@SaCheckPermission("pm:category:export")
|
||||
//@SaCheckPermission("pm:category:export")
|
||||
@Log(title = "维修类型", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqPmRepairCategoryBo bo, HttpServletResponse response) {
|
||||
@@ -59,7 +59,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 获取维修类型详细信息
|
||||
*/
|
||||
@SaCheckPermission("pm:category:query")
|
||||
//@SaCheckPermission("pm:category:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqPmRepairCategoryVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(repairCategoryService.queryById(id));
|
||||
@@ -68,7 +68,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 新增维修类型
|
||||
*/
|
||||
@SaCheckPermission("pm:category:add")
|
||||
//@SaCheckPermission("pm:category:add")
|
||||
@Log(title = "维修类型", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -79,7 +79,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 修改维修类型
|
||||
*/
|
||||
@SaCheckPermission("pm:category:edit")
|
||||
//@SaCheckPermission("pm:category:edit")
|
||||
@Log(title = "维修类型", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -90,7 +90,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 删除维修类型
|
||||
*/
|
||||
@SaCheckPermission("pm:category:remove")
|
||||
//@SaCheckPermission("pm:category:remove")
|
||||
@Log(title = "维修类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -100,7 +100,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 获取维修类型树形结构
|
||||
*/
|
||||
@SaCheckPermission("pm:category:tree")
|
||||
//@SaCheckPermission("pm:category:tree")
|
||||
@GetMapping("/tree")
|
||||
public R<List<HqPmRepairCategoryVo>> tree() {
|
||||
return R.ok(repairCategoryService.queryTree());
|
||||
@@ -109,7 +109,7 @@ public class HqPmRepairCategoryController extends BaseController {
|
||||
/**
|
||||
* 获取维修类型下拉选项
|
||||
*/
|
||||
@SaCheckPermission("pm:category:options")
|
||||
//@SaCheckPermission("pm:category:options")
|
||||
@GetMapping("/options")
|
||||
public R<List<java.util.Map<String, Object>>> options() {
|
||||
List<HqPmRepairCategoryVo> list = repairCategoryService.queryTree();
|
||||
|
||||
+19
-19
@@ -42,7 +42,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 查询报修工单列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:list")
|
||||
//@SaCheckPermission("pm:repairOrder:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqPmRepairOrderVo> list(HqPmRepairOrderBo bo, PageQuery pageQuery) {
|
||||
TableDataInfo<HqPmRepairOrderVo> result = repairOrderService.queryPageList(bo, pageQuery);
|
||||
@@ -52,7 +52,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 导出报修工单列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:export")
|
||||
//@SaCheckPermission("pm:repairOrder:export")
|
||||
@Log(title = "报修工单", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqPmRepairOrderBo bo, HttpServletResponse response) {
|
||||
@@ -63,7 +63,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 获取报修工单详细信息
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:query")
|
||||
//@SaCheckPermission("pm:repairOrder:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqPmRepairOrderVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(repairOrderService.queryById(id));
|
||||
@@ -72,7 +72,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 新增报修工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:add")
|
||||
//@SaCheckPermission("pm:repairOrder:add")
|
||||
@Log(title = "报修工单", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -89,7 +89,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 修改报修工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:edit")
|
||||
//@SaCheckPermission("pm:repairOrder:edit")
|
||||
@Log(title = "报修工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -100,7 +100,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 删除报修工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:remove")
|
||||
//@SaCheckPermission("pm:repairOrder:remove")
|
||||
@Log(title = "报修工单", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -110,7 +110,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 分派工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:assign")
|
||||
//@SaCheckPermission("pm:repairOrder:assign")
|
||||
@Log(title = "分派工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/assign")
|
||||
@@ -124,7 +124,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 开始维修
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:start")
|
||||
//@SaCheckPermission("pm:repairOrder:start")
|
||||
@Log(title = "开始维修", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/start")
|
||||
@@ -135,7 +135,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 完成维修
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:finish")
|
||||
//@SaCheckPermission("pm:repairOrder:finish")
|
||||
@Log(title = "完成维修", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/finish")
|
||||
@@ -149,7 +149,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 取消工单
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:cancel")
|
||||
//@SaCheckPermission("pm:repairOrder:cancel")
|
||||
@Log(title = "取消工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/cancel")
|
||||
@@ -162,7 +162,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 生成工单编号
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:generateOrderNo")
|
||||
//@SaCheckPermission("pm:repairOrder:generateOrderNo")
|
||||
@GetMapping("/generateOrderNo")
|
||||
public R<String> generateOrderNo() {
|
||||
return R.ok(repairOrderService.generateOrderNo());
|
||||
@@ -171,7 +171,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 获取报修统计数据
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:statistics")
|
||||
//@SaCheckPermission("pm:repairOrder:statistics")
|
||||
@GetMapping("/statistics")
|
||||
public R<java.util.Map<String, Object>> statistics() {
|
||||
// 模拟统计数据,实际项目中应该从service获取真实统计
|
||||
@@ -247,7 +247,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
* 获取维修人员选项
|
||||
* 返回拥有"维修人员"角色的用户列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:assign")
|
||||
//@SaCheckPermission("pm:repairOrder:assign")
|
||||
@GetMapping("/maintenance-workers")
|
||||
public R<List<java.util.Map<String, Object>>> getMaintenanceWorkers() {
|
||||
return R.ok(repairOrderService.getMaintenanceWorkers());
|
||||
@@ -256,7 +256,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 获取工单进度列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:progress")
|
||||
//@SaCheckPermission("pm:repairOrder:progress")
|
||||
@GetMapping("/{orderId}/progress")
|
||||
public R<List<java.util.Map<String, Object>>> getRepairProgress(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
@@ -267,7 +267,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 更新维修进度
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:updateProgress")
|
||||
//@SaCheckPermission("pm:repairOrder:updateProgress")
|
||||
@Log(title = "更新进度", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/progress")
|
||||
@@ -279,7 +279,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 完成工单(新的完成接口,支持详细信息)
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:complete")
|
||||
//@SaCheckPermission("pm:repairOrder:complete")
|
||||
@Log(title = "完成工单", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{orderId}/complete")
|
||||
@@ -296,7 +296,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 创建服务评价
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:evaluate")
|
||||
//@SaCheckPermission("pm:repairOrder:evaluate")
|
||||
@Log(title = "服务评价", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/evaluation")
|
||||
@@ -309,7 +309,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 获取工单的服务评价
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:query")
|
||||
//@SaCheckPermission("pm:repairOrder:query")
|
||||
@GetMapping("/{orderId}/evaluation")
|
||||
public R<java.util.Map<String, Object>> getServiceEvaluation(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
@@ -321,7 +321,7 @@ public class HqPmRepairOrderController extends BaseController {
|
||||
/**
|
||||
* 获取工单附件列表
|
||||
*/
|
||||
@SaCheckPermission("pm:repairOrder:query")
|
||||
//@SaCheckPermission("pm:repairOrder:query")
|
||||
@GetMapping("/{orderId}/attachments")
|
||||
public R<List<HqPmRepairAttachmentVo>> getRepairAttachments(
|
||||
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
|
||||
|
||||
+7
-7
@@ -39,7 +39,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
/**
|
||||
* 查询题目分类列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:list")
|
||||
//@SaCheckPermission("hq:satCategory:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatCategoryVo> list(HqSatCategoryBo bo, PageQuery pageQuery) {
|
||||
return hqSatCategoryService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
/**
|
||||
* 查询所有题目分类列表(包括已逻辑删除的)
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:list")
|
||||
//@SaCheckPermission("hq:satCategory:list")
|
||||
@GetMapping("/listAllIncludeDeleted")
|
||||
public R<List<HqSatCategoryVo>> listAllIncludeDeleted(HqSatCategoryBo bo) {
|
||||
List<HqSatCategoryVo> list = hqSatCategoryService.queryListWithDeleted(bo);
|
||||
@@ -58,7 +58,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
/**
|
||||
* 导出题目分类列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:export")
|
||||
//@SaCheckPermission("hq:satCategory:export")
|
||||
@Log(title = "题目分类", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatCategoryBo bo, HttpServletResponse response) {
|
||||
@@ -71,7 +71,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:query")
|
||||
//@SaCheckPermission("hq:satCategory:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatCategoryVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -81,7 +81,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
/**
|
||||
* 新增题目分类
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:add")
|
||||
//@SaCheckPermission("hq:satCategory:add")
|
||||
@Log(title = "题目分类", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -92,7 +92,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
/**
|
||||
* 修改题目分类
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:edit")
|
||||
//@SaCheckPermission("hq:satCategory:edit")
|
||||
@Log(title = "题目分类", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -105,7 +105,7 @@ public class HqSatCategoryController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satCategory:remove")
|
||||
//@SaCheckPermission("hq:satCategory:remove")
|
||||
@Log(title = "题目分类", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+6
-6
@@ -39,7 +39,7 @@ public class HqSatDetailController extends BaseController {
|
||||
/**
|
||||
* 查询答题详情列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:list")
|
||||
//@SaCheckPermission("hq:satDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatDetailVo> list(HqSatDetailBo bo, PageQuery pageQuery) {
|
||||
return hqSatDetailService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqSatDetailController extends BaseController {
|
||||
/**
|
||||
* 导出答题详情列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:export")
|
||||
//@SaCheckPermission("hq:satDetail:export")
|
||||
@Log(title = "答题详情", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatDetailBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class HqSatDetailController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:query")
|
||||
//@SaCheckPermission("hq:satDetail:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class HqSatDetailController extends BaseController {
|
||||
/**
|
||||
* 新增答题详情
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:add")
|
||||
//@SaCheckPermission("hq:satDetail:add")
|
||||
@Log(title = "答题详情", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class HqSatDetailController extends BaseController {
|
||||
/**
|
||||
* 修改答题详情
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:edit")
|
||||
//@SaCheckPermission("hq:satDetail:edit")
|
||||
@Log(title = "答题详情", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class HqSatDetailController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satDetail:remove")
|
||||
//@SaCheckPermission("hq:satDetail:remove")
|
||||
@Log(title = "答题详情", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+6
-6
@@ -39,7 +39,7 @@ public class HqSatOptionController extends BaseController {
|
||||
/**
|
||||
* 查询评分选项列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:list")
|
||||
//@SaCheckPermission("hq:satOption:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatOptionVo> list(HqSatOptionBo bo, PageQuery pageQuery) {
|
||||
return hqSatOptionService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqSatOptionController extends BaseController {
|
||||
/**
|
||||
* 导出评分选项列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:export")
|
||||
//@SaCheckPermission("hq:satOption:export")
|
||||
@Log(title = "评分选项", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatOptionBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class HqSatOptionController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:query")
|
||||
//@SaCheckPermission("hq:satOption:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatOptionVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class HqSatOptionController extends BaseController {
|
||||
/**
|
||||
* 新增评分选项
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:add")
|
||||
//@SaCheckPermission("hq:satOption:add")
|
||||
@Log(title = "评分选项", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class HqSatOptionController extends BaseController {
|
||||
/**
|
||||
* 修改评分选项
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:edit")
|
||||
//@SaCheckPermission("hq:satOption:edit")
|
||||
@Log(title = "评分选项", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class HqSatOptionController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satOption:remove")
|
||||
//@SaCheckPermission("hq:satOption:remove")
|
||||
@Log(title = "评分选项", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+7
-7
@@ -43,7 +43,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
/**
|
||||
* 查询题库列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:list")
|
||||
//@SaCheckPermission("hq:satQuestion:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatQuestionVo> list(HqSatQuestionBo bo, PageQuery pageQuery) {
|
||||
return hqSatQuestionService.queryPageList(bo, pageQuery);
|
||||
@@ -52,7 +52,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
/**
|
||||
* 导出题库列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:export")
|
||||
//@SaCheckPermission("hq:satQuestion:export")
|
||||
@Log(title = "题库", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatQuestionBo bo, HttpServletResponse response) {
|
||||
@@ -65,7 +65,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:query")
|
||||
//@SaCheckPermission("hq:satQuestion:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatQuestionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqSatQuestionService.queryById(id));
|
||||
@@ -74,7 +74,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
/**
|
||||
* 新增题库
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:add")
|
||||
//@SaCheckPermission("hq:satQuestion:add")
|
||||
@Log(title = "题库", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -85,7 +85,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
/**
|
||||
* 修改题库
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:edit")
|
||||
//@SaCheckPermission("hq:satQuestion:edit")
|
||||
@Log(title = "题库", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -98,7 +98,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:remove")
|
||||
//@SaCheckPermission("hq:satQuestion:remove")
|
||||
@Log(title = "题库", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -110,7 +110,7 @@ public class HqSatQuestionController extends BaseController {
|
||||
*
|
||||
* @param questionId 题目ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satQuestion:query")
|
||||
//@SaCheckPermission("hq:satQuestion:query")
|
||||
@GetMapping("/{questionId}/options")
|
||||
public R<List<HqSatOptionVo>> getQuestionOptions(@PathVariable Long questionId) {
|
||||
// 根据题目ID获取该题目的选项
|
||||
|
||||
+6
-6
@@ -39,7 +39,7 @@ public class HqSatRecordController extends BaseController {
|
||||
/**
|
||||
* 查询答题记录列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:list")
|
||||
//@SaCheckPermission("hq:satRecord:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatRecordVo> list(HqSatRecordBo bo, PageQuery pageQuery) {
|
||||
return hqSatRecordService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqSatRecordController extends BaseController {
|
||||
/**
|
||||
* 导出答题记录列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:export")
|
||||
//@SaCheckPermission("hq:satRecord:export")
|
||||
@Log(title = "答题记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatRecordBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class HqSatRecordController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:query")
|
||||
//@SaCheckPermission("hq:satRecord:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatRecordVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class HqSatRecordController extends BaseController {
|
||||
/**
|
||||
* 新增答题记录
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:add")
|
||||
//@SaCheckPermission("hq:satRecord:add")
|
||||
@Log(title = "答题记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class HqSatRecordController extends BaseController {
|
||||
/**
|
||||
* 修改答题记录
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:edit")
|
||||
//@SaCheckPermission("hq:satRecord:edit")
|
||||
@Log(title = "答题记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class HqSatRecordController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satRecord:remove")
|
||||
//@SaCheckPermission("hq:satRecord:remove")
|
||||
@Log(title = "答题记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+15
-15
@@ -45,7 +45,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
/**
|
||||
* 查询问卷列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:list")
|
||||
//@SaCheckPermission("hq:satSurvey:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatSurveyVo> list(HqSatSurveyBo bo, PageQuery pageQuery) {
|
||||
// 从params中获取权限过滤参数
|
||||
@@ -77,7 +77,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
/**
|
||||
* 导出问卷列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:export")
|
||||
//@SaCheckPermission("hq:satSurvey:export")
|
||||
@Log(title = "问卷", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatSurveyBo bo, HttpServletResponse response) {
|
||||
@@ -90,7 +90,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:query")
|
||||
//@SaCheckPermission("hq:satSurvey:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatSurveyVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(hqSatSurveyService.queryById(id));
|
||||
@@ -99,7 +99,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
/**
|
||||
* 新增问卷
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:add")
|
||||
//@SaCheckPermission("hq:satSurvey:add")
|
||||
@Log(title = "问卷", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -110,7 +110,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
/**
|
||||
* 修改问卷
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:edit")
|
||||
//@SaCheckPermission("hq:satSurvey:edit")
|
||||
@Log(title = "问卷", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -123,7 +123,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:remove")
|
||||
//@SaCheckPermission("hq:satSurvey:remove")
|
||||
@Log(title = "问卷", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -135,7 +135,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:question")
|
||||
//@SaCheckPermission("hq:satSurvey:question")
|
||||
@GetMapping("/{surveyId}/questions")
|
||||
public R<List<HqSatSurveyQuestionVo>> getSurveyQuestions(
|
||||
@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
|
||||
@@ -148,7 +148,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
* @param surveyId 问卷ID
|
||||
* @param questions 题目列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:question")
|
||||
//@SaCheckPermission("hq:satSurvey:question")
|
||||
@Log(title = "问卷题目管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{surveyId}/questions")
|
||||
@@ -162,7 +162,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param id 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:publish")
|
||||
//@SaCheckPermission("hq:satSurvey:publish")
|
||||
@Log(title = "发布问卷", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{id}/publish")
|
||||
@@ -175,7 +175,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param id 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:unpublish")
|
||||
//@SaCheckPermission("hq:satSurvey:unpublish")
|
||||
@Log(title = "撤销发布问卷", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/{id}/unpublish")
|
||||
@@ -398,7 +398,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:result")
|
||||
//@SaCheckPermission("hq:satSurvey:result")
|
||||
@GetMapping("/{surveyId}/statistics")
|
||||
public R<java.util.Map<String, Object>> getSurveyStatistics(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
|
||||
return R.ok(hqSatSurveyService.getSurveyStatistics(surveyId));
|
||||
@@ -414,7 +414,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
* @param pageNum 页码
|
||||
* @param pageSize 每页大小
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:result")
|
||||
//@SaCheckPermission("hq:satSurvey:result")
|
||||
@GetMapping("/{surveyId}/records")
|
||||
public R<java.util.Map<String, Object>> getSurveyAnswerRecords(
|
||||
@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId,
|
||||
@@ -439,7 +439,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param recordId 答题记录ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:result")
|
||||
//@SaCheckPermission("hq:satSurvey:result")
|
||||
@GetMapping("/record/{recordId}")
|
||||
public R<java.util.Map<String, Object>> getAnswerRecordDetail(@NotNull(message = "记录ID不能为空") @PathVariable Long recordId) {
|
||||
return R.ok(hqSatSurveyService.getAnswerRecordDetail(recordId));
|
||||
@@ -450,7 +450,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:export")
|
||||
//@SaCheckPermission("hq:satSurvey:export")
|
||||
@Log(title = "导出调查报告", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/{surveyId}/exportReport")
|
||||
public void exportSurveyReport(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId, HttpServletResponse response) {
|
||||
@@ -462,7 +462,7 @@ public class HqSatSurveyController extends BaseController {
|
||||
*
|
||||
* @param surveyId 问卷ID
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurvey:export")
|
||||
//@SaCheckPermission("hq:satSurvey:export")
|
||||
@Log(title = "导出原始数据", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/{surveyId}/exportRawData")
|
||||
public void exportSurveyRawData(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId, HttpServletResponse response) {
|
||||
|
||||
+6
-6
@@ -39,7 +39,7 @@ public class HqSatSurveyQuestionController extends BaseController {
|
||||
/**
|
||||
* 查询问卷题目关联列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:list")
|
||||
//@SaCheckPermission("hq:satSurveyQuestion:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqSatSurveyQuestionVo> list(HqSatSurveyQuestionBo bo, PageQuery pageQuery) {
|
||||
return hqSatSurveyQuestionService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqSatSurveyQuestionController extends BaseController {
|
||||
/**
|
||||
* 导出问卷题目关联列表
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:export")
|
||||
//@SaCheckPermission("hq:satSurveyQuestion:export")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqSatSurveyQuestionBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class HqSatSurveyQuestionController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:query")
|
||||
//@SaCheckPermission("hq:satSurveyQuestion:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqSatSurveyQuestionVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class HqSatSurveyQuestionController extends BaseController {
|
||||
/**
|
||||
* 新增问卷题目关联
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:add")
|
||||
//@SaCheckPermission("hq:satSurveyQuestion:add")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class HqSatSurveyQuestionController extends BaseController {
|
||||
/**
|
||||
* 修改问卷题目关联
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:edit")
|
||||
//@SaCheckPermission("hq:satSurveyQuestion:edit")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class HqSatSurveyQuestionController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("hq:satSurveyQuestion:remove")
|
||||
//@SaCheckPermission("hq:satSurveyQuestion:remove")
|
||||
@Log(title = "问卷题目关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+8
-8
@@ -39,7 +39,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 查询场地信息列表
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:list")
|
||||
//@SaCheckPermission("hq:venue:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqVenueInfoVo> list(HqVenueInfoBo bo, PageQuery pageQuery) {
|
||||
return venueInfoService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 导出场地信息列表
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:export")
|
||||
//@SaCheckPermission("hq:venue:export")
|
||||
@Log(title = "场地信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqVenueInfoBo bo, HttpServletResponse response) {
|
||||
@@ -59,7 +59,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 获取场地信息详细信息
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:query")
|
||||
//@SaCheckPermission("hq:venue:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqVenueInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(venueInfoService.queryById(id));
|
||||
@@ -68,7 +68,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 新增场地信息
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:add")
|
||||
//@SaCheckPermission("hq:venue:add")
|
||||
@Log(title = "场地信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -79,7 +79,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 修改场地信息
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:edit")
|
||||
//@SaCheckPermission("hq:venue:edit")
|
||||
@Log(title = "场地信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -90,7 +90,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 删除场地信息
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:remove")
|
||||
//@SaCheckPermission("hq:venue:remove")
|
||||
@Log(title = "场地信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -100,7 +100,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 根据场地编码查询场地信息
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:query")
|
||||
//@SaCheckPermission("hq:venue:query")
|
||||
@GetMapping("/code/{venueCode}")
|
||||
public R<HqVenueInfoVo> getByCode(@PathVariable String venueCode) {
|
||||
return R.ok(venueInfoService.queryByVenueCode(venueCode));
|
||||
@@ -109,7 +109,7 @@ public class HqVenueInfoController extends BaseController {
|
||||
/**
|
||||
* 获取可用场地列表
|
||||
*/
|
||||
@SaCheckPermission("hq:venue:query")
|
||||
//@SaCheckPermission("hq:venue:query")
|
||||
@GetMapping("/available")
|
||||
public R<List<HqVenueInfoVo>> getAvailableVenues() {
|
||||
return R.ok(venueInfoService.getAvailableVenues());
|
||||
|
||||
+10
-10
@@ -41,7 +41,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 查询场地预约列表
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:list")
|
||||
//@SaCheckPermission("hq:reservation:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<HqVenueReservationVo> list(HqVenueReservationBo bo, PageQuery pageQuery) {
|
||||
return reservationService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 查询我的预约列表
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:my")
|
||||
//@SaCheckPermission("hq:reservation:my")
|
||||
@GetMapping("/my")
|
||||
public TableDataInfo<HqVenueReservationVo> myList(HqVenueReservationBo bo, PageQuery pageQuery) {
|
||||
return reservationService.queryMyPageList(bo, pageQuery);
|
||||
@@ -59,7 +59,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 查询待审批预约列表
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:approve")
|
||||
//@SaCheckPermission("hq:reservation:approve")
|
||||
@GetMapping("/pending")
|
||||
public TableDataInfo<HqVenueReservationVo> pendingList(HqVenueReservationBo bo, PageQuery pageQuery) {
|
||||
return reservationService.queryPendingPageList(bo, pageQuery);
|
||||
@@ -68,7 +68,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 导出场地预约列表
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:export")
|
||||
//@SaCheckPermission("hq:reservation:export")
|
||||
@Log(title = "场地预约", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HqVenueReservationBo bo, HttpServletResponse response) {
|
||||
@@ -79,7 +79,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 获取场地预约详细信息
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:query")
|
||||
//@SaCheckPermission("hq:reservation:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<HqVenueReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(reservationService.queryById(id));
|
||||
@@ -88,7 +88,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 新增场地预约
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:add")
|
||||
//@SaCheckPermission("hq:reservation:add")
|
||||
@Log(title = "场地预约", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -99,7 +99,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 修改场地预约
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:edit")
|
||||
//@SaCheckPermission("hq:reservation:edit")
|
||||
@Log(title = "场地预约", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -110,7 +110,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 删除场地预约
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:remove")
|
||||
//@SaCheckPermission("hq:reservation:remove")
|
||||
@Log(title = "场地预约", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -120,7 +120,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 检查时间冲突
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:query")
|
||||
//@SaCheckPermission("hq:reservation:query")
|
||||
@GetMapping("/conflict")
|
||||
public R<List<HqVenueReservationVo>> checkTimeConflict(
|
||||
@RequestParam Long venueId,
|
||||
@@ -134,7 +134,7 @@ public class HqVenueReservationController extends BaseController {
|
||||
/**
|
||||
* 审批场地预约
|
||||
*/
|
||||
@SaCheckPermission("hq:reservation:approve")
|
||||
//@SaCheckPermission("hq:reservation:approve")
|
||||
@Log(title = "场地预约审批", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/approve")
|
||||
|
||||
+21
-21
@@ -52,7 +52,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询贫困生认定申请列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:list")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:list")
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "查询贫困生认定申请列表")
|
||||
public TableDataInfo<JcbtPovertyApplicationVo> list(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
|
||||
@@ -62,7 +62,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取贫困生认定申请详细信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "获取贫困生认定申请详细信息")
|
||||
public R<JcbtPovertyApplicationVo> getInfo(@Parameter(description = "主键") @PathVariable Long id) {
|
||||
@@ -72,7 +72,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 新增贫困生认定申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:add")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:add")
|
||||
@Log(title = "贫困生认定申请", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -89,7 +89,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 修改贫困生认定申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:edit")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:edit")
|
||||
@Log(title = "贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -101,7 +101,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 删除贫困生认定申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:remove")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:remove")
|
||||
@Log(title = "删除贫困生认定申请", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
@Operation(summary = "删除贫困生认定申请")
|
||||
@@ -112,7 +112,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 导出贫困生认定申请列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:export")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:export")
|
||||
@Log(title = "导出贫困生认定申请", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@Operation(summary = "导出贫困生认定申请列表")
|
||||
@@ -124,7 +124,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 导出我的申请列表(班主任导出自己提交的申请)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:myList")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:myList")
|
||||
@Log(title = "导出我的贫困生认定申请", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/myExport")
|
||||
@Operation(summary = "导出我的申请列表")
|
||||
@@ -139,7 +139,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询我的申请列表(班主任查看自己提交的申请)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:myList")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:myList")
|
||||
@GetMapping("/myList")
|
||||
@Operation(summary = "查询我的申请列表")
|
||||
public TableDataInfo<JcbtPovertyApplicationVo> myList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
|
||||
@@ -150,7 +150,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询待审核申请列表(审核人员使用)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:pendingList")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:pendingList")
|
||||
@GetMapping("/pendingList")
|
||||
@Operation(summary = "查询待审核申请列表")
|
||||
public TableDataInfo<JcbtPovertyApplicationVo> pendingList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
|
||||
@@ -160,7 +160,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 提交申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:submit")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:submit")
|
||||
@Log(title = "提交贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/submit/{id}")
|
||||
@@ -172,7 +172,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 撤销申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:cancel")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:cancel")
|
||||
@Log(title = "撤销贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/cancel/{id}")
|
||||
@@ -186,7 +186,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 根据申请编号获取申请信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
@GetMapping("/byApplicationNo/{applicationNo}")
|
||||
@Operation(summary = "根据申请编号获取申请信息")
|
||||
public R<JcbtPovertyApplicationVo> getInfoByApplicationNo(@Parameter(description = "申请编号") @PathVariable String applicationNo) {
|
||||
@@ -196,7 +196,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 保存草稿
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:saveDraft")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:saveDraft")
|
||||
@Log(title = "保存贫困生认定申请草稿", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/saveDraft")
|
||||
@@ -208,7 +208,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 审核通过
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:approve")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:approve")
|
||||
@Log(title = "审核通过贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/approve")
|
||||
@@ -220,7 +220,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 审核驳回
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
@Log(title = "审核驳回贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/reject")
|
||||
@@ -232,7 +232,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 生成申请编号
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:add")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:add")
|
||||
@GetMapping("/generateApplicationNo")
|
||||
@Operation(summary = "生成申请编号")
|
||||
public R<String> generateApplicationNo() {
|
||||
@@ -242,7 +242,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 检查学生申请是否重复
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:add")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:add")
|
||||
@GetMapping("/checkDuplicate")
|
||||
@Operation(summary = "检查学生申请是否重复")
|
||||
public R<Boolean> checkDuplicate(@Parameter(description = "学生ID") @RequestParam Long studentId,
|
||||
@@ -258,7 +258,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取申请统计信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:statistics")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:statistics")
|
||||
@GetMapping("/statistics")
|
||||
@Operation(summary = "获取申请统计信息")
|
||||
public R<Map<String, Object>> statistics(@Parameter(description = "班主任ID") @RequestParam(required = false) Long teacherId) {
|
||||
@@ -284,7 +284,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取我的申请统计信息(班主任使用)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:myList")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:myList")
|
||||
@GetMapping("/myStatistics")
|
||||
@Operation(summary = "获取我的申请统计信息")
|
||||
public R<Map<String, Object>> myStatistics() {
|
||||
@@ -312,7 +312,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
* 获取当前用户班级信息
|
||||
*/
|
||||
@Operation(summary = "获取当前用户班级信息")
|
||||
@SaCheckPermission("jcbt:povertyApplication:list")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:list")
|
||||
@GetMapping("/user/classes")
|
||||
public R<List<Map<String, Object>>> getCurrentUserClasses() {
|
||||
Long currentUserId = LoginHelper.getLoginUser().getUserId();
|
||||
@@ -325,7 +325,7 @@ public class JcbtPovertyApplicationController extends BaseController {
|
||||
*/
|
||||
@Operation(summary = "获取班级学生列表")
|
||||
@Parameter(name = "classId", description = "班级ID", required = true)
|
||||
@SaCheckPermission("jcbt:povertyApplication:list")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:list")
|
||||
@GetMapping("/class/{classId}/students")
|
||||
public R<List<Map<String, Object>>> getClassStudents(@PathVariable Long classId) {
|
||||
List<Map<String, Object>> students = povertyApplicationService.getClassStudents(classId);
|
||||
|
||||
+14
-14
@@ -51,7 +51,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 查询待审核申请列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
@GetMapping("/pendingList")
|
||||
@Operation(summary = "查询待审核申请列表")
|
||||
public TableDataInfo<JcbtPovertyApplicationVo> pendingList(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
|
||||
@@ -61,7 +61,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 查询所有申请列表(支持多状态筛选)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:query")
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "查询所有申请列表")
|
||||
public TableDataInfo<JcbtPovertyApplicationVo> list(JcbtPovertyApplicationBo bo, PageQuery pageQuery) {
|
||||
@@ -86,7 +86,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 获取申请详情
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:detail")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:detail")
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "获取申请详情")
|
||||
public R<JcbtPovertyApplicationVo> getInfo(@Parameter(description = "申请ID") @PathVariable Long id) {
|
||||
@@ -96,7 +96,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 审核通过
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:approve")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:approve")
|
||||
@Log(title = "审核通过贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/approve")
|
||||
@Operation(summary = "审核通过")
|
||||
@@ -107,7 +107,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 审核驳回
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
@Log(title = "审核驳回贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/reject")
|
||||
@Operation(summary = "审核驳回")
|
||||
@@ -118,7 +118,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 打回修改
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
@Log(title = "打回修改贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/returnToDraft")
|
||||
@Operation(summary = "打回修改")
|
||||
@@ -129,7 +129,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 批量审核通过
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:approve")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:approve")
|
||||
@Log(title = "批量审核通过贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/batchApprove")
|
||||
@Operation(summary = "批量审核通过")
|
||||
@@ -141,7 +141,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 批量审核驳回
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:reject")
|
||||
@Log(title = "批量审核驳回贫困生认定申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/batchReject")
|
||||
@Operation(summary = "批量审核驳回")
|
||||
@@ -155,7 +155,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 获取审核统计信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:statistics")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:statistics")
|
||||
@GetMapping("/statistics")
|
||||
@Operation(summary = "获取审核统计信息")
|
||||
public R<Map<String, Object>> statistics(@Parameter(description = "学年") @RequestParam(required = false) String academicYear,
|
||||
@@ -182,7 +182,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 获取审核工作量统计
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:statistics")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:statistics")
|
||||
@GetMapping("/workloadStatistics")
|
||||
@Operation(summary = "获取审核工作量统计")
|
||||
public R<List<Map<String, Object>>> workloadStatistics(@Parameter(description = "开始时间") @RequestParam(required = false) String startTime,
|
||||
@@ -196,7 +196,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 导出申请数据
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:export")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:export")
|
||||
@Log(title = "导出贫困生认定申请数据", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@Operation(summary = "导出申请数据")
|
||||
@@ -208,7 +208,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 导出待审核申请数据
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:export")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:export")
|
||||
@Log(title = "导出待审核贫困生认定申请数据", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/exportPending")
|
||||
@Operation(summary = "导出待审核申请数据")
|
||||
@@ -224,7 +224,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 获取申请附件预览信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:detail")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:detail")
|
||||
@GetMapping("/{id}/attachments")
|
||||
@Operation(summary = "获取申请附件预览信息")
|
||||
public R<Map<String, Object>> getAttachments(@Parameter(description = "申请ID") @PathVariable Long id) {
|
||||
@@ -253,7 +253,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
|
||||
/**
|
||||
* 获取审核历史记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:povertyApplication:detail")
|
||||
//@SaCheckPermission("jcbt:povertyApplication:detail")
|
||||
@GetMapping("/{id}/history")
|
||||
@Operation(summary = "获取审核历史记录")
|
||||
public R<List<Map<String, Object>>> getAuditHistory(@Parameter(description = "申请ID") @PathVariable Long id) {
|
||||
|
||||
+24
-24
@@ -53,7 +53,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询奖学金申请记录列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:list")
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "查询奖学金申请记录列表")
|
||||
public TableDataInfo<JcbtScholarshipApplicationVo> list(JcbtScholarshipApplicationBo bo, PageQuery pageQuery) {
|
||||
@@ -63,7 +63,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金申请记录详细信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:query")
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "获取奖学金申请记录详细信息")
|
||||
public R<JcbtScholarshipApplicationVo> getInfo(@Parameter(description = "主键") @PathVariable Long id) {
|
||||
@@ -73,7 +73,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 新增奖学金申请记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:add")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:add")
|
||||
@Log(title = "奖学金申请记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -85,7 +85,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 修改奖学金申请记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:edit")
|
||||
@Log(title = "奖学金申请记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -116,7 +116,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 删除奖学金申请记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:remove")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:remove")
|
||||
@Log(title = "奖学金申请记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
@Operation(summary = "删除奖学金申请记录")
|
||||
@@ -127,7 +127,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取可申请的奖学金类型列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:available")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:available")
|
||||
@GetMapping("/available")
|
||||
@Operation(summary = "获取可申请的奖学金类型列表")
|
||||
public R<List<Map<String, Object>>> getAvailableScholarshipTypes(@Parameter(description = "班级ID") @RequestParam Long classId,
|
||||
@@ -140,7 +140,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询我的申请记录(班主任)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:my")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:my")
|
||||
@GetMapping("/my")
|
||||
@Operation(summary = "查询我的申请记录")
|
||||
public R<List<JcbtScholarshipApplicationVo>> getMyApplications(@Parameter(description = "申请人ID") @RequestParam Long applicantId,
|
||||
@@ -151,7 +151,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询待审核申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:pending")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:pending")
|
||||
@GetMapping("/pending")
|
||||
@Operation(summary = "查询待审核申请")
|
||||
public R<List<JcbtScholarshipApplicationVo>> getPendingApplications(@Parameter(description = "审核人ID") @RequestParam(required = false) Long reviewerId,
|
||||
@@ -162,7 +162,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 检查学生申请资格
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:check")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:check")
|
||||
@GetMapping("/check")
|
||||
@Operation(summary = "检查学生申请资格")
|
||||
public R<Map<String, Object>> checkStudentEligibility(@Parameter(description = "学生ID") @RequestParam Long studentId,
|
||||
@@ -174,7 +174,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 批量审核申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:approve")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:approve")
|
||||
@Log(title = "批量审核奖学金申请", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/approve")
|
||||
@Operation(summary = "批量审核申请")
|
||||
@@ -191,7 +191,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 导出奖学金申请记录列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:schotlarshipApplication:expor")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:export")
|
||||
@Log(title = "奖学金申请记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@Operation(summary = "导出奖学金申请记录列表")
|
||||
@@ -203,7 +203,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 导入奖学金申请记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:import")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:import")
|
||||
@Log(title = "奖学金申请记录", businessType = BusinessType.IMPORT)
|
||||
@PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
@Operation(summary = "导入奖学金申请记录")
|
||||
@@ -222,7 +222,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取申请统计数据
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:statistics")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:statistics")
|
||||
@GetMapping("/statistics")
|
||||
@Operation(summary = "获取申请统计数据")
|
||||
public R<Map<String, Object>> getStatistics(@Parameter(description = "批次ID") @RequestParam(required = false) Long batchId,
|
||||
@@ -233,7 +233,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 班主任批量申请提交
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:batch")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:batch")
|
||||
@Log(title = "班主任批量申请提交", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/batch")
|
||||
@Operation(summary = "班主任批量申请提交")
|
||||
@@ -247,7 +247,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 提交申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:submit")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:submit")
|
||||
@Log(title = "提交奖学金申请", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/{id}/submit")
|
||||
@Operation(summary = "提交申请")
|
||||
@@ -258,7 +258,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 撤回申请
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:withdraw")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:withdraw")
|
||||
@Log(title = "撤回奖学金申请", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/{id}/withdraw")
|
||||
@Operation(summary = "撤回申请")
|
||||
@@ -272,7 +272,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取班级名额使用情况
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:quota")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:quota")
|
||||
@GetMapping("/quota")
|
||||
@Operation(summary = "获取班级名额使用情况")
|
||||
public R<Map<String, Object>> getClassQuotaUsage(@Parameter(description = "班级ID") @RequestParam Long classId,
|
||||
@@ -285,7 +285,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取班主任所带班级信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:classInfo")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:classInfo")
|
||||
@GetMapping("/classInfo")
|
||||
@Operation(summary = "获取班主任所带班级信息")
|
||||
public R<Map<String, Object>> getClassInfoByTeacher(@Parameter(description = "班主任ID") @RequestParam Long teacherId) {
|
||||
@@ -295,7 +295,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取班级学生列表(用于勾选)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:students")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:students")
|
||||
@GetMapping("/students")
|
||||
@Operation(summary = "获取班级学生列表")
|
||||
public R<List<Map<String, Object>>> getClassStudents(@Parameter(description = "班级ID") @RequestParam Long classId) {
|
||||
@@ -305,7 +305,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 根据批次获取可申请的奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
@GetMapping("/scholarshipTypes")
|
||||
@Operation(summary = "根据批次获取可申请的奖学金类型")
|
||||
public R<List<Map<String, Object>>> getScholarshipTypesByBatch(@Parameter(description = "批次ID") @RequestParam Long batchId) {
|
||||
@@ -315,7 +315,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 根据批次和班级获取带名额信息的奖学金类型(班主任专用)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
@GetMapping("/scholarshipTypesWithQuota")
|
||||
@Operation(summary = "根据批次和班级获取带名额信息的奖学金类型")
|
||||
public R<List<Map<String, Object>>> getScholarshipTypesWithQuota(
|
||||
@@ -327,7 +327,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 确认选择班级(多班级时用户选择后调用)
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:classInfo")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:classInfo")
|
||||
@PostMapping("/confirmClass")
|
||||
@Operation(summary = "确认选择班级")
|
||||
public R<Map<String, Object>> confirmClassSelection(@Parameter(description = "班主任ID") @RequestParam Long teacherId,
|
||||
@@ -338,7 +338,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 测试接口:获取奖学金类型数据结构
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
@GetMapping("/test/scholarshipTypesStructure")
|
||||
@Operation(summary = "测试接口:获取奖学金类型数据结构")
|
||||
public R<Map<String, Object>> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam Long batchId,
|
||||
@@ -361,7 +361,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
|
||||
/**
|
||||
* 调试接口:详细SQL日志输出测试
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
//@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes")
|
||||
@GetMapping("/debug/sqlLogs")
|
||||
@Operation(summary = "调试接口:详细SQL日志输出测试")
|
||||
public R<Map<String, Object>> debugSqlLogs(@Parameter(description = "批次ID") @RequestParam Long batchId,
|
||||
|
||||
+14
-14
@@ -41,7 +41,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 查询奖学金评定批次列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtScholarshipBatchVo> list(JcbtScholarshipBatchBo bo, PageQuery pageQuery) {
|
||||
return scholarshipBatchService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 导出奖学金评定批次列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:export")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:export")
|
||||
@Log(title = "奖学金评定批次", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(JcbtScholarshipBatchBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金评定批次详细信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtScholarshipBatchVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 新增奖学金评定批次
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:add")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:add")
|
||||
@Log(title = "奖学金评定批次", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 修改奖学金评定批次
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:edit")
|
||||
@Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -93,7 +93,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 删除奖学金评定批次
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:remove")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:remove")
|
||||
@Log(title = "奖学金评定批次", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -104,7 +104,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 根据批次编码查询批次信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/getByCode/{batchCode}")
|
||||
public R<JcbtScholarshipBatchVo> getByBatchCode(@PathVariable String batchCode) {
|
||||
return R.ok(scholarshipBatchService.queryByBatchCode(batchCode));
|
||||
@@ -113,7 +113,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 根据学年和学期查询批次列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/getByAcademicYear")
|
||||
public R<List<JcbtScholarshipBatchVo>> getByAcademicYearAndSemester(
|
||||
@RequestParam String academicYear,
|
||||
@@ -124,7 +124,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 查询启用状态的批次列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/getActiveBatches")
|
||||
public R<List<JcbtScholarshipBatchVo>> getActiveBatches() {
|
||||
return R.ok(scholarshipBatchService.queryActiveBatches());
|
||||
@@ -133,7 +133,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 检查批次编码是否唯一
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/checkBatchCodeUnique")
|
||||
public R<Boolean> checkBatchCodeUnique(@RequestParam String batchCode,
|
||||
@RequestParam(required = false) Long id) {
|
||||
@@ -143,7 +143,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 更改批次状态
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:edit")
|
||||
@Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestParam Long id, @RequestParam String status) {
|
||||
@@ -153,7 +153,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 查询当前进行中的批次
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/getCurrentActiveBatches")
|
||||
public R<List<JcbtScholarshipBatchVo>> getCurrentActiveBatches() {
|
||||
return R.ok(scholarshipBatchService.queryCurrentActiveBatches());
|
||||
@@ -162,7 +162,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 根据状态查询批次列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@GetMapping("/getByStatus/{status}")
|
||||
public R<List<JcbtScholarshipBatchVo>> getByStatus(@PathVariable String status) {
|
||||
return R.ok(scholarshipBatchService.queryByStatus(status));
|
||||
@@ -171,7 +171,7 @@ public class JcbtScholarshipBatchController extends BaseController {
|
||||
/**
|
||||
* 检查批次时间是否有冲突
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipBatch:query")
|
||||
@PostMapping("/checkTimeConflict")
|
||||
public R<Boolean> checkTimeConflict(@RequestBody JcbtScholarshipBatchBo bo) {
|
||||
return R.ok(scholarshipBatchService.checkTimeConflict(bo));
|
||||
|
||||
+19
-19
@@ -41,7 +41,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 查询奖学金名额分配列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtScholarshipQuotaVo> list(JcbtScholarshipQuotaBo bo, PageQuery pageQuery) {
|
||||
return scholarshipQuotaService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 查询指定批次的名额分配列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
@GetMapping("/listByBatch/{batchId}")
|
||||
public R<List<JcbtScholarshipQuotaVo>> listByBatch(@PathVariable Long batchId) {
|
||||
List<JcbtScholarshipQuotaVo> list = scholarshipQuotaService.queryListByBatchId(batchId);
|
||||
@@ -60,7 +60,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 查询指定批次和奖学金类型的名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
@GetMapping("/listByBatchAndType")
|
||||
public R<List<JcbtScholarshipQuotaVo>> listByBatchAndType(@RequestParam Long batchId,
|
||||
@RequestParam Long scholarshipTypeId) {
|
||||
@@ -71,7 +71,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 查询名额分配树形结构
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
@GetMapping("/tree")
|
||||
public R<List<JcbtScholarshipQuotaVo>> tree(@RequestParam Long batchId,
|
||||
@RequestParam Long scholarshipTypeId) {
|
||||
@@ -82,7 +82,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 查询名额使用统计
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:list")
|
||||
@GetMapping("/statistics/{batchId}")
|
||||
public R<Map<String, Object>> statistics(@PathVariable Long batchId) {
|
||||
Map<String, Object> statistics = scholarshipQuotaService.queryQuotaUsageStatistics(batchId);
|
||||
@@ -92,7 +92,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 导出奖学金名额分配列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:export")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:export")
|
||||
@Log(title = "导出奖学金名额分配", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(JcbtScholarshipQuotaBo bo, HttpServletResponse response) {
|
||||
@@ -103,7 +103,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金名额分配详细信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtScholarshipQuotaVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(scholarshipQuotaService.queryById(id));
|
||||
@@ -112,7 +112,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 新增奖学金名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:add")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:add")
|
||||
@Log(title = "新增奖学金名额分配", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -123,7 +123,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 修改奖学金名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
@Log(title = "修改奖学金名额分配", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -134,7 +134,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 删除奖学金名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:remove")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:remove")
|
||||
@Log(title = "删除奖学金名额分配", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -144,7 +144,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 批量删除奖学金名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:remove")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:remove")
|
||||
@Log(title = "批量删除奖学金名额分配", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/batch")
|
||||
public R<Void> batchRemove(@RequestBody @NotEmpty(message = "主键不能为空") List<Long> ids) {
|
||||
@@ -154,7 +154,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 清空指定批次和奖学金类型的名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:remove")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:remove")
|
||||
@Log(title = "清空奖学金名额分配", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/clear")
|
||||
public R<Void> clearQuotaByBatchAndType(@RequestParam Long batchId,
|
||||
@@ -165,7 +165,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 批量分配名额
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:add")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:add")
|
||||
@Log(title = "批量分配奖学金名额", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchAllocate")
|
||||
@@ -178,7 +178,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 调整名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
@Log(title = "调整奖学金名额分配", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/adjust")
|
||||
@@ -192,7 +192,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 锁定/解锁名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
@Log(title = "锁定/解锁奖学金名额分配", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/lock/{id}")
|
||||
public R<Void> lockQuota(@PathVariable Long id, @RequestParam Integer isLocked) {
|
||||
@@ -202,7 +202,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 自动分配名额
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
@Log(title = "自动分配奖学金名额", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/autoAllocate")
|
||||
@@ -215,7 +215,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 复制名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:add")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:add")
|
||||
@Log(title = "复制奖学金名额分配", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/copy")
|
||||
@@ -228,7 +228,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 更新名额使用情况
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:edit")
|
||||
@Log(title = "更新奖学金名额使用情况", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/updateUsage/{id}")
|
||||
public R<Void> updateUsage(@PathVariable Long id, @RequestParam Integer usedChange) {
|
||||
@@ -238,7 +238,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
|
||||
/**
|
||||
* 验证名额分配
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipQuota:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipQuota:query")
|
||||
@PostMapping("/validate")
|
||||
public R<String> validate(@RequestBody JcbtScholarshipQuotaBo bo) {
|
||||
String validationMsg = scholarshipQuotaService.validateQuotaAllocation(bo);
|
||||
|
||||
+17
-17
@@ -41,7 +41,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 查询奖学金审核记录列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:list")
|
||||
//@SaCheckPermission("jcbt:review:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtScholarshipReviewVo> list(JcbtScholarshipReviewBo bo, PageQuery pageQuery) {
|
||||
return reviewService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 导出奖学金审核记录列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:export")
|
||||
//@SaCheckPermission("jcbt:review:export")
|
||||
@Log(title = "奖学金审核记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(JcbtScholarshipReviewBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金审核记录详细信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:query")
|
||||
//@SaCheckPermission("jcbt:review:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtScholarshipReviewVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -75,7 +75,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 根据申请ID查询审核记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:query")
|
||||
//@SaCheckPermission("jcbt:review:query")
|
||||
@GetMapping("/application/{applicationId}")
|
||||
public R<List<JcbtScholarshipReviewVo>> getReviewsByApplicationId(
|
||||
@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
|
||||
@@ -85,7 +85,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 查询当前用户待审核的记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:pending")
|
||||
//@SaCheckPermission("jcbt:review:pending")
|
||||
@GetMapping("/pending")
|
||||
public TableDataInfo<JcbtScholarshipReviewVo> getPendingReviews(
|
||||
@RequestParam(required = false) Long reviewerId,
|
||||
@@ -99,7 +99,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 查询审核历史记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:history")
|
||||
//@SaCheckPermission("jcbt:review:history")
|
||||
@GetMapping("/history")
|
||||
public TableDataInfo<JcbtScholarshipReviewVo> getReviewHistory(
|
||||
@RequestParam(required = false) Long reviewerId,
|
||||
@@ -114,7 +114,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 提交审核结果
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:approve")
|
||||
//@SaCheckPermission("jcbt:review:approve")
|
||||
@Log(title = "提交审核结果", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/submit")
|
||||
@@ -130,7 +130,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 批量审核
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:batchApprove")
|
||||
//@SaCheckPermission("jcbt:review:batchApprove")
|
||||
@Log(title = "批量审核", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batch")
|
||||
@@ -149,7 +149,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 转移审核任务
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:transfer")
|
||||
//@SaCheckPermission("jcbt:review:transfer")
|
||||
@Log(title = "转移审核任务", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/transfer")
|
||||
@@ -164,7 +164,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 撤回审核结果
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:revoke")
|
||||
//@SaCheckPermission("jcbt:review:revoke")
|
||||
@Log(title = "撤回审核结果", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/withdraw")
|
||||
@@ -177,7 +177,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 查询某个申请的最新审核记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:query")
|
||||
//@SaCheckPermission("jcbt:review:query")
|
||||
@GetMapping("/latest/{applicationId}")
|
||||
public R<JcbtScholarshipReviewVo> getLatestReview(
|
||||
@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
|
||||
@@ -187,7 +187,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 查询某个申请的指定级别审核记录
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:query")
|
||||
//@SaCheckPermission("jcbt:review:query")
|
||||
@GetMapping("/level/{applicationId}/{reviewLevel}")
|
||||
public R<JcbtScholarshipReviewVo> getReviewByLevel(
|
||||
@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
|
||||
@@ -198,7 +198,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 统计审核数量
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:statistics")
|
||||
//@SaCheckPermission("jcbt:review:statistics")
|
||||
@GetMapping("/statistics/count")
|
||||
public R<Map<String, Long>> getReviewCount(
|
||||
@RequestParam(required = false) Long reviewerId,
|
||||
@@ -211,7 +211,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 获取下一级审核人员列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:query")
|
||||
//@SaCheckPermission("jcbt:review:query")
|
||||
@GetMapping("/next-reviewers/{applicationId}/{currentLevel}")
|
||||
public R<List<Long>> getNextReviewers(
|
||||
@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
|
||||
@@ -222,7 +222,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 审核流程推进
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:approve")
|
||||
//@SaCheckPermission("jcbt:review:approve")
|
||||
@Log(title = "审核流程推进", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/advance")
|
||||
@@ -238,7 +238,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 检查用户审核权限
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:query")
|
||||
//@SaCheckPermission("jcbt:review:query")
|
||||
@GetMapping("/permission")
|
||||
public R<Boolean> checkReviewPermission(
|
||||
@NotNull(message = "审核人ID不能为空") @RequestParam Long reviewerId,
|
||||
@@ -250,7 +250,7 @@ public class JcbtScholarshipReviewController extends BaseController {
|
||||
/**
|
||||
* 获取审核统计信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:review:statistics")
|
||||
//@SaCheckPermission("jcbt:review:statistics")
|
||||
@GetMapping("/statistics")
|
||||
public R<Map<String, Object>> getReviewStatistics(
|
||||
@RequestParam(required = false) Long reviewerId,
|
||||
|
||||
+19
-19
@@ -47,7 +47,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 查询奖学金类型列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:list")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtScholarshipTypeVo> list(JcbtScholarshipTypeBo bo, PageQuery pageQuery) {
|
||||
return scholarshipTypeService.queryPageList(bo, pageQuery);
|
||||
@@ -56,7 +56,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 导出奖学金类型列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:export")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:export")
|
||||
@Log(title = "奖学金类型", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(JcbtScholarshipTypeBo bo, HttpServletResponse response) {
|
||||
@@ -67,7 +67,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金类型详细信息
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtScholarshipTypeVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -77,7 +77,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 新增奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:add")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:add")
|
||||
@Log(title = "奖学金类型", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -88,7 +88,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 修改奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:edit")
|
||||
@Log(title = "奖学金类型", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -99,7 +99,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 删除奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:remove")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:remove")
|
||||
@Log(title = "奖学金类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -110,7 +110,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 根据类型名称查询奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/getByName/{typeName}")
|
||||
public R<JcbtScholarshipTypeVo> getByTypeName(@PathVariable String typeName) {
|
||||
return R.ok(scholarshipTypeService.queryByTypeName(typeName));
|
||||
@@ -119,7 +119,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 根据类别查询奖学金类型列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/getByCategory/{typeCategory}")
|
||||
public R<List<JcbtScholarshipTypeVo>> getByCategory(@PathVariable String typeCategory) {
|
||||
return R.ok(scholarshipTypeService.queryByCategory(typeCategory));
|
||||
@@ -128,7 +128,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 查询启用状态的奖学金类型列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/getActiveTypes")
|
||||
public R<List<JcbtScholarshipTypeVo>> getActiveTypes() {
|
||||
return R.ok(scholarshipTypeService.queryActiveTypes());
|
||||
@@ -137,7 +137,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 检查奖学金名称是否重复
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/checkTypeNameUnique")
|
||||
public R<Boolean> checkTypeNameUnique(@RequestParam String typeName,
|
||||
@RequestParam(required = false) Long id) {
|
||||
@@ -147,7 +147,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 批量更新排序号
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:edit")
|
||||
@Log(title = "奖学金类型", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/batchUpdateSort")
|
||||
public R<Void> batchUpdateSortOrder(@RequestBody List<JcbtScholarshipTypeBo> scholarshipTypes) {
|
||||
@@ -157,7 +157,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 根据兼得类型查询相关奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/getByCompatibilityType/{compatibilityType}")
|
||||
public R<List<JcbtScholarshipTypeVo>> getByCompatibilityType(@PathVariable String compatibilityType) {
|
||||
return R.ok(scholarshipTypeService.queryByCompatibilityType(compatibilityType));
|
||||
@@ -166,7 +166,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 启用/停用奖学金类型
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:edit")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:edit")
|
||||
@Log(title = "奖学金类型", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestParam Long id, @RequestParam Integer status) {
|
||||
@@ -176,7 +176,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金类型选项列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/options")
|
||||
public R<List<JcbtScholarshipTypeVo>> getOptions() {
|
||||
return R.ok(scholarshipTypeService.queryOptions());
|
||||
@@ -185,7 +185,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金类型的兼得关系配置
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:compatibility")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:compatibility")
|
||||
@GetMapping("/{id}/compatibility")
|
||||
public R<Map<String, Object>> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
// 获取所有启用的奖学金类型(除了当前奖学金)
|
||||
@@ -224,7 +224,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 保存奖学金类型的兼得关系配置
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:compatibility")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:compatibility")
|
||||
@Log(title = "奖学金兼得关系配置", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/{id}/compatibility")
|
||||
public R<Void> saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id,
|
||||
@@ -270,7 +270,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 检查两个奖学金类型是否兼容
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/checkCompatibility")
|
||||
public R<Boolean> checkCompatibility(@RequestParam Long typeId1, @RequestParam Long typeId2) {
|
||||
return R.ok(compatibilityService.checkCompatibility(typeId1, typeId2));
|
||||
@@ -279,7 +279,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 获取可与指定奖学金兼得的奖学金类型列表
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/{id}/compatibleTypes")
|
||||
public R<List<JcbtScholarshipTypeVo>> getCompatibleTypes(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
List<Long> compatibleTypeIds = compatibilityService.getCompatibleTypeIds(id);
|
||||
@@ -298,7 +298,7 @@ public class JcbtScholarshipTypeController extends BaseController {
|
||||
/**
|
||||
* 获取奖学金类型的互斥关系显示文本
|
||||
*/
|
||||
@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
//@SaCheckPermission("jcbt:scholarshipType:query")
|
||||
@GetMapping("/{id}/exclusiveRelationDisplay")
|
||||
public R<String> getExclusiveRelationDisplay(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(scholarshipTypeService.getExclusiveRelationDisplay(id));
|
||||
|
||||
+8
-8
@@ -52,7 +52,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 查询本学院待审核申请列表
|
||||
*/
|
||||
@Operation(summary = "查询本学院待审核申请列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/pendingList")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> pendingList(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
// 获取当前用户的学院ID
|
||||
@@ -75,7 +75,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 查询本学院所有申请列表(支持多状态筛选)
|
||||
*/
|
||||
@Operation(summary = "查询本学院所有申请列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> list(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
// 获取当前用户的学院ID
|
||||
@@ -108,7 +108,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 获取本学院申请详情
|
||||
*/
|
||||
@Operation(summary = "获取本学院申请详情")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtWorkStudyApplicationVo> getInfo(@PathVariable Long id) {
|
||||
// 获取申请信息
|
||||
@@ -146,7 +146,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 学院审核
|
||||
*/
|
||||
@Operation(summary = "学院审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@Log(title = "勤工俭学申请学院审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/review")
|
||||
public R<Void> review(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) {
|
||||
@@ -168,7 +168,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 批量学院审核
|
||||
*/
|
||||
@Operation(summary = "批量学院审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@Log(title = "勤工俭学申请批量学院审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/batchReview")
|
||||
public R<Void> batchReview(
|
||||
@@ -198,7 +198,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 获取本学院申请统计信息
|
||||
*/
|
||||
@Operation(summary = "获取本学院申请统计信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/statistics")
|
||||
public R<Map<String, Object>> getStatistics() {
|
||||
Long currentUserCollegeId = getCurrentUserCollegeIdAsLong();
|
||||
@@ -246,7 +246,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 获取可用选项
|
||||
*/
|
||||
@Operation(summary = "获取可用选项")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/options")
|
||||
public R<Map<String, Object>> getOptions() {
|
||||
Map<String, Object> options = Map.of(
|
||||
@@ -273,7 +273,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
|
||||
* 调试权限信息 - 查看当前用户的学院关联情况
|
||||
*/
|
||||
@Operation(summary = "调试权限信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/debug/permission")
|
||||
public R<Map<String, Object>> debugPermission() {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
|
||||
+16
-16
@@ -89,7 +89,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 修改勤工俭学申请信息
|
||||
*/
|
||||
@Operation(summary = "修改勤工俭学申请信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:edit")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:edit")
|
||||
@Log(title = "勤工俭学申请信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -101,7 +101,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 删除勤工俭学申请信息
|
||||
*/
|
||||
@Operation(summary = "删除勤工俭学申请信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:remove")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:remove")
|
||||
@Log(title = "勤工俭学申请信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -112,7 +112,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 导出勤工俭学申请信息列表
|
||||
*/
|
||||
@Operation(summary = "导出勤工俭学申请信息列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:export")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:export")
|
||||
@Log(title = "勤工俭学申请信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(JcbtWorkStudyApplicationBo bo, HttpServletResponse response) {
|
||||
@@ -171,7 +171,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 查询我的申请列表
|
||||
*/
|
||||
@Operation(summary = "查询我的申请列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:myList")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:myList")
|
||||
@GetMapping("/myList")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> myList(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
return workStudyApplicationService.queryMyApplications(bo, pageQuery);
|
||||
@@ -181,7 +181,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 查询待学院审核列表
|
||||
*/
|
||||
@Operation(summary = "查询待学院审核列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@GetMapping("/pendingCollegeReview")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> pendingCollegeReview(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
return workStudyApplicationService.queryPendingCollegeReview(bo, pageQuery);
|
||||
@@ -191,7 +191,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 查询待学生处审核列表
|
||||
*/
|
||||
@Operation(summary = "查询待学生处审核列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:finalReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:finalReview")
|
||||
@GetMapping("/pendingFinalReview")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> pendingFinalReview(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
return workStudyApplicationService.queryPendingFinalReview(bo, pageQuery);
|
||||
@@ -201,7 +201,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 获取岗位申请统计信息
|
||||
*/
|
||||
@Operation(summary = "获取岗位申请统计信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:statistics")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:statistics")
|
||||
@GetMapping("/statistics/{positionId}")
|
||||
public R<Map<String, Object>> getStatistics(@PathVariable Long positionId) {
|
||||
return R.ok(workStudyApplicationService.getPositionApplicationStatistics(positionId));
|
||||
@@ -213,7 +213,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 提交申请
|
||||
*/
|
||||
@Operation(summary = "提交申请")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:submit")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:submit")
|
||||
@Log(title = "勤工俭学申请", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/submit/{id}")
|
||||
public R<Void> submitApplication(@PathVariable Long id) {
|
||||
@@ -224,7 +224,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 撤销申请
|
||||
*/
|
||||
@Operation(summary = "撤销申请")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:cancel")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:cancel")
|
||||
@Log(title = "勤工俭学申请", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/cancel/{id}")
|
||||
public R<Void> cancelApplication(@PathVariable Long id) {
|
||||
@@ -235,7 +235,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 学院审核
|
||||
*/
|
||||
@Operation(summary = "学院审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@Log(title = "勤工俭学申请学院审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/collegeReview")
|
||||
public R<Void> collegeReview(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) {
|
||||
@@ -246,7 +246,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 学生处审核
|
||||
*/
|
||||
@Operation(summary = "学生处审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:finalReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:finalReview")
|
||||
@Log(title = "勤工俭学申请学生处审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/finalReview")
|
||||
public R<Void> finalReview(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) {
|
||||
@@ -257,7 +257,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 批量学院审核
|
||||
*/
|
||||
@Operation(summary = "批量学院审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
|
||||
@Log(title = "勤工俭学申请批量学院审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/batchCollegeReview")
|
||||
public R<Void> batchCollegeReview(
|
||||
@@ -271,7 +271,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 批量学生处审核
|
||||
*/
|
||||
@Operation(summary = "批量学生处审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:finalReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:finalReview")
|
||||
@Log(title = "勤工俭学申请批量学生处审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/batchFinalReview")
|
||||
public R<Void> batchFinalReview(
|
||||
@@ -289,7 +289,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 检查学生是否已申请该岗位
|
||||
*/
|
||||
@Operation(summary = "检查学生是否已申请该岗位")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:check")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:check")
|
||||
@GetMapping("/hasApplied")
|
||||
public R<Boolean> hasApplied(@RequestParam Long studentId, @RequestParam Long positionId) {
|
||||
return R.ok(workStudyApplicationService.hasApplied(studentId, positionId));
|
||||
@@ -299,7 +299,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
* 获取可用选项
|
||||
*/
|
||||
@Operation(summary = "获取可用选项")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:options")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:options")
|
||||
@GetMapping("/options")
|
||||
public R<Map<String, Object>> getOptions() {
|
||||
Map<String, Object> options = Map.of(
|
||||
@@ -351,7 +351,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
|
||||
*/
|
||||
@Operation(summary = "获取学生已申请岗位列表")
|
||||
@GetMapping("/student/applicationStatus")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:query")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:query")
|
||||
public R<List<Map<String, Object>>> getStudentApplicationStatus() {
|
||||
|
||||
List<Map<String, Object>> statusList = workStudyApplicationService.getStudentApplicationStatus();
|
||||
|
||||
+8
-8
@@ -49,7 +49,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 查询待学工处审核申请列表(学院审核通过的申请)
|
||||
*/
|
||||
@Operation(summary = "查询待学工处审核申请列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@GetMapping("/pendingList")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> pendingList(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
// 只查询学院审核通过状态的申请(待学工处审核)
|
||||
@@ -62,7 +62,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 查询学工处审核历史列表(支持多状态筛选)
|
||||
*/
|
||||
@Operation(summary = "查询学工处审核历史列表")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtWorkStudyApplicationVo> list(JcbtWorkStudyApplicationBo bo, PageQuery pageQuery) {
|
||||
// 学工处可查看所有相关状态的申请
|
||||
@@ -82,7 +82,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 获取勤工俭学申请详情
|
||||
*/
|
||||
@Operation(summary = "获取勤工俭学申请详情")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtWorkStudyApplicationVo> getInfo(@Parameter(description = "主键") @PathVariable Long id) {
|
||||
JcbtWorkStudyApplicationVo vo = workStudyApplicationService.queryById(id);
|
||||
@@ -106,7 +106,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 学工处审核申请
|
||||
*/
|
||||
@Operation(summary = "学工处审核申请")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@Log(title = "勤工俭学申请学工处审核", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/review")
|
||||
public R<Void> review(@Validated @RequestBody WorkStudyApplicationReviewBo reviewBo) {
|
||||
@@ -137,7 +137,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 批量学工处审核
|
||||
*/
|
||||
@Operation(summary = "批量学工处审核")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@Log(title = "勤工俭学申请批量学工处审核", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/batchReview")
|
||||
public R<Void> batchReview(
|
||||
@@ -179,7 +179,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 获取学工处审核统计信息
|
||||
*/
|
||||
@Operation(summary = "获取学工处审核统计信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@GetMapping("/statistics")
|
||||
public R<Map<String, Object>> getStatistics() {
|
||||
// 构建查询条件
|
||||
@@ -225,7 +225,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 获取按学院分组的统计信息
|
||||
*/
|
||||
@Operation(summary = "获取按学院分组的统计信息")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@GetMapping("/statisticsByCollege")
|
||||
public R<Map<String, Object>> getStatisticsByCollege() {
|
||||
// 构建查询条件
|
||||
@@ -255,7 +255,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
|
||||
* 获取可用选项
|
||||
*/
|
||||
@Operation(summary = "获取可用选项")
|
||||
@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
|
||||
@GetMapping("/options")
|
||||
public R<Map<String, Object>> getOptions() {
|
||||
Map<String, Object> options = Map.of(
|
||||
|
||||
+23
-23
@@ -58,7 +58,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 查询勤工俭学岗位信息列表
|
||||
*/
|
||||
@Operation(summary = "查询勤工俭学岗位信息列表")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:list")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<JcbtWorkStudyPositionVo> list(JcbtWorkStudyPositionBo bo, PageQuery pageQuery) {
|
||||
return workStudyPositionService.queryPageList(bo, pageQuery);
|
||||
@@ -68,7 +68,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 获取勤工俭学岗位信息详细信息
|
||||
*/
|
||||
@Operation(summary = "获取勤工俭学岗位信息详细信息")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:query")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<JcbtWorkStudyPositionVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@Parameter(description = "岗位ID", required = true)
|
||||
@@ -80,7 +80,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 获取岗位详情及当前用户申请状态
|
||||
*/
|
||||
@Operation(summary = "获取岗位详情及当前用户申请状态")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:query")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:query")
|
||||
@GetMapping("/{id}/withApplicationStatus")
|
||||
public R<Map<String, Object>> getPositionWithApplicationStatus(@NotNull(message = "主键不能为空")
|
||||
@Parameter(description = "岗位ID", required = true)
|
||||
@@ -108,7 +108,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 新增勤工俭学岗位信息
|
||||
*/
|
||||
@Operation(summary = "新增勤工俭学岗位信息")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:add")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:add")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -120,7 +120,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 修改勤工俭学岗位信息
|
||||
*/
|
||||
@Operation(summary = "修改勤工俭学岗位信息")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:edit")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:edit")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -132,7 +132,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 删除勤工俭学岗位信息
|
||||
*/
|
||||
@Operation(summary = "删除勤工俭学岗位信息")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:remove")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:remove")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -145,7 +145,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 导出勤工俭学岗位信息列表
|
||||
*/
|
||||
@Operation(summary = "导出勤工俭学岗位信息列表")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:export")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:export")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(JcbtWorkStudyPositionBo bo, HttpServletResponse response) {
|
||||
@@ -159,7 +159,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 我的岗位 - 查询当前用户所在学院的岗位
|
||||
*/
|
||||
@Operation(summary = "我的岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:myList")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:myList")
|
||||
@GetMapping("/myList")
|
||||
public TableDataInfo<JcbtWorkStudyPositionVo> myList(PageQuery pageQuery) {
|
||||
// TODO: 获取当前用户所在学院ID
|
||||
@@ -171,7 +171,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 可见岗位 - 查询学院可见的岗位(本学院岗位 + 全校范围岗位)
|
||||
*/
|
||||
@Operation(summary = "可见岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:visibleList")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:visibleList")
|
||||
@GetMapping("/visibleList")
|
||||
public TableDataInfo<JcbtWorkStudyPositionVo> visibleList(
|
||||
JcbtWorkStudyPositionBo bo,
|
||||
@@ -208,7 +208,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 岗位状态检查 - 检查岗位是否可以申请
|
||||
*/
|
||||
@Operation(summary = "岗位状态检查")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:checkAvailable")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:checkAvailable")
|
||||
@GetMapping("/checkAvailable/{id}")
|
||||
public R<Boolean> checkAvailable(@NotNull(message = "主键不能为空")
|
||||
@Parameter(description = "岗位ID", required = true)
|
||||
@@ -220,7 +220,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 岗位统计 - 获取岗位统计信息
|
||||
*/
|
||||
@Operation(summary = "岗位统计")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:statistics")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:statistics")
|
||||
@GetMapping("/statistics")
|
||||
public R<Map<String, Object>> statistics(@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) {
|
||||
return R.ok(workStudyPositionService.getPositionStatistics(collegeId));
|
||||
@@ -232,7 +232,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 发布岗位
|
||||
*/
|
||||
@Operation(summary = "发布岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:publish")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:publish")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/publish/{id}")
|
||||
public R<Void> publish(@NotNull(message = "主键不能为空")
|
||||
@@ -245,7 +245,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 开启招录
|
||||
*/
|
||||
@Operation(summary = "开启招录")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:startRecruiting")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:startRecruiting")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/startRecruiting/{id}")
|
||||
public R<Void> startRecruiting(@NotNull(message = "主键不能为空")
|
||||
@@ -258,7 +258,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 暂停招录
|
||||
*/
|
||||
@Operation(summary = "暂停招录")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:suspend")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:suspend")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/suspend/{id}")
|
||||
public R<Void> suspend(@NotNull(message = "主键不能为空")
|
||||
@@ -271,7 +271,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 取消岗位
|
||||
*/
|
||||
@Operation(summary = "取消岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:cancel")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:cancel")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/cancel/{id}")
|
||||
public R<Void> cancel(@NotNull(message = "主键不能为空")
|
||||
@@ -284,7 +284,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 批量更新状态
|
||||
*/
|
||||
@Operation(summary = "批量更新状态")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:batchUpdateStatus")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:batchUpdateStatus")
|
||||
@Log(title = "勤工俭学岗位信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/batchUpdateStatus")
|
||||
public R<Void> batchUpdateStatus(@RequestParam @NotEmpty(message = "岗位ID列表不能为空") List<Long> ids,
|
||||
@@ -296,7 +296,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 按状态分组统计
|
||||
*/
|
||||
@Operation(summary = "按状态分组统计")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:countByStatus")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:countByStatus")
|
||||
@GetMapping("/countByStatus")
|
||||
public R<List<Map<String, Object>>> countByStatus(@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) {
|
||||
return R.ok(workStudyPositionService.countByStatus(collegeId));
|
||||
@@ -341,7 +341,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 根据状态查询岗位
|
||||
*/
|
||||
@Operation(summary = "根据状态查询岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:queryByStatus")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:queryByStatus")
|
||||
@GetMapping("/queryByStatus")
|
||||
public TableDataInfo<JcbtWorkStudyPositionVo> queryByStatus(@RequestParam String status, PageQuery pageQuery) {
|
||||
return workStudyPositionService.queryByStatus(status, pageQuery);
|
||||
@@ -351,7 +351,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 根据发布范围查询岗位
|
||||
*/
|
||||
@Operation(summary = "根据发布范围查询岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:queryByScope")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:queryByScope")
|
||||
@GetMapping("/queryByScope")
|
||||
public TableDataInfo<JcbtWorkStudyPositionVo> queryByScope(@RequestParam String positionScope, PageQuery pageQuery) {
|
||||
return workStudyPositionService.queryByPositionScope(positionScope, pageQuery);
|
||||
@@ -361,7 +361,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 即将过期的岗位
|
||||
*/
|
||||
@Operation(summary = "即将过期的岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:expiringPositions")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:expiringPositions")
|
||||
@GetMapping("/expiringPositions")
|
||||
public R<List<JcbtWorkStudyPositionVo>> expiringPositions(@RequestParam(defaultValue = "7") int days) {
|
||||
return R.ok(workStudyPositionService.getExpiringPositions(days));
|
||||
@@ -371,7 +371,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 热门岗位
|
||||
*/
|
||||
@Operation(summary = "热门岗位")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:popularPositions")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:popularPositions")
|
||||
@GetMapping("/popularPositions")
|
||||
public R<List<JcbtWorkStudyPositionVo>> popularPositions(@RequestParam(defaultValue = "10") int limit) {
|
||||
return R.ok(workStudyPositionService.getPopularPositions(limit));
|
||||
@@ -383,7 +383,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 更新过期岗位状态(定时任务调用)
|
||||
*/
|
||||
@Operation(summary = "更新过期岗位状态")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:updateExpired")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:updateExpired")
|
||||
@PostMapping("/updateExpired")
|
||||
public R<Integer> updateExpiredPositions() {
|
||||
int count = workStudyPositionService.updateExpiredPositions();
|
||||
@@ -394,7 +394,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
|
||||
* 更新满员岗位状态(定时任务调用)
|
||||
*/
|
||||
@Operation(summary = "更新满员岗位状态")
|
||||
@SaCheckPermission("jcbt:workStudyPosition:updateFull")
|
||||
//@SaCheckPermission("jcbt:workStudyPosition:updateFull")
|
||||
@PostMapping("/updateFull")
|
||||
public R<Integer> updateFullPositions() {
|
||||
int count = workStudyPositionService.updateFullPositions();
|
||||
|
||||
+37
-37
@@ -77,7 +77,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询出国申请列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<RsOverseasApplicationVo> list(RsOverseasApplicationQuery query) {
|
||||
query.setTenantId(LoginHelper.getTenantId()); // 设置租户ID
|
||||
@@ -87,7 +87,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询我的出国申请列表(排除已通过的申请,已通过的申请显示在出国记录中)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/my/list")
|
||||
public TableDataInfo<RsOverseasApplicationVo> myList(RsOverseasApplicationQuery query) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -98,10 +98,10 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
|
||||
/**
|
||||
* 查询当前用户的待审批申请列表(五级审批模式)
|
||||
*
|
||||
*
|
||||
* @deprecated 已废弃,请使用 pendingPageList 方法(支持分页和搜索)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseasapproval:list")
|
||||
// @SaCheckPermission("rs:overseasapproval:list")
|
||||
@GetMapping("/pending/list")
|
||||
public R<List<RsOverseasApplicationVo>> pendingList() {
|
||||
List<RsOverseasApplicationVo> list = applicationService.queryPendingByCurrentUser();
|
||||
@@ -126,7 +126,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
* - college_leader_role → approval_level='4'
|
||||
* - party_secretary_role → approval_level='5'
|
||||
*/
|
||||
@SaCheckPermission("rs:overseasapproval:list")
|
||||
// @SaCheckPermission("rs:overseasapproval:list")
|
||||
@GetMapping("/pending/page")
|
||||
public TableDataInfo<RsOverseasApplicationVo> pendingPageList(RsOverseasApplicationQuery query) {
|
||||
return applicationService.queryPendingPageListByRole(query);
|
||||
@@ -148,7 +148,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 根据状态查询申请列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/status/{status}")
|
||||
public R<List<RsOverseasApplicationVo>> listByStatus(@PathVariable String status) {
|
||||
List<RsOverseasApplicationVo> list = applicationService.queryByStatus(status);
|
||||
@@ -158,7 +158,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 导出出国申请列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:export")
|
||||
// @SaCheckPermission("rs:overseas:export")
|
||||
@Log(title = "出国申请", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(RsOverseasApplicationQuery query, HttpServletResponse response) {
|
||||
@@ -177,7 +177,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取出国申请详细信息
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/detail/{applicationId}")
|
||||
public R<RsOverseasApplicationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long applicationId) {
|
||||
return R.ok(applicationService.queryById(applicationId));
|
||||
@@ -186,7 +186,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取申请人的部门负责人ID
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/dept-approver/{applicationId}")
|
||||
public R<Long> getDepartmentApproverId(@PathVariable Long applicationId) {
|
||||
RsOverseasApplicationVo application = applicationService.queryById(applicationId);
|
||||
@@ -203,7 +203,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 新增出国申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@Log(title = "出国申请", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Map<String, Object>> add(@Validated(AddGroup.class) @RequestBody RsOverseasApplicationBo bo) {
|
||||
@@ -250,7 +250,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 修改出国申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:edit")
|
||||
// @SaCheckPermission("rs:overseas:edit")
|
||||
@Log(title = "出国申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsOverseasApplicationBo bo) {
|
||||
@@ -260,7 +260,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 提交出国申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:submit")
|
||||
// @SaCheckPermission("rs:overseas:submit")
|
||||
@Log(title = "提交出国申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/submit/{applicationId}")
|
||||
public R<Void> submit(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
|
||||
@@ -292,7 +292,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 重新提交被拒绝的出国申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:edit")
|
||||
// @SaCheckPermission("rs:overseas:edit")
|
||||
@Log(title = "重新提交出国申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/resubmit/{applicationId}")
|
||||
public R<Void> resubmit(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
|
||||
@@ -304,7 +304,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
* 校验出国申请前置条件
|
||||
* 用于前端在填写表单时实时提示用户
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/validatePrerequisites")
|
||||
public R<java.util.Map<String, Object>> validatePrerequisites(
|
||||
@RequestParam(required = false) String politicalStatus,
|
||||
@@ -324,7 +324,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 取消出国申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:cancel")
|
||||
// @SaCheckPermission("rs:overseas:cancel")
|
||||
@Log(title = "取消出国申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/cancel/{applicationId}")
|
||||
public R<Void> cancel(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
|
||||
@@ -336,14 +336,14 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
* 审批出国申请(支持标准工作流模式)
|
||||
* 🔴 支持五级审批权限:满足任一级别权限即可访问接口,具体级别在Service层验证
|
||||
*/
|
||||
@SaCheckPermission(value = {
|
||||
"rs:overseas:approve", // 通用审批权限(超级管理员/高级审批者)
|
||||
"rs:overseas:approve1", // 第1级:部门负责人
|
||||
"rs:overseas:approve2", // 第2级:人事处
|
||||
"rs:overseas:approve3", // 第3级:纪委
|
||||
"rs:overseas:approve4", // 第4级:学院分管领导
|
||||
"rs:overseas:approve5" // 第5级:学院党委书记
|
||||
}, mode = SaMode.OR) // 🔴 关键:OR模式,满足任一权限即可通过
|
||||
// @SaCheckPermission(value = {
|
||||
// "rs:overseas:approve", // 通用审批权限(超级管理员/高级审批者)
|
||||
// "rs:overseas:approve1", // 第1级:部门负责人
|
||||
// "rs:overseas:approve2", // 第2级:人事处
|
||||
// "rs:overseas:approve3", // 第3级:纪委
|
||||
// "rs:overseas:approve4", // 第4级:学院分管领导
|
||||
// "rs:overseas:approve5" // 第5级:学院党委书记
|
||||
// }, mode = SaMode.OR) // 🔴 关键:OR模式,满足任一权限即可通过
|
||||
@Log(title = "审批出国申请", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/approve")
|
||||
public R<Void> approve(@RequestBody ApprovalRequest request) {
|
||||
@@ -363,7 +363,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 批量删除出国申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:remove")
|
||||
// @SaCheckPermission("rs:overseas:remove")
|
||||
@Log(title = "出国申请", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{applicationIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List<Long> applicationIds) {
|
||||
@@ -373,7 +373,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询出国申请审批历史
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/approval/history/{applicationId}")
|
||||
public R<List<RsOverseasApprovalVo>> getApprovalHistory(@PathVariable("applicationId") Long applicationId) {
|
||||
List<RsOverseasApprovalVo> approvalList = overseasApprovalService
|
||||
@@ -384,7 +384,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 修复已审批通过但未创建记录的申请
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:approve")
|
||||
// @SaCheckPermission("rs:overseas:approve")
|
||||
@Log(title = "修复出国记录", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/fix/records")
|
||||
public R<String> fixApprovedRecords() {
|
||||
@@ -452,7 +452,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 生成出国申请登记表PDF
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:generate")
|
||||
// @SaCheckPermission("rs:overseas:generate")
|
||||
@PostMapping("/generateRegistrationForm")
|
||||
@Log(title = "生成出国申请登记表", businessType = BusinessType.OTHER)
|
||||
public R<RegistrationFormVO> generateRegistrationForm(@RequestBody @Validated GenerateRegistrationFormBo bo) {
|
||||
@@ -463,7 +463,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 下载生成的PDF文档
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:download")
|
||||
// @SaCheckPermission("rs:overseas:download")
|
||||
@GetMapping("/downloadPdf/{documentId}")
|
||||
public void downloadPdf(@PathVariable String documentId, HttpServletResponse response) {
|
||||
registrationFormService.downloadPdf(documentId, response);
|
||||
@@ -472,7 +472,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 预览生成的PDF文档
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:preview")
|
||||
// @SaCheckPermission("rs:overseas:preview")
|
||||
@GetMapping("/previewPdf/{documentId}")
|
||||
public void previewPdf(@PathVariable String documentId, HttpServletResponse response) {
|
||||
registrationFormService.downloadPdf(documentId, response);
|
||||
@@ -482,10 +482,10 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
|
||||
/**
|
||||
* 根据申请人ID获取部门审批人ID
|
||||
*
|
||||
*
|
||||
* @param applicantId 申请人ID
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/getDepartmentApproverByApplicant/{applicantId}")
|
||||
public R<Long> getDepartmentApproverByApplicant(@PathVariable Long applicantId) {
|
||||
Long departmentApproverId = applicationService.getDepartmentApproverId(applicantId);
|
||||
@@ -494,10 +494,10 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
|
||||
/**
|
||||
* 根据申请人ID获取人事处审批人列表
|
||||
*
|
||||
*
|
||||
* @param applicantId 申请人ID
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/getHrApprovers/{applicantId}")
|
||||
public R<List<Long>> getHrApprovers(@PathVariable Long applicantId) {
|
||||
List<Long> hrApprovers = applicationService.getHrApprovers(applicantId);
|
||||
@@ -509,7 +509,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 上传登记备案表盖章文件
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@PostMapping("/uploadStampedFile")
|
||||
@Log(title = "上传盖章文件", businessType = BusinessType.OTHER)
|
||||
public R<Map<String, Object>> uploadStampedFile(@RequestParam("file") MultipartFile file,
|
||||
@@ -552,7 +552,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 下载盖章文件(安全下载)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/downloadStampedFile/{applicationId}")
|
||||
public void downloadStampedFile(@PathVariable Long applicationId, HttpServletResponse response) {
|
||||
try {
|
||||
@@ -576,7 +576,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 上传党籍保留附件
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@PostMapping("/uploadPartyRetentionFile")
|
||||
@Log(title = "上传党籍保留附件", businessType = BusinessType.OTHER)
|
||||
public R<Map<String, Object>> uploadPartyRetentionFile(@RequestParam("file") MultipartFile file,
|
||||
@@ -619,7 +619,7 @@ public class RsOverseasApplicationController extends BaseController {
|
||||
/**
|
||||
* 下载党籍保留附件(安全下载)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/downloadPartyRetentionFile/{applicationId}")
|
||||
public void downloadPartyRetentionFile(@PathVariable Long applicationId, HttpServletResponse response) {
|
||||
try {
|
||||
|
||||
+11
-11
@@ -52,7 +52,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 查询出国审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<RsOverseasApprovalVo> list(RsOverseasApprovalQuery query) {
|
||||
return approvalService.queryPageList(query);
|
||||
@@ -61,7 +61,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 查询我的审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/my/list")
|
||||
public TableDataInfo<RsOverseasApprovalVo> myList(RsOverseasApprovalQuery query) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -72,7 +72,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 联合查询出国审批记录列表(包含待审批申请和已审批记录)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/combined/list")
|
||||
public TableDataInfo<RsOverseasApprovalVo> combinedList(RsOverseasApprovalQuery query) {
|
||||
return approvalService.queryCombinedPageList(query);
|
||||
@@ -81,7 +81,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 调试接口:查看当前用户的权限过滤情况
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/debug/permission")
|
||||
public R<Map<String, Object>> debugPermission(RsOverseasApprovalQuery query) {
|
||||
Map<String, Object> debugInfo = new HashMap<>();
|
||||
@@ -115,7 +115,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 根据申请ID查询审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/application/{applicationId}")
|
||||
public R<List<RsOverseasApprovalVo>> getByApplicationId(@PathVariable Long applicationId) {
|
||||
List<RsOverseasApprovalVo> list = approvalService.queryByApplicationId(applicationId);
|
||||
@@ -125,7 +125,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 导出出国审批记录列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:export")
|
||||
// @SaCheckPermission("rs:overseas:export")
|
||||
@Log(title = "出国审批记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(RsOverseasApprovalQuery query, HttpServletResponse response) {
|
||||
@@ -136,7 +136,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 获取出国审批记录详细信息
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/{approvalId}")
|
||||
public R<RsOverseasApprovalVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long approvalId) {
|
||||
return R.ok(approvalService.queryById(approvalId));
|
||||
@@ -145,7 +145,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 新增出国审批记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@Log(title = "出国审批记录", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody RsOverseasApprovalBo bo) {
|
||||
@@ -158,7 +158,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 修改出国审批记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:edit")
|
||||
// @SaCheckPermission("rs:overseas:edit")
|
||||
@Log(title = "出国审批记录", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsOverseasApprovalBo bo) {
|
||||
@@ -168,7 +168,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 批量删除出国审批记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:remove")
|
||||
// @SaCheckPermission("rs:overseas:remove")
|
||||
@Log(title = "出国审批记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{approvalIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List<Long> approvalIds) {
|
||||
@@ -178,7 +178,7 @@ public class RsOverseasApprovalController extends BaseController {
|
||||
/**
|
||||
* 修复审批记录测试数据
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:edit")
|
||||
// @SaCheckPermission("rs:overseas:edit")
|
||||
@Log(title = "出国审批记录", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/fixData")
|
||||
public R<String> fixApprovalData() {
|
||||
|
||||
+10
-10
@@ -40,11 +40,11 @@ public class RsOverseasApprovalMonitorController extends BaseController {
|
||||
* - 拥有权限的用户可以查看所有待审批申请
|
||||
* - 显示当前审批环节和审批人
|
||||
* - 可以查看审批历史记录
|
||||
*
|
||||
*
|
||||
* @param query 查询条件
|
||||
* @return 所有待审批申请列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/pending/list")
|
||||
public TableDataInfo<RsOverseasApprovalMonitorVo> pendingList(RsOverseasApprovalMonitorQuery query) {
|
||||
log.info("查询所有待审批申请列表");
|
||||
@@ -60,11 +60,11 @@ public class RsOverseasApprovalMonitorController extends BaseController {
|
||||
* - 拥有权限的用户可以查看所有已完成审批申请
|
||||
* - 显示最终审批结果和完成时间
|
||||
* - 可以查看所有审批环节的历史记录
|
||||
*
|
||||
*
|
||||
* @param query 查询条件
|
||||
* @return 所有已完成审批的申请列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/completed/list")
|
||||
public TableDataInfo<RsOverseasApprovalMonitorVo> completedList(RsOverseasApprovalMonitorQuery query) {
|
||||
log.info("查询所有已完成审批的申请列表,查询条件:{}", query);
|
||||
@@ -80,11 +80,11 @@ public class RsOverseasApprovalMonitorController extends BaseController {
|
||||
* - 申请基本信息
|
||||
* - 当前审批状态
|
||||
* - 审批历史记录
|
||||
*
|
||||
*
|
||||
* @param applicationId 申请ID
|
||||
* @return 申请详情
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/detail/{applicationId}")
|
||||
public R<RsOverseasApprovalMonitorVo> getDetail(@PathVariable @NotNull(message = "申请ID不能为空") Long applicationId) {
|
||||
log.info("查询申请详情,申请ID:{}", applicationId);
|
||||
@@ -100,10 +100,10 @@ public class RsOverseasApprovalMonitorController extends BaseController {
|
||||
* - 各审批级别的待审批数量
|
||||
* - 已完成审批总数
|
||||
* - 今日新增申请数
|
||||
*
|
||||
*
|
||||
* @return 统计数据
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/statistics")
|
||||
public R<Object> statistics() {
|
||||
log.info("查询审批进度统计");
|
||||
@@ -114,11 +114,11 @@ public class RsOverseasApprovalMonitorController extends BaseController {
|
||||
* 下载出国申请审批表PDF
|
||||
* <p>
|
||||
* 生成并下载"杭州第一技师学院登记报备人员因私事出国(境)审批表"PDF文件
|
||||
*
|
||||
*
|
||||
* @param applicationId 申请ID
|
||||
* @param response HTTP响应对象
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/downloadApprovalPdf/{applicationId}")
|
||||
public void downloadApprovalPdf(
|
||||
@PathVariable @NotNull(message = "申请ID不能为空") Long applicationId,
|
||||
|
||||
+11
-11
@@ -43,7 +43,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 查询行程变更申请列表
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:list")
|
||||
// @SaCheckPermission("rs:itineraryChange:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<RsOverseasItineraryChangeVo> list(RsOverseasItineraryChangeQuery query) {
|
||||
query.setTenantId(LoginHelper.getTenantId());
|
||||
@@ -54,7 +54,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
* 查询我的变更记录列表(只显示已通过的变更申请)
|
||||
* 说明:变更记录Tab只显示已通过审批的变更申请,这些是真正生效的变更记录
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:list")
|
||||
// @SaCheckPermission("rs:itineraryChange:list")
|
||||
@GetMapping("/my/list")
|
||||
public TableDataInfo<RsOverseasItineraryChangeVo> myList(RsOverseasItineraryChangeQuery query) {
|
||||
query.setTenantId(LoginHelper.getTenantId());
|
||||
@@ -64,7 +64,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 查询待审批的行程变更申请列表(status=0)
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:approve")
|
||||
// @SaCheckPermission("rs:itineraryChange:approve")
|
||||
@GetMapping("/pending/list")
|
||||
public TableDataInfo<RsOverseasItineraryChangeVo> pendingList(RsOverseasItineraryChangeQuery query) {
|
||||
query.setTenantId(LoginHelper.getTenantId());
|
||||
@@ -74,7 +74,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 查询行程变更申请详情
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:query")
|
||||
// @SaCheckPermission("rs:itineraryChange:query")
|
||||
@GetMapping("/{changeId}")
|
||||
public R<RsOverseasItineraryChangeVo> getInfo(@PathVariable Long changeId) {
|
||||
return R.ok(changeService.queryById(changeId));
|
||||
@@ -84,7 +84,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
* 获取可用的出国记录列表(用于选择原出国申请)
|
||||
* 说明:选择的是出国记录选项卡中的记录
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:list")
|
||||
// @SaCheckPermission("rs:itineraryChange:list")
|
||||
@GetMapping("/available-records")
|
||||
public R<List<RsOverseasRecordVo>> getAvailableRecords() {
|
||||
// 查询当前用户的所有出国记录
|
||||
@@ -99,7 +99,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 根据出国记录ID查询记录详情(用于显示原申请信息)
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:query")
|
||||
// @SaCheckPermission("rs:itineraryChange:query")
|
||||
@GetMapping("/record/{recordId}")
|
||||
public R<RsOverseasRecordVo> getRecordInfo(@PathVariable Long recordId) {
|
||||
return R.ok(recordService.queryById(recordId));
|
||||
@@ -108,7 +108,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 新增行程变更申请
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:add")
|
||||
// @SaCheckPermission("rs:itineraryChange:add")
|
||||
@Log(title = "行程变更申请", businessType = BusinessType.INSERT)
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody RsOverseasItineraryChangeBo bo) {
|
||||
@@ -119,7 +119,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 修改行程变更申请(重新提交)
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:edit")
|
||||
// @SaCheckPermission("rs:itineraryChange:edit")
|
||||
@Log(title = "行程变更申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsOverseasItineraryChangeBo bo) {
|
||||
@@ -129,7 +129,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 删除行程变更申请
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:remove")
|
||||
// @SaCheckPermission("rs:itineraryChange:remove")
|
||||
@Log(title = "行程变更申请", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{changeIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] changeIds) {
|
||||
@@ -139,7 +139,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 撤回行程变更申请
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:cancel")
|
||||
// @SaCheckPermission("rs:itineraryChange:cancel")
|
||||
@Log(title = "行程变更申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/cancel/{changeId}")
|
||||
public R<Void> cancel(@PathVariable Long changeId) {
|
||||
@@ -149,7 +149,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
|
||||
/**
|
||||
* 审批行程变更申请
|
||||
*/
|
||||
@SaCheckPermission("rs:itineraryChange:approve")
|
||||
// @SaCheckPermission("rs:itineraryChange:approve")
|
||||
@Log(title = "行程变更申请", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/approve")
|
||||
public R<Void> approve(@RequestBody Map<String, Object> params) {
|
||||
|
||||
+13
-13
@@ -57,7 +57,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 查询出国记录列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<RsOverseasRecordVo> list(RsOverseasRecordQuery query) {
|
||||
return recordService.queryPageList(query);
|
||||
@@ -66,7 +66,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 查询我的出国记录列表(联合查询:记录+已通过申请)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:list")
|
||||
// @SaCheckPermission("rs:overseas:list")
|
||||
@GetMapping("/my/list")
|
||||
public TableDataInfo<RsOverseasRecordVo> myList(RsOverseasRecordQuery query) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -86,7 +86,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 根据申请ID查询出国记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/application/{applicationId}")
|
||||
public R<RsOverseasRecordVo> getByApplicationId(@PathVariable Long applicationId) {
|
||||
RsOverseasRecordVo record = recordService.queryByApplicationId(applicationId);
|
||||
@@ -96,7 +96,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 导出出国记录列表
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:export")
|
||||
// @SaCheckPermission("rs:overseas:export")
|
||||
@Log(title = "出国记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(RsOverseasRecordQuery query, HttpServletResponse response) {
|
||||
@@ -108,7 +108,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
* 下载党籍保留申请PDF模板
|
||||
* 注意:此接口必须放在 /{recordId} 之前,避免路由冲突
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@Log(title = "下载党籍保留申请模板", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/downloadPartyRetention")
|
||||
public void downloadPartyRetention(HttpServletResponse response) {
|
||||
@@ -118,7 +118,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 获取出国记录详细信息
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@GetMapping("/{recordId}")
|
||||
public R<RsOverseasRecordVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long recordId) {
|
||||
return R.ok(recordService.queryById(recordId));
|
||||
@@ -127,7 +127,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 新增出国记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@Log(title = "出国记录", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody RsOverseasRecordBo bo) {
|
||||
@@ -137,7 +137,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 修改出国记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:edit")
|
||||
// @SaCheckPermission("rs:overseas:edit")
|
||||
@Log(title = "出国记录", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsOverseasRecordBo bo) {
|
||||
@@ -147,7 +147,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 基于申请信息创建出国记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@Log(title = "创建出国记录", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/create/{applicationId}")
|
||||
public R<Void> createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
|
||||
@@ -157,7 +157,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 更新出国记录完成状态
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:edit")
|
||||
// @SaCheckPermission("rs:overseas:edit")
|
||||
@Log(title = "更新出国记录完成状态", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/complete")
|
||||
public R<Void> updateCompletion(@RequestBody CompletionRequest request) {
|
||||
@@ -169,7 +169,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 批量删除出国记录
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:remove")
|
||||
// @SaCheckPermission("rs:overseas:remove")
|
||||
@Log(title = "出国记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{recordIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List<Long> recordIds) {
|
||||
@@ -179,7 +179,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 下载因私出国(境)情况回执PDF
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:query")
|
||||
// @SaCheckPermission("rs:overseas:query")
|
||||
@Log(title = "下载出国情况回执", businessType = BusinessType.EXPORT)
|
||||
@GetMapping("/downloadReceipt/{recordId}")
|
||||
public void downloadReceipt(@NotNull(message = "记录ID不能为空") @PathVariable Long recordId,
|
||||
@@ -226,7 +226,7 @@ public class RsOverseasRecordController extends BaseController {
|
||||
/**
|
||||
* 初始化测试数据(临时接口,用于解决出国记录列表显示问题)
|
||||
*/
|
||||
@SaCheckPermission("rs:overseas:add")
|
||||
// @SaCheckPermission("rs:overseas:add")
|
||||
@PostMapping("/initTestData")
|
||||
public R<Void> initTestData() {
|
||||
try {
|
||||
|
||||
+11
-11
@@ -41,7 +41,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 查询活动考勤签到列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:list")
|
||||
//@SaCheckPermission("stgl:activityAttendance:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglActivityAttendanceVo> list(StglActivityAttendanceBo bo, PageQuery pageQuery) {
|
||||
return stglActivityAttendanceService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 导出活动考勤签到列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:export")
|
||||
//@SaCheckPermission("stgl:activityAttendance:export")
|
||||
@Log(title = "活动考勤签到", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglActivityAttendanceBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 获取活动考勤签到详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:query")
|
||||
//@SaCheckPermission("stgl:activityAttendance:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglActivityAttendanceVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 新增活动考勤签到
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:add")
|
||||
//@SaCheckPermission("stgl:activityAttendance:add")
|
||||
@Log(title = "活动考勤签到", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 修改活动考勤签到
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:edit")
|
||||
//@SaCheckPermission("stgl:activityAttendance:edit")
|
||||
@Log(title = "活动考勤签到", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -93,7 +93,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 删除活动考勤签到
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:remove")
|
||||
//@SaCheckPermission("stgl:activityAttendance:remove")
|
||||
@Log(title = "活动考勤签到", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -104,7 +104,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 查询用户已报名成功且进行中的活动列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:list")
|
||||
//@SaCheckPermission("stgl:activityAttendance:list")
|
||||
@GetMapping("/userAvailableActivities")
|
||||
public R<List<StglActivityAttendanceVo>> getUserAvailableActivities() {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -114,7 +114,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 根据活动ID和用户ID查询签到记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:query")
|
||||
//@SaCheckPermission("stgl:activityAttendance:query")
|
||||
@GetMapping("/getByActivityAndUser")
|
||||
public R<StglActivityAttendanceVo> getByActivityAndUser(@RequestParam Long activityId) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -124,7 +124,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 根据活动ID和用户ID查询所有签到记录(支持多次签到)
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:query")
|
||||
//@SaCheckPermission("stgl:activityAttendance:query")
|
||||
@GetMapping("/getAllByActivityAndUser")
|
||||
public R<List<StglActivityAttendanceVo>> getAllByActivityAndUser(
|
||||
@RequestParam("activityId") Long activityId,
|
||||
@@ -146,7 +146,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 用户签到
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:signIn")
|
||||
//@SaCheckPermission("stgl:activityAttendance:signIn")
|
||||
@Log(title = "活动签到", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/signIn")
|
||||
@@ -158,7 +158,7 @@ public class StglActivityAttendanceController extends BaseController {
|
||||
/**
|
||||
* 用户签退
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityAttendance:signOut")
|
||||
//@SaCheckPermission("stgl:activityAttendance:signOut")
|
||||
@Log(title = "活动签退", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/signOut")
|
||||
|
||||
+7
-7
@@ -37,7 +37,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 查询活动审批记录详细
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglActivityAudit> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -47,7 +47,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 根据活动ID查询审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/byActivity/{activityId}")
|
||||
public R<List<StglActivityAuditVo>> getByActivityId(@NotNull(message = "活动ID不能为空")
|
||||
@PathVariable Long activityId) {
|
||||
@@ -57,7 +57,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 根据审批人ID查询待审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/pending/{approverId}")
|
||||
public R<List<StglActivityAudit>> getPendingByApproverId(@NotNull(message = "审批人ID不能为空")
|
||||
@PathVariable Long approverId) {
|
||||
@@ -67,7 +67,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 新增活动审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:add")
|
||||
//@SaCheckPermission("stgl:activity:add")
|
||||
@Log(title = "活动审批记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -78,7 +78,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 修改活动审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:edit")
|
||||
//@SaCheckPermission("stgl:activity:edit")
|
||||
@Log(title = "活动审批记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -89,7 +89,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 删除活动审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:remove")
|
||||
//@SaCheckPermission("stgl:activity:remove")
|
||||
@Log(title = "活动审批记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -100,7 +100,7 @@ public class StglActivityAuditController extends BaseController {
|
||||
/**
|
||||
* 审批活动
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:approve")
|
||||
//@SaCheckPermission("stgl:activity:approve")
|
||||
@Log(title = "活动审批", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/approve")
|
||||
|
||||
+11
-11
@@ -42,7 +42,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 查询活动信息列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:list")
|
||||
//@SaCheckPermission("stgl:activity:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglActivityVo> list(StglActivityBo bo, PageQuery pageQuery) {
|
||||
return stglActivityService.queryPageList(bo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 导出活动信息列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:export")
|
||||
//@SaCheckPermission("stgl:activity:export")
|
||||
@Log(title = "活动信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglActivityBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +62,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 获取活动信息详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglActivityVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(stglActivityService.queryById(id));
|
||||
@@ -71,7 +71,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 新增活动信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:add")
|
||||
//@SaCheckPermission("stgl:activity:add")
|
||||
@Log(title = "活动信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 修改活动信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:edit")
|
||||
//@SaCheckPermission("stgl:activity:edit")
|
||||
@Log(title = "活动信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -93,7 +93,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 删除活动信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:remove")
|
||||
//@SaCheckPermission("stgl:activity:remove")
|
||||
@Log(title = "活动信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -103,7 +103,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 复制活动信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:add")
|
||||
//@SaCheckPermission("stgl:activity:add")
|
||||
@Log(title = "复制活动信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/copy")
|
||||
@@ -117,7 +117,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 活动总结
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:edit")
|
||||
//@SaCheckPermission("stgl:activity:edit")
|
||||
@Log(title = "活动总结", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/summarize")
|
||||
@@ -132,7 +132,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 查询社团选择器选项
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/club/options")
|
||||
public R<List<StglActivityVo>> getClubOptions() {
|
||||
return R.ok(stglActivityService.queryClubOptions());
|
||||
@@ -141,7 +141,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 查询志愿者队伍选择器选项
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/volunteer/options")
|
||||
public R<List<StglActivityVo>> getVolunteerTeamOptions() {
|
||||
return R.ok(stglActivityService.queryVolunteerTeamOptions());
|
||||
@@ -150,7 +150,7 @@ public class StglActivityController extends BaseController {
|
||||
/**
|
||||
* 查询活动评分列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activity:query")
|
||||
//@SaCheckPermission("stgl:activity:query")
|
||||
@GetMapping("/{id}/ratings")
|
||||
public R<List<ActivityRatingVo>> getActivityRatings(@NotNull(message = "活动ID不能为空") @PathVariable Long id) {
|
||||
return R.ok(stglActivityService.getActivityRatings(id));
|
||||
|
||||
+9
-9
@@ -41,7 +41,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 查询活动报名管理列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:list")
|
||||
//@SaCheckPermission("stgl:activityRegister:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglActivityRegistrationVo> list(StglActivityRegistrationBo bo, PageQuery pageQuery) {
|
||||
return stglActivityRegistrationService.queryPageList(bo, pageQuery);
|
||||
@@ -50,7 +50,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 导出活动报名管理列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:export")
|
||||
//@SaCheckPermission("stgl:activityRegister:export")
|
||||
@Log(title = "活动报名管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglActivityRegistrationBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 获取活动报名管理详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:query")
|
||||
//@SaCheckPermission("stgl:activityRegister:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglActivityRegistrationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(stglActivityRegistrationService.queryById(id));
|
||||
@@ -70,7 +70,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 新增活动报名管理
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:add")
|
||||
//@SaCheckPermission("stgl:activityRegister:add")
|
||||
@Log(title = "活动报名管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody StglActivityRegistrationBo bo) {
|
||||
@@ -80,7 +80,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 修改活动报名管理
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:edit")
|
||||
//@SaCheckPermission("stgl:activityRegister:edit")
|
||||
@Log(title = "活动报名管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody StglActivityRegistrationBo bo) {
|
||||
@@ -90,7 +90,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 删除活动报名管理
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:remove")
|
||||
//@SaCheckPermission("stgl:activityRegister:remove")
|
||||
@Log(title = "活动报名管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -100,7 +100,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 审核活动报名
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:approve")
|
||||
//@SaCheckPermission("stgl:activityRegister:approve")
|
||||
@Log(title = "活动报名审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/approve/{id}")
|
||||
public R<Void> approve(@NotNull(message = "主键不能为空") @PathVariable Long id,
|
||||
@@ -117,7 +117,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 批量审核活动报名
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:approve")
|
||||
//@SaCheckPermission("stgl:activityRegister:approve")
|
||||
@Log(title = "活动报名批量审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/batchApprove")
|
||||
public R<Void> batchApprove(@Validated @RequestBody StglBatchApprovalBo batchApprovalBo) {
|
||||
@@ -127,7 +127,7 @@ public class StglActivityRegisterController extends BaseController {
|
||||
/**
|
||||
* 录入成绩
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityRegister:recordScore")
|
||||
//@SaCheckPermission("stgl:activityRegister:recordScore")
|
||||
@Log(title = "录入成绩", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/score/{id}")
|
||||
public R<Void> recordScore(@NotNull(message = "主键不能为空") @PathVariable Long id,
|
||||
|
||||
+8
-8
@@ -40,7 +40,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 查询活动报名列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:list")
|
||||
//@SaCheckPermission("stgl:activityregistration:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglActivityRegistrationVo> list(StglActivityRegistrationBo bo, PageQuery pageQuery) {
|
||||
return stglActivityRegistrationService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +49,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 导出活动报名列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:export")
|
||||
//@SaCheckPermission("stgl:activityregistration:export")
|
||||
@Log(title = "活动报名", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglActivityRegistrationBo bo, HttpServletResponse response) {
|
||||
@@ -60,7 +60,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 获取活动报名详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:query")
|
||||
//@SaCheckPermission("stgl:activityregistration:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglActivityRegistrationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(stglActivityRegistrationService.queryById(id));
|
||||
@@ -69,7 +69,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 新增活动报名
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:add")
|
||||
//@SaCheckPermission("stgl:activityregistration:add")
|
||||
@Log(title = "活动报名", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody StglActivityRegistrationBo bo) {
|
||||
@@ -79,7 +79,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 修改活动报名
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:edit")
|
||||
//@SaCheckPermission("stgl:activityregistration:edit")
|
||||
@Log(title = "活动报名", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody StglActivityRegistrationBo bo) {
|
||||
@@ -89,7 +89,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 删除活动报名
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:remove")
|
||||
//@SaCheckPermission("stgl:activityregistration:remove")
|
||||
@Log(title = "活动报名", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -99,7 +99,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 审核活动报名
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:approval")
|
||||
//@SaCheckPermission("stgl:activityregistration:approval")
|
||||
@Log(title = "活动报名审核", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/approval")
|
||||
public R<Void> approval(@RequestParam Long id,
|
||||
@@ -111,7 +111,7 @@ public class StglActivityRegistrationController extends BaseController {
|
||||
/**
|
||||
* 录入成绩
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityregistration:score")
|
||||
//@SaCheckPermission("stgl:activityregistration:score")
|
||||
@Log(title = "录入成绩", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/inputScore")
|
||||
public R<Void> inputScore(@RequestParam Long id, @RequestParam String score) {
|
||||
|
||||
+6
-6
@@ -39,7 +39,7 @@ public class StglActivityTeamInfoController extends BaseController {
|
||||
/**
|
||||
* 查询活动团队信息列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityteaminfo:list")
|
||||
//@SaCheckPermission("stgl:activityteaminfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglActivityTeamInfoVo> list(StglActivityTeamInfoBo bo, PageQuery pageQuery) {
|
||||
return stglActivityTeamInfoService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class StglActivityTeamInfoController extends BaseController {
|
||||
/**
|
||||
* 导出活动团队信息列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityteaminfo:export")
|
||||
//@SaCheckPermission("stgl:activityteaminfo:export")
|
||||
@Log(title = "活动团队信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglActivityTeamInfoBo bo, HttpServletResponse response) {
|
||||
@@ -59,7 +59,7 @@ public class StglActivityTeamInfoController extends BaseController {
|
||||
/**
|
||||
* 获取活动团队信息详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityteaminfo:query")
|
||||
//@SaCheckPermission("stgl:activityteaminfo:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglActivityTeamInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(stglActivityTeamInfoService.queryById(id));
|
||||
@@ -68,7 +68,7 @@ public class StglActivityTeamInfoController extends BaseController {
|
||||
/**
|
||||
* 新增活动团队信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityteaminfo:add")
|
||||
//@SaCheckPermission("stgl:activityteaminfo:add")
|
||||
@Log(title = "活动团队信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody StglActivityTeamInfoBo bo) {
|
||||
@@ -78,7 +78,7 @@ public class StglActivityTeamInfoController extends BaseController {
|
||||
/**
|
||||
* 修改活动团队信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityteaminfo:edit")
|
||||
//@SaCheckPermission("stgl:activityteaminfo:edit")
|
||||
@Log(title = "活动团队信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody StglActivityTeamInfoBo bo) {
|
||||
@@ -88,7 +88,7 @@ public class StglActivityTeamInfoController extends BaseController {
|
||||
/**
|
||||
* 删除活动团队信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activityteaminfo:remove")
|
||||
//@SaCheckPermission("stgl:activityteaminfo:remove")
|
||||
@Log(title = "活动团队信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
|
||||
+7
-7
@@ -40,7 +40,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 查询社团年审审批详细
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:query")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglAnnualReviewAudit> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -50,7 +50,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 根据年审记录ID查询审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:query")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:query")
|
||||
@GetMapping("/byAnnualReview/{annualReviewId}")
|
||||
public R<List<StglAnnualReviewAudit>> getByAnnualReviewId(@NotNull(message = "年审记录ID不能为空")
|
||||
@PathVariable Long annualReviewId) {
|
||||
@@ -60,7 +60,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 根据审批人ID查询待审批记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:query")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:query")
|
||||
@GetMapping("/pending/{approverId}")
|
||||
public R<List<StglAnnualReviewAudit>> getPendingByApproverId(@NotNull(message = "审批人ID不能为空")
|
||||
@PathVariable Long approverId) {
|
||||
@@ -70,7 +70,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 新增社团年审审批
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:add")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:add")
|
||||
@Log(title = "社团年审审批", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -81,7 +81,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 修改社团年审审批
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:edit")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:edit")
|
||||
@Log(title = "社团年审审批", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -92,7 +92,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 删除社团年审审批
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:remove")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:remove")
|
||||
@Log(title = "社团年审审批", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -103,7 +103,7 @@ public class StglAnnualReviewAuditController extends BaseController {
|
||||
/**
|
||||
* 审批年审记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:annualReviewAudit:approve")
|
||||
//@SaCheckPermission("stgl:annualReviewAudit:approve")
|
||||
@Log(title = "社团年审审批", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/approve")
|
||||
|
||||
+11
-11
@@ -42,7 +42,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 查询社团管理审核人配置列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:list")
|
||||
//@SaCheckPermission("stgl:auditor:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglAuditorVo> list(StglAuditorBo bo, PageQuery pageQuery) {
|
||||
return stglAuditorService.queryPageList(bo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 导出社团管理审核人配置列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:export")
|
||||
//@SaCheckPermission("stgl:auditor:export")
|
||||
@Log(title = "社团管理审核人配置", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglAuditorBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +62,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 获取社团管理审核人配置详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:query")
|
||||
//@SaCheckPermission("stgl:auditor:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglAuditorVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -72,7 +72,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 新增社团管理审核人配置
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:add")
|
||||
//@SaCheckPermission("stgl:auditor:add")
|
||||
@Log(title = "社团管理审核人配置", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -83,7 +83,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 修改社团管理审核人配置
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:edit")
|
||||
//@SaCheckPermission("stgl:auditor:edit")
|
||||
@Log(title = "社团管理审核人配置", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -94,7 +94,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 删除社团管理审核人配置
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:remove")
|
||||
//@SaCheckPermission("stgl:auditor:remove")
|
||||
@Log(title = "社团管理审核人配置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -105,7 +105,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量添加审核人
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:add")
|
||||
//@SaCheckPermission("stgl:auditor:add")
|
||||
@Log(title = "批量添加审核人", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchAdd")
|
||||
@@ -116,7 +116,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 查询我配置的审核人列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:list")
|
||||
//@SaCheckPermission("stgl:auditor:list")
|
||||
@GetMapping("/myConfig")
|
||||
public TableDataInfo<StglAuditorVo> myConfigList(StglAuditorBo bo, PageQuery pageQuery) {
|
||||
return stglAuditorService.queryMyConfigList(bo, pageQuery);
|
||||
@@ -125,7 +125,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量启用审核人
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:edit")
|
||||
//@SaCheckPermission("stgl:auditor:edit")
|
||||
@Log(title = "启用审核人", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/enable")
|
||||
public R<Void> enable(@RequestBody List<Long> ids) {
|
||||
@@ -135,7 +135,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 批量停用审核人
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:edit")
|
||||
//@SaCheckPermission("stgl:auditor:edit")
|
||||
@Log(title = "停用审核人", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/disable")
|
||||
public R<Void> disable(@RequestBody List<Long> ids) {
|
||||
@@ -145,7 +145,7 @@ public class StglAuditorController extends BaseController {
|
||||
/**
|
||||
* 根据部门ID获取用户列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:auditor:list")
|
||||
//@SaCheckPermission("stgl:auditor:list")
|
||||
@GetMapping("/users/{deptId}")
|
||||
public R<List<SysUserVo>> listUserByDeptId(@PathVariable String deptId) {
|
||||
List<SysUserVo> users = sysUserService.selectUserListByDept(Long.valueOf(deptId));
|
||||
|
||||
+6
-6
@@ -41,7 +41,7 @@ public class StglClassController extends BaseController {
|
||||
/**
|
||||
* 查询班主任的班级列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:stclass:list")
|
||||
//@SaCheckPermission("stgl:stclass:list")
|
||||
@GetMapping("/teacher/classes")
|
||||
public R<List<Map<String, Object>>> getTeacherClasses() {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -52,7 +52,7 @@ public class StglClassController extends BaseController {
|
||||
/**
|
||||
* 查询班级学生社团、志愿者队伍、活动参加情况列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:stclass:list")
|
||||
//@SaCheckPermission("stgl:stclass:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglClassVo> list(StglClassBo bo, PageQuery pageQuery) {
|
||||
return stglClassService.queryPageList(bo, pageQuery);
|
||||
@@ -61,7 +61,7 @@ public class StglClassController extends BaseController {
|
||||
/**
|
||||
* 查询学生社团详情
|
||||
*/
|
||||
@SaCheckPermission("stgl:stclass:query")
|
||||
//@SaCheckPermission("stgl:stclass:query")
|
||||
@GetMapping("/student/clubs/{studentId}")
|
||||
public R<List<Map<String, Object>>> getStudentClubs(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
|
||||
List<Map<String, Object>> list = stglClassService.getStudentClubs(studentId);
|
||||
@@ -71,7 +71,7 @@ public class StglClassController extends BaseController {
|
||||
/**
|
||||
* 查询学生志愿者队伍详情
|
||||
*/
|
||||
@SaCheckPermission("stgl:stclass:query")
|
||||
//@SaCheckPermission("stgl:stclass:query")
|
||||
@GetMapping("/student/volunteer-teams/{studentId}")
|
||||
public R<List<Map<String, Object>>> getStudentVolunteerTeams(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
|
||||
List<Map<String, Object>> list = stglClassService.getStudentVolunteerTeams(studentId);
|
||||
@@ -81,7 +81,7 @@ public class StglClassController extends BaseController {
|
||||
/**
|
||||
* 查询学生活动详情
|
||||
*/
|
||||
@SaCheckPermission("stgl:stclass:query")
|
||||
//@SaCheckPermission("stgl:stclass:query")
|
||||
@GetMapping("/student/activities/{studentId}")
|
||||
public R<List<Map<String, Object>>> getStudentActivities(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
|
||||
List<Map<String, Object>> list = stglClassService.getStudentActivities(studentId);
|
||||
@@ -91,7 +91,7 @@ public class StglClassController extends BaseController {
|
||||
/**
|
||||
* 导出班级学生社团、志愿者队伍、活动参加情况列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:stclass:export")
|
||||
//@SaCheckPermission("stgl:stclass:export")
|
||||
@Log(title = "班级学生社团、志愿者队伍、活动参加情况", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglClassBo bo, HttpServletResponse response) {
|
||||
|
||||
+9
-9
@@ -45,7 +45,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 查询社团指导老师任职历史列表
|
||||
*/
|
||||
@Operation(summary = "查询社团指导老师任职历史列表")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglClubAdvisorHistoryVo> list(StglClubAdvisorHistoryBo bo, PageQuery pageQuery) {
|
||||
return stglClubAdvisorHistoryService.queryPageList(bo, pageQuery);
|
||||
@@ -55,7 +55,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 导出社团指导老师任职历史列表
|
||||
*/
|
||||
@Operation(summary = "导出社团指导老师任职历史列表")
|
||||
@SaCheckPermission("stgl:club:export")
|
||||
//@SaCheckPermission("stgl:club:export")
|
||||
@Log(title = "社团指导老师任职历史", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglClubAdvisorHistoryBo bo, HttpServletResponse response) {
|
||||
@@ -67,7 +67,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 获取社团指导老师任职历史详细信息
|
||||
*/
|
||||
@Operation(summary = "获取社团指导老师任职历史详细信息")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglClubAdvisorHistoryVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(stglClubAdvisorHistoryService.queryById(id));
|
||||
@@ -77,7 +77,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 查询指定社团的当前在任指导老师
|
||||
*/
|
||||
@Operation(summary = "查询指定社团的当前在任指导老师")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/current/{clubId}")
|
||||
@Parameter(name = "clubId", description = "社团ID", required = true)
|
||||
public R<List<StglClubAdvisorHistoryVo>> getCurrentAdvisors(@PathVariable Long clubId) {
|
||||
@@ -89,7 +89,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 查询指定社团的历史指导老师(已离任)
|
||||
*/
|
||||
@Operation(summary = "查询指定社团的历史指导老师")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/history/{clubId}")
|
||||
@Parameter(name = "clubId", description = "社团ID", required = true)
|
||||
public R<List<StglClubAdvisorHistoryVo>> getHistoryAdvisors(@PathVariable Long clubId) {
|
||||
@@ -101,7 +101,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 查询指定社团的所有指导老师(包含当前和历史)
|
||||
*/
|
||||
@Operation(summary = "查询指定社团的所有指导老师")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/all/{clubId}")
|
||||
@Parameter(name = "clubId", description = "社团ID", required = true)
|
||||
public R<List<StglClubAdvisorHistoryVo>> getAllAdvisors(@PathVariable Long clubId) {
|
||||
@@ -113,7 +113,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 新增社团指导老师任职历史
|
||||
*/
|
||||
@Operation(summary = "新增社团指导老师任职历史")
|
||||
@SaCheckPermission("stgl:club:add")
|
||||
//@SaCheckPermission("stgl:club:add")
|
||||
@Log(title = "社团指导老师任职历史", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -125,7 +125,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 修改社团指导老师任职历史
|
||||
*/
|
||||
@Operation(summary = "修改社团指导老师任职历史")
|
||||
@SaCheckPermission("stgl:club:edit")
|
||||
//@SaCheckPermission("stgl:club:edit")
|
||||
@Log(title = "社团指导老师任职历史", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -137,7 +137,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
|
||||
* 删除社团指导老师任职历史
|
||||
*/
|
||||
@Operation(summary = "删除社团指导老师任职历史")
|
||||
@SaCheckPermission("stgl:club:remove")
|
||||
//@SaCheckPermission("stgl:club:remove")
|
||||
@Log(title = "社团指导老师任职历史", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
|
||||
+13
-13
@@ -45,7 +45,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 查询社团年审记录列表
|
||||
*/
|
||||
@Operation(summary = "查询社团年审记录列表")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:list")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglClubAnnualReviewVo> list(StglClubAnnualReviewBo bo, PageQuery pageQuery) {
|
||||
return stglClubAnnualReviewService.queryPageList(bo, pageQuery);
|
||||
@@ -55,7 +55,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 查询我的社团年审记录列表
|
||||
*/
|
||||
@Operation(summary = "查询我的社团年审记录列表")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:myList")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:myList")
|
||||
@GetMapping("/myList")
|
||||
public TableDataInfo<StglClubAnnualReviewVo> myList(StglClubAnnualReviewBo bo, PageQuery pageQuery) {
|
||||
return stglClubAnnualReviewService.queryMyPageList(bo, pageQuery);
|
||||
@@ -65,7 +65,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 导出社团年审记录列表
|
||||
*/
|
||||
@Operation(summary = "导出社团年审记录列表")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:export")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:export")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglClubAnnualReviewBo bo, HttpServletResponse response) {
|
||||
@@ -77,7 +77,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 获取社团年审记录详细信息
|
||||
*/
|
||||
@Operation(summary = "获取社团年审记录详细信息")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:query")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglClubAnnualReviewVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -88,7 +88,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 新增社团年审记录
|
||||
*/
|
||||
@Operation(summary = "新增社团年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:add")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:add")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -100,7 +100,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 修改社团年审记录
|
||||
*/
|
||||
@Operation(summary = "修改社团年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:edit")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:edit")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -112,7 +112,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 删除社团年审记录
|
||||
*/
|
||||
@Operation(summary = "删除社团年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:remove")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:remove")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -124,7 +124,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 提交年审记录
|
||||
*/
|
||||
@Operation(summary = "提交年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:submit")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:submit")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/submit/{id}")
|
||||
@@ -137,7 +137,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 撤回年审记录
|
||||
*/
|
||||
@Operation(summary = "撤回年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:withdraw")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:withdraw")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/withdraw/{id}")
|
||||
@@ -150,7 +150,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 审核年审记录
|
||||
*/
|
||||
@Operation(summary = "审核年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:audit")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:audit")
|
||||
@Log(title = "社团年审记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/audit")
|
||||
@@ -165,7 +165,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
* 检查是否可以创建年审记录
|
||||
*/
|
||||
@Operation(summary = "检查是否可以创建年审记录")
|
||||
@SaCheckPermission("stgl:clubAnnualReview:check")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:check")
|
||||
@GetMapping("/check")
|
||||
public R<Boolean> checkCanCreate(@RequestParam @NotNull(message = "社团ID不能为空") Long clubId,
|
||||
@RequestParam @NotNull(message = "年审年度不能为空") Integer reviewYear) {
|
||||
@@ -190,7 +190,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
@Parameter(name = "clubId", description = "社团ID", required = true),
|
||||
@Parameter(name = "reviewYear", description = "年审年度", required = true)
|
||||
})
|
||||
@SaCheckPermission("stgl:clubAnnualReview:query")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:query")
|
||||
@GetMapping("/clubActivities")
|
||||
public R<List<org.dromara.stgl.domain.vo.StglActivityVo>> getClubActivities(
|
||||
@RequestParam @NotNull(message = "社团ID不能为空") Long clubId,
|
||||
@@ -203,7 +203,7 @@ public class StglClubAnnualReviewController extends BaseController {
|
||||
*/
|
||||
@Operation(summary = "根据年审记录ID获取对应的活动数据")
|
||||
@Parameter(name = "id", description = "年审记录ID", required = true)
|
||||
@SaCheckPermission("stgl:clubAnnualReview:query")
|
||||
//@SaCheckPermission("stgl:clubAnnualReview:query")
|
||||
@GetMapping("/{id}/activities")
|
||||
public R<List<org.dromara.stgl.domain.vo.StglClubAnnualReviewActivityVo>> getAnnualReviewActivities(
|
||||
@NotNull(message = "年审记录ID不能为空") @PathVariable Long id) {
|
||||
|
||||
+16
-16
@@ -46,7 +46,7 @@ public class StglClubController extends BaseController {
|
||||
* 查询社团信息列表
|
||||
*/
|
||||
@Operation(summary = "查询社团信息列表")
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglClubVo> list(StglClubBo bo, PageQuery pageQuery) {
|
||||
return stglClubService.queryPageList(bo, pageQuery);
|
||||
@@ -56,7 +56,7 @@ public class StglClubController extends BaseController {
|
||||
* 导出社团信息列表
|
||||
*/
|
||||
@Operation(summary = "导出社团信息列表")
|
||||
@SaCheckPermission("stgl:club:export")
|
||||
//@SaCheckPermission("stgl:club:export")
|
||||
@Log(title = "社团信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglClubBo bo, HttpServletResponse response) {
|
||||
@@ -68,7 +68,7 @@ public class StglClubController extends BaseController {
|
||||
* 获取社团信息详细信息
|
||||
*/
|
||||
@Operation(summary = "获取社团信息详细信息")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglClubVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -79,7 +79,7 @@ public class StglClubController extends BaseController {
|
||||
* 新增社团信息
|
||||
*/
|
||||
@Operation(summary = "新增社团信息")
|
||||
@SaCheckPermission("stgl:club:add")
|
||||
//@SaCheckPermission("stgl:club:add")
|
||||
@Log(title = "社团信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -91,7 +91,7 @@ public class StglClubController extends BaseController {
|
||||
* 修改社团信息
|
||||
*/
|
||||
@Operation(summary = "修改社团信息")
|
||||
@SaCheckPermission("stgl:club:edit")
|
||||
//@SaCheckPermission("stgl:club:edit")
|
||||
@Log(title = "社团信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -103,7 +103,7 @@ public class StglClubController extends BaseController {
|
||||
* 删除社团信息
|
||||
*/
|
||||
@Operation(summary = "删除社团信息")
|
||||
@SaCheckPermission("stgl:club:remove")
|
||||
//@SaCheckPermission("stgl:club:remove")
|
||||
@Log(title = "社团信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -115,7 +115,7 @@ public class StglClubController extends BaseController {
|
||||
* 查询可用的社团选项
|
||||
*/
|
||||
@Operation(summary = "查询可用的社团选项")
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/options")
|
||||
public R<List<StglClubVo>> getOptions() {
|
||||
return R.ok(stglClubService.queryAvailableOptions());
|
||||
@@ -125,7 +125,7 @@ public class StglClubController extends BaseController {
|
||||
* 根据社团类型查询社团列表
|
||||
*/
|
||||
@Operation(summary = "根据社团类型查询社团列表")
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/listByType/{clubType}")
|
||||
@Parameters({
|
||||
@Parameter(name = "clubType", description = "社团类型", required = true)
|
||||
@@ -138,7 +138,7 @@ public class StglClubController extends BaseController {
|
||||
* 查询我管理的社团列表
|
||||
*/
|
||||
@Operation(summary = "查询我管理的社团列表")
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/myClubs")
|
||||
public R<List<StglClubVo>> getMyClubs() {
|
||||
return R.ok(stglClubService.queryMyClubs());
|
||||
@@ -148,7 +148,7 @@ public class StglClubController extends BaseController {
|
||||
* 检查社团名称是否重复
|
||||
*/
|
||||
@Operation(summary = "检查社团名称是否重复")
|
||||
@SaCheckPermission("stgl:club:add")
|
||||
//@SaCheckPermission("stgl:club:add")
|
||||
@GetMapping("/checkClubName")
|
||||
@Parameters({
|
||||
@Parameter(name = "clubName", description = "社团名称", required = true),
|
||||
@@ -162,7 +162,7 @@ public class StglClubController extends BaseController {
|
||||
* 验证当前用户是否为社团社长
|
||||
*/
|
||||
@Operation(summary = "验证当前用户是否为社团社长")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/checkPresident/{id}")
|
||||
@Parameters({
|
||||
@Parameter(name = "id", description = "社团ID", required = true)
|
||||
@@ -180,7 +180,7 @@ public class StglClubController extends BaseController {
|
||||
* 社团转让
|
||||
*/
|
||||
@Operation(summary = "社团转让")
|
||||
@SaCheckPermission("stgl:club:edit")
|
||||
//@SaCheckPermission("stgl:club:edit")
|
||||
@Log(title = "社团转让", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/transfer/{id}")
|
||||
@@ -196,7 +196,7 @@ public class StglClubController extends BaseController {
|
||||
* 临时测试接口:验证副社长数据映射
|
||||
*/
|
||||
@Operation(summary = "测试副社长数据映射")
|
||||
@SaCheckPermission("stgl:club:query")
|
||||
//@SaCheckPermission("stgl:club:query")
|
||||
@GetMapping("/testVicePresidentData/{id}")
|
||||
public R<StglClubVo> testVicePresidentData(@PathVariable Long id) {
|
||||
StglClubVo club = stglClubService.queryById(id);
|
||||
@@ -217,7 +217,7 @@ public class StglClubController extends BaseController {
|
||||
* 启用/禁用社团
|
||||
*/
|
||||
@Operation(summary = "启用/禁用社团")
|
||||
@SaCheckPermission("stgl:club:edit")
|
||||
//@SaCheckPermission("stgl:club:edit")
|
||||
@Log(title = "社团信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
@Parameters({
|
||||
@@ -232,7 +232,7 @@ public class StglClubController extends BaseController {
|
||||
* 修改社团报名开启状态
|
||||
*/
|
||||
@Operation(summary = "修改社团报名开启状态")
|
||||
@SaCheckPermission("stgl:club:edit")
|
||||
//@SaCheckPermission("stgl:club:edit")
|
||||
@Log(title = "社团信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeSighOpenStatus")
|
||||
@Parameters({
|
||||
@@ -248,7 +248,7 @@ public class StglClubController extends BaseController {
|
||||
* 为缺失社长、副社长成员记录的社团补充相应记录
|
||||
*/
|
||||
@Operation(summary = "修复已存在社团的成员记录")
|
||||
@SaCheckPermission("stgl:club:edit")
|
||||
//@SaCheckPermission("stgl:club:edit")
|
||||
@Log(title = "社团信息", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/fixMemberRecords")
|
||||
public R<String> fixMemberRecords() {
|
||||
|
||||
+6
-6
@@ -37,7 +37,7 @@ public class StglClubPermissionController extends BaseController {
|
||||
* @param clubId 社团ID
|
||||
* @return 权限检查结果
|
||||
*/
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/checkActivityPermission/{clubId}")
|
||||
@Log(title = "检查社团活动权限", businessType = BusinessType.OTHER)
|
||||
public R<ClubActivityPermissionResult> checkActivityPermission(@PathVariable Long clubId) {
|
||||
@@ -64,7 +64,7 @@ public class StglClubPermissionController extends BaseController {
|
||||
* @param clubIds 社团ID列表
|
||||
* @return 权限检查结果映射
|
||||
*/
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@PostMapping("/batchCheckPermission")
|
||||
@Log(title = "批量检查社团权限", businessType = BusinessType.OTHER)
|
||||
public R<Map<Long, ClubActivityPermissionResult>> batchCheckPermission(@RequestBody List<Long> clubIds) {
|
||||
@@ -95,7 +95,7 @@ public class StglClubPermissionController extends BaseController {
|
||||
* @param clubId 社团ID
|
||||
* @return 是否在年审窗口期
|
||||
*/
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/isInAnnualReviewWindow/{clubId}")
|
||||
public R<Boolean> isInAnnualReviewWindow(@PathVariable Long clubId) {
|
||||
log.debug("检查社团是否在年审窗口期,clubId: {}", clubId);
|
||||
@@ -119,7 +119,7 @@ public class StglClubPermissionController extends BaseController {
|
||||
* @param clubId 社团ID
|
||||
* @return 距离年审的天数
|
||||
*/
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/getDaysUntilNextAnnualReview/{clubId}")
|
||||
public R<Long> getDaysUntilNextAnnualReview(@PathVariable Long clubId) {
|
||||
log.debug("获取社团距离年审天数,clubId: {}", clubId);
|
||||
@@ -143,7 +143,7 @@ public class StglClubPermissionController extends BaseController {
|
||||
* @param clubId 社团ID
|
||||
* @return 是否已提交年审
|
||||
*/
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/hasSubmittedCurrentYearAnnualReview/{clubId}")
|
||||
public R<Boolean> hasSubmittedCurrentYearAnnualReview(@PathVariable Long clubId) {
|
||||
log.debug("检查社团是否已提交年审,clubId: {}", clubId);
|
||||
@@ -167,7 +167,7 @@ public class StglClubPermissionController extends BaseController {
|
||||
* @param clubId 社团ID
|
||||
* @return 权限详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/getPermissionDetails/{clubId}")
|
||||
@Log(title = "获取社团权限详情", businessType = BusinessType.OTHER)
|
||||
public R<Map<String, Object>> getPermissionDetails(@PathVariable Long clubId) {
|
||||
|
||||
+5
-5
@@ -41,7 +41,7 @@ public class StglClubRegisterController extends BaseController {
|
||||
* 查询社团报名大厅列表
|
||||
*/
|
||||
@Operation(summary = "查询社团报名大厅列表")
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglClubRegisterVo> list(@RequestParam(required = false) String clubType,
|
||||
@RequestParam(required = false) String clubName,
|
||||
@@ -75,7 +75,7 @@ public class StglClubRegisterController extends BaseController {
|
||||
* 申请加入社团
|
||||
*/
|
||||
@Operation(summary = "申请加入社团")
|
||||
@SaCheckPermission("stgl:register:apply")
|
||||
//@SaCheckPermission("stgl:register:apply")
|
||||
@Log(title = "社团申请", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/apply")
|
||||
public R<Void> applyClub(@RequestParam Long clubId, @RequestBody StglClubApplyBo applyBo) {
|
||||
@@ -88,7 +88,7 @@ public class StglClubRegisterController extends BaseController {
|
||||
* 退出社团
|
||||
*/
|
||||
@Operation(summary = "退出社团")
|
||||
@SaCheckPermission("stgl:register:quit")
|
||||
//@SaCheckPermission("stgl:register:quit")
|
||||
@Log(title = "社团退出", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/quit/{clubId}")
|
||||
@Parameters({
|
||||
@@ -103,7 +103,7 @@ public class StglClubRegisterController extends BaseController {
|
||||
* 查询我参与的社团列表
|
||||
*/
|
||||
@Operation(summary = "查询我参与的社团列表")
|
||||
@SaCheckPermission("stgl:register:list")
|
||||
//@SaCheckPermission("stgl:register:list")
|
||||
@GetMapping("/myClubs")
|
||||
public R<List<StglClubRegisterVo>> getMyClubs() {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -132,7 +132,7 @@ public class StglClubRegisterController extends BaseController {
|
||||
* 查询推荐社团
|
||||
*/
|
||||
@Operation(summary = "查询推荐社团")
|
||||
@SaCheckPermission("stgl:club:list")
|
||||
//@SaCheckPermission("stgl:club:list")
|
||||
@GetMapping("/recommend")
|
||||
@Parameters({
|
||||
@Parameter(name = "clubType", description = "社团类型", required = false),
|
||||
|
||||
+13
-13
@@ -42,7 +42,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 查询材料提交记录列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglMaterialSubmissionVo> list(StglMaterialSubmissionBo bo, PageQuery pageQuery) {
|
||||
return materialSubmissionService.queryPageList(bo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 导出材料提交记录列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:export")
|
||||
//@SaCheckPermission("stgl:activitymaterial:export")
|
||||
@Log(title = "材料提交记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglMaterialSubmissionBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +62,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 获取材料提交记录详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglMaterialSubmissionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(materialSubmissionService.queryById(id));
|
||||
@@ -71,7 +71,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 新增材料提交记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
//@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
@Log(title = "材料提交记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -82,7 +82,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 修改材料提交记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
//@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
@Log(title = "材料提交记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -93,7 +93,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 删除材料提交记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:remove")
|
||||
//@SaCheckPermission("stgl:activitymaterial:remove")
|
||||
@Log(title = "材料提交记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -103,7 +103,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 材料上传
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
//@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
@Log(title = "材料上传", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/upload")
|
||||
@@ -114,7 +114,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 根据任务ID查询提交记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/task/{taskId}")
|
||||
public R<List<StglMaterialSubmissionVo>> getByTaskId(@PathVariable Long taskId) {
|
||||
List<StglMaterialSubmissionVo> submissions = materialSubmissionService.queryByTaskId(taskId);
|
||||
@@ -124,7 +124,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 查询用户在指定任务的提交记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/task/{taskId}/user/{userId}")
|
||||
public R<StglMaterialSubmissionVo> getByTaskIdAndUserId(@PathVariable Long taskId, @PathVariable Long userId) {
|
||||
StglMaterialSubmissionVo submission = materialSubmissionService.queryByTaskIdAndUserId(taskId, userId);
|
||||
@@ -134,7 +134,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 查询团队在指定任务的提交记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/task/{taskId}/team/{teamId}")
|
||||
public R<StglMaterialSubmissionVo> getByTaskIdAndTeamId(@PathVariable Long taskId, @PathVariable Long teamId) {
|
||||
StglMaterialSubmissionVo submission = materialSubmissionService.queryByTaskIdAndTeamId(taskId, teamId);
|
||||
@@ -144,7 +144,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 获取任务的提交统计信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/statistics/{taskId}")
|
||||
public R<Map<String, Object>> getSubmissionStatistics(@PathVariable Long taskId) {
|
||||
Map<String, Object> statistics = materialSubmissionService.getSubmissionStatistics(taskId);
|
||||
@@ -154,7 +154,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 审核材料
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:review")
|
||||
//@SaCheckPermission("stgl:activitymaterial:review")
|
||||
@Log(title = "材料审核", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/review/{id}")
|
||||
public R<Void> reviewSubmission(@PathVariable Long id,
|
||||
@@ -169,7 +169,7 @@ public class StglMaterialSubmissionController extends BaseController {
|
||||
/**
|
||||
* 批量审核材料
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:review")
|
||||
//@SaCheckPermission("stgl:activitymaterial:review")
|
||||
@Log(title = "批量材料审核", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/review/batch")
|
||||
public R<Void> batchReviewSubmissions(@RequestParam String ids,
|
||||
|
||||
+12
-12
@@ -42,7 +42,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 查询材料收集任务列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:list")
|
||||
//@SaCheckPermission("stgl:activitymaterial:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglMaterialTaskVo> list(StglMaterialTaskQueryBo queryBo, PageQuery pageQuery) {
|
||||
return materialTaskService.queryPageList(queryBo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 导出材料收集任务列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:export")
|
||||
//@SaCheckPermission("stgl:activitymaterial:export")
|
||||
@Log(title = "材料收集任务", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglMaterialTaskQueryBo queryBo, HttpServletResponse response) {
|
||||
@@ -62,7 +62,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 获取材料收集任务详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglMaterialTaskVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(materialTaskService.queryById(id));
|
||||
@@ -71,7 +71,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 新增材料收集任务
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:add")
|
||||
//@SaCheckPermission("stgl:activitymaterial:add")
|
||||
@Log(title = "材料收集任务", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -82,7 +82,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 修改材料收集任务
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:edit")
|
||||
//@SaCheckPermission("stgl:activitymaterial:edit")
|
||||
@Log(title = "材料收集任务", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -93,7 +93,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 删除材料收集任务
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:remove")
|
||||
//@SaCheckPermission("stgl:activitymaterial:remove")
|
||||
@Log(title = "材料收集任务", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -103,7 +103,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 更新任务状态(开启/关闭)
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:status")
|
||||
//@SaCheckPermission("stgl:activitymaterial:status")
|
||||
@Log(title = "材料收集任务状态", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/status")
|
||||
public R<Void> updateStatus(@RequestParam Long id, @RequestParam Integer taskStatus) {
|
||||
@@ -116,7 +116,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 查询用户可上传的材料收集任务
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
//@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
@GetMapping("/uploadable")
|
||||
public R<List<StglMaterialTaskVo>> getUploadableTasks(@RequestParam Long userId,
|
||||
@RequestParam(required = false) Long activityId) {
|
||||
@@ -127,7 +127,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 验证用户上传权限
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
//@SaCheckPermission("stgl:activitymaterial:upload")
|
||||
@GetMapping("/validate")
|
||||
public R<Boolean> validateUploadPermission(@RequestParam Long taskId, @RequestParam Long userId) {
|
||||
Boolean hasPermission = materialTaskService.validateUploadPermission(taskId, userId);
|
||||
@@ -137,7 +137,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 查询活动的材料收集任务
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/activity/{activityId}")
|
||||
public R<List<StglMaterialTaskVo>> getTasksByActivityId(@PathVariable Long activityId) {
|
||||
List<StglMaterialTaskVo> tasks = materialTaskService.queryTasksByActivityId(activityId);
|
||||
@@ -147,7 +147,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 更新任务统计信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:edit")
|
||||
//@SaCheckPermission("stgl:activitymaterial:edit")
|
||||
@Log(title = "材料收集任务统计", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/statistics/{taskId}")
|
||||
public R<Void> updateStatistics(@PathVariable Long taskId) {
|
||||
@@ -157,7 +157,7 @@ public class StglMaterialTaskController extends BaseController {
|
||||
/**
|
||||
* 根据活动名称查询活动选项(用于选择器)
|
||||
*/
|
||||
@SaCheckPermission("stgl:activitymaterial:query")
|
||||
//@SaCheckPermission("stgl:activitymaterial:query")
|
||||
@GetMapping("/activity/options")
|
||||
public R<List<StglMaterialTaskVo>> getActivityOptions(@RequestParam(required = false) String activityName) {
|
||||
List<StglMaterialTaskVo> options = materialTaskService.queryActivityOptions(activityName);
|
||||
|
||||
+12
-12
@@ -56,7 +56,7 @@ public class StglMemberController extends BaseController {
|
||||
* 查询社团成员列表
|
||||
*/
|
||||
@Operation(summary = "查询社团成员列表")
|
||||
@SaCheckPermission("stgl:clubmember:list")
|
||||
//@SaCheckPermission("stgl:clubmember:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglMemberVo> list(StglMemberBo bo, PageQuery pageQuery) {
|
||||
return stglMemberService.queryPageList(bo, pageQuery);
|
||||
@@ -66,7 +66,7 @@ public class StglMemberController extends BaseController {
|
||||
* 导出社团成员列表
|
||||
*/
|
||||
@Operation(summary = "导出社团成员列表")
|
||||
@SaCheckPermission("stgl:clubmember:export")
|
||||
//@SaCheckPermission("stgl:clubmember:export")
|
||||
@Log(title = "社团成员", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglMemberBo bo, HttpServletResponse response) {
|
||||
@@ -78,7 +78,7 @@ public class StglMemberController extends BaseController {
|
||||
* 获取社团成员详细信息
|
||||
*/
|
||||
@Operation(summary = "获取社团成员详细信息")
|
||||
@SaCheckPermission("stgl:clubmember:query")
|
||||
//@SaCheckPermission("stgl:clubmember:query")
|
||||
@GetMapping("/{id}")
|
||||
@Parameters({
|
||||
@Parameter(name = "id", description = "成员ID", required = true)
|
||||
@@ -92,7 +92,7 @@ public class StglMemberController extends BaseController {
|
||||
* 新增社团成员
|
||||
*/
|
||||
@Operation(summary = "新增社团成员")
|
||||
@SaCheckPermission("stgl:clubmember:add")
|
||||
//@SaCheckPermission("stgl:clubmember:add")
|
||||
@Log(title = "社团成员", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -104,7 +104,7 @@ public class StglMemberController extends BaseController {
|
||||
* 修改社团成员
|
||||
*/
|
||||
@Operation(summary = "修改社团成员")
|
||||
@SaCheckPermission("stgl:clubmember:edit")
|
||||
//@SaCheckPermission("stgl:clubmember:edit")
|
||||
@Log(title = "社团成员", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -116,7 +116,7 @@ public class StglMemberController extends BaseController {
|
||||
* 删除社团成员
|
||||
*/
|
||||
@Operation(summary = "删除社团成员")
|
||||
@SaCheckPermission("stgl:clubmember:remove")
|
||||
//@SaCheckPermission("stgl:clubmember:remove")
|
||||
@Log(title = "社团成员", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -128,7 +128,7 @@ public class StglMemberController extends BaseController {
|
||||
* 批量添加成员
|
||||
*/
|
||||
@Operation(summary = "批量添加成员")
|
||||
@SaCheckPermission("stgl:clubmember:add")
|
||||
//@SaCheckPermission("stgl:clubmember:add")
|
||||
@Log(title = "社团成员", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/batchAdd")
|
||||
@Parameters({
|
||||
@@ -148,7 +148,7 @@ public class StglMemberController extends BaseController {
|
||||
* 更新成员角色
|
||||
*/
|
||||
@Operation(summary = "更新成员角色")
|
||||
@SaCheckPermission("stgl:clubmember:edit")
|
||||
//@SaCheckPermission("stgl:clubmember:edit")
|
||||
@Log(title = "社团成员", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/updateRole")
|
||||
@Parameters({
|
||||
@@ -163,7 +163,7 @@ public class StglMemberController extends BaseController {
|
||||
* 审核成员申请
|
||||
*/
|
||||
@Operation(summary = "审核成员申请")
|
||||
@SaCheckPermission("stgl:clubmember:approve")
|
||||
//@SaCheckPermission("stgl:clubmember:approve")
|
||||
@Log(title = "社团成员审核", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/approve/{id}")
|
||||
@Parameters({
|
||||
@@ -178,7 +178,7 @@ public class StglMemberController extends BaseController {
|
||||
* 退出社团/队伍
|
||||
*/
|
||||
@Operation(summary = "退出社团/队伍")
|
||||
@SaCheckPermission("stgl:clubmember:edit")
|
||||
//@SaCheckPermission("stgl:clubmember:edit")
|
||||
@Log(title = "社团成员", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/quit/{id}")
|
||||
@Parameters({
|
||||
@@ -196,7 +196,7 @@ public class StglMemberController extends BaseController {
|
||||
*/
|
||||
@Operation(summary = "导入社团成员数据")
|
||||
@Log(title = "社团成员", businessType = BusinessType.IMPORT)
|
||||
@SaCheckPermission("stgl:clubmember:import")
|
||||
//@SaCheckPermission("stgl:clubmember:import")
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
|
||||
ExcelResult<StglMemberImportVo> result = ExcelUtil.importExcel(file.getInputStream(),
|
||||
@@ -209,7 +209,7 @@ public class StglMemberController extends BaseController {
|
||||
* 获取社团成员导入模板
|
||||
*/
|
||||
@Operation(summary = "获取社团成员导入模板")
|
||||
@SaCheckPermission("stgl:member:import")
|
||||
//@SaCheckPermission("stgl:member:import")
|
||||
@PostMapping("/importTemplate")
|
||||
public void importTemplate(HttpServletResponse response) {
|
||||
// 创建示例数据
|
||||
|
||||
+6
-6
@@ -40,7 +40,7 @@ public class StglMyController extends BaseController {
|
||||
* 查询我参与的社团列表
|
||||
*/
|
||||
@Operation(summary = "查询我参与的社团列表")
|
||||
@SaCheckPermission("stgl:my:list")
|
||||
//@SaCheckPermission("stgl:my:list")
|
||||
@GetMapping("/clubs")
|
||||
public R<List<MyClubVo>> getMyClubs() {
|
||||
List<MyClubVo> list = stglMyService.queryMyClubs();
|
||||
@@ -51,7 +51,7 @@ public class StglMyController extends BaseController {
|
||||
* 查询我参与的志愿团队列表
|
||||
*/
|
||||
@Operation(summary = "查询我参与的志愿团队列表")
|
||||
@SaCheckPermission("stgl:my:list")
|
||||
//@SaCheckPermission("stgl:my:list")
|
||||
@GetMapping("/volunteerTeams")
|
||||
public R<List<MyVolunteerTeamVo>> getMyVolunteerTeams() {
|
||||
List<MyVolunteerTeamVo> list = stglMyService.queryMyVolunteerTeams();
|
||||
@@ -62,7 +62,7 @@ public class StglMyController extends BaseController {
|
||||
* 查询我报名的活动列表
|
||||
*/
|
||||
@Operation(summary = "查询我报名的活动列表")
|
||||
@SaCheckPermission("stgl:my:list")
|
||||
//@SaCheckPermission("stgl:my:list")
|
||||
@GetMapping("/activities")
|
||||
public R<List<MyActivityVo>> getMyActivities(
|
||||
@Parameter(description = "活动名称") @RequestParam(required = false) String activityName,
|
||||
@@ -76,7 +76,7 @@ public class StglMyController extends BaseController {
|
||||
* 分页查询我的报名记录
|
||||
*/
|
||||
@Operation(summary = "分页查询我的报名记录")
|
||||
@SaCheckPermission("stgl:my:list")
|
||||
//@SaCheckPermission("stgl:my:list")
|
||||
@GetMapping("/registrations")
|
||||
public TableDataInfo<MyRegistrationVo> getMyRegistrations(
|
||||
@Parameter(description = "分页参数") PageQuery pageQuery,
|
||||
@@ -89,7 +89,7 @@ public class StglMyController extends BaseController {
|
||||
* 对活动进行评分
|
||||
*/
|
||||
@Operation(summary = "对活动进行评分")
|
||||
@SaCheckPermission("stgl:my:rate")
|
||||
//@SaCheckPermission("stgl:my:rate")
|
||||
@PostMapping("/activities/{id}/rate")
|
||||
public R<Void> rateActivity(
|
||||
@Parameter(description = "活动ID") @PathVariable("id") Long activityId,
|
||||
@@ -102,7 +102,7 @@ public class StglMyController extends BaseController {
|
||||
* 检查是否可以对活动评分
|
||||
*/
|
||||
@Operation(summary = "检查是否可以对活动评分")
|
||||
@SaCheckPermission("stgl:my:rate")
|
||||
//@SaCheckPermission("stgl:my:rate")
|
||||
@GetMapping("/activities/{id}/canRate")
|
||||
public R<Boolean> canRateActivity(@Parameter(description = "活动ID") @PathVariable("id") Long activityId) {
|
||||
Boolean canRate = stglMyService.canRateActivity(activityId);
|
||||
|
||||
+12
-12
@@ -52,7 +52,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 查询志愿者成员列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:list")
|
||||
//@SaCheckPermission("stgl:volunteermember:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglMemberVo> list(StglMemberBo bo, PageQuery pageQuery) {
|
||||
bo.setMemberType(2); // 志愿者成员
|
||||
@@ -62,7 +62,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 导出志愿者成员列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:export")
|
||||
//@SaCheckPermission("stgl:volunteermember:export")
|
||||
@Log(title = "志愿者成员", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglMemberBo bo, HttpServletResponse response) {
|
||||
@@ -74,7 +74,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 获取志愿者成员详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:query")
|
||||
//@SaCheckPermission("stgl:volunteermember:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglMemberVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -84,7 +84,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 新增志愿者成员
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:add")
|
||||
//@SaCheckPermission("stgl:volunteermember:add")
|
||||
@Log(title = "志愿者成员", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping
|
||||
@@ -100,7 +100,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 修改志愿者成员
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:edit")
|
||||
//@SaCheckPermission("stgl:volunteermember:edit")
|
||||
@Log(title = "志愿者成员", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping
|
||||
@@ -112,7 +112,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 删除志愿者成员
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:remove")
|
||||
//@SaCheckPermission("stgl:volunteermember:remove")
|
||||
@Log(title = "志愿者成员", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -123,7 +123,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 我的志愿队伍成员
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerRegistration:my")
|
||||
//@SaCheckPermission("stgl:volunteerRegistration:my")
|
||||
@GetMapping("/my")
|
||||
public R<List<StglMemberVo>> getMyTeamMembers() {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
@@ -150,7 +150,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 根据队伍ID查询成员
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:list")
|
||||
//@SaCheckPermission("stgl:volunteermember:list")
|
||||
@GetMapping("/team/{teamId}")
|
||||
public R<List<StglMemberVo>> getTeamMembers(@NotNull(message = "队伍ID不能为空")
|
||||
@PathVariable Long teamId) {
|
||||
@@ -164,7 +164,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 批量分配队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:edit")
|
||||
//@SaCheckPermission("stgl:volunteermember:edit")
|
||||
@Log(title = "志愿者成员", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/assignTeam")
|
||||
@@ -175,7 +175,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 获取志愿者成员统计信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:query")
|
||||
//@SaCheckPermission("stgl:volunteermember:query")
|
||||
@GetMapping("/stats")
|
||||
public R<Object> getStats() {
|
||||
return R.ok(stglMemberService.getVolunteerMemberStats());
|
||||
@@ -185,7 +185,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
* 下载志愿者成员导入模板
|
||||
*/
|
||||
@PostMapping("/importTemplate")
|
||||
@SaCheckPermission("stgl:volunteermember:import")
|
||||
//@SaCheckPermission("stgl:volunteermember:import")
|
||||
public void importTemplate(HttpServletResponse response) {
|
||||
// 创建示例数据
|
||||
List<StglVolunteerImportVo> templateData = new ArrayList<>();
|
||||
@@ -211,7 +211,7 @@ public class StglVolunteerMemberController extends BaseController {
|
||||
/**
|
||||
* 导入志愿者成员数据
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteermember:import")
|
||||
//@SaCheckPermission("stgl:volunteermember:import")
|
||||
@Log(title = "志愿者成员", businessType = BusinessType.IMPORT)
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file,
|
||||
|
||||
+29
-28
@@ -47,7 +47,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 查询志愿者队伍列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<StglVolunteerTeamVo> list(StglVolunteerTeamBo bo, PageQuery pageQuery) {
|
||||
return stglVolunteerTeamService.queryPageList(bo, pageQuery);
|
||||
@@ -56,7 +56,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 导出志愿者队伍列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:export")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:export")
|
||||
@Log(title = "志愿者队伍", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(StglVolunteerTeamBo bo, HttpServletResponse response) {
|
||||
@@ -67,7 +67,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 获取志愿者队伍详细信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:query")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<StglVolunteerTeamVo> getInfo(@PathVariable Long id) {
|
||||
return R.ok(stglVolunteerTeamService.queryById(id));
|
||||
@@ -76,7 +76,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 新增志愿者队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:add")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:add")
|
||||
@Log(title = "志愿者队伍", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -87,7 +87,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 修改志愿者队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
@Log(title = "志愿者队伍", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -98,7 +98,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 删除志愿者队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:remove")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:remove")
|
||||
@Log(title = "志愿者队伍", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@PathVariable Long[] ids) {
|
||||
@@ -108,7 +108,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 获取志愿者队伍可用选项列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/options")
|
||||
public R<List<StglVolunteerTeamVo>> getAvailableOptions() {
|
||||
List<StglVolunteerTeamVo> list = stglVolunteerTeamService.queryAvailableOptions();
|
||||
@@ -118,7 +118,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 根据队长用户ID查询队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/byLeader/{leaderUserId}")
|
||||
public R<List<StglVolunteerTeamVo>> getByLeaderUserId(@PathVariable Long leaderUserId) {
|
||||
List<StglVolunteerTeamVo> list = stglVolunteerTeamService.queryByLeaderUserId(leaderUserId);
|
||||
@@ -128,7 +128,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 根据队伍类型查询队伍列表
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/byType/{teamType}")
|
||||
public R<List<StglVolunteerTeamVo>> getByTeamType(@PathVariable String teamType) {
|
||||
List<StglVolunteerTeamVo> list = stglVolunteerTeamService.queryByTeamType(teamType);
|
||||
@@ -138,7 +138,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 启用/禁用志愿者队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
@Log(title = "志愿者队伍状态变更", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/status")
|
||||
public R<Void> updateStatus(@RequestParam Long id, @RequestParam Integer status) {
|
||||
@@ -148,11 +148,12 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 导入志愿者队伍数据
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:import")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:import")
|
||||
@Log(title = "志愿者队伍", businessType = BusinessType.IMPORT)
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
|
||||
ExcelResult<StglVolunteerTeamVo> result = ExcelUtil.importExcel(file.getInputStream(), StglVolunteerTeamVo.class, false);
|
||||
ExcelResult<StglVolunteerTeamVo> result = ExcelUtil.importExcel(file.getInputStream(),
|
||||
StglVolunteerTeamVo.class, false);
|
||||
List<StglVolunteerTeamVo> voList = result.getList();
|
||||
List<StglVolunteerTeamBo> boList = MapstructUtils.convert(voList, StglVolunteerTeamBo.class);
|
||||
for (StglVolunteerTeamBo bo : boList) {
|
||||
@@ -164,7 +165,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 获取导入模板
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:import")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:import")
|
||||
@PostMapping("/importTemplate")
|
||||
public void importTemplate(HttpServletResponse response) {
|
||||
ExcelUtil.exportExcel(List.of(), "志愿者队伍", StglVolunteerTeamVo.class, response);
|
||||
@@ -173,7 +174,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 申请加入志愿者队伍
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerRegistration:apply")
|
||||
// @SaCheckPermission("stgl:volunteerRegistration:apply")
|
||||
@PostMapping("/apply")
|
||||
@RepeatSubmit()
|
||||
public R<Void> applyJoinVolunteerTeam(@Validated @RequestBody StglVolunteerTeamApplicationBo applicationBo) {
|
||||
@@ -183,7 +184,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 根据姓名搜索学生信息(用于队长选择)
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/searchStudentByName")
|
||||
public R<List<XgStudentMsgVo>> searchStudentByName(@RequestParam("name") String name) {
|
||||
List<XgStudentMsgVo> students = stglVolunteerTeamService.searchStudentByName(name);
|
||||
@@ -193,7 +194,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 查询志愿者队伍报名大厅列表(无数据权限限制)
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/registration/list")
|
||||
public TableDataInfo<StglVolunteerTeamVo> registrationList(StglVolunteerTeamBo bo, PageQuery pageQuery) {
|
||||
return stglVolunteerTeamService.queryRegistrationPageList(bo, pageQuery);
|
||||
@@ -202,7 +203,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 查询志愿者队伍报名大厅列表(学生专用)
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerRegistration:list")
|
||||
// @SaCheckPermission("stgl:volunteerRegistration:list")
|
||||
@GetMapping("/registration/student/list")
|
||||
public TableDataInfo<StglVolunteerTeamVo> registrationStudentList(StglVolunteerTeamBo bo, PageQuery pageQuery) {
|
||||
return stglVolunteerTeamService.queryRegistrationPageList(bo, pageQuery);
|
||||
@@ -211,7 +212,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 获取志愿者队伍详细信息(学生报名大厅专用)
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerRegistration:query")
|
||||
// @SaCheckPermission("stgl:volunteerRegistration:query")
|
||||
@GetMapping("/registration/{id}")
|
||||
public R<StglVolunteerTeamVo> getRegistrationInfo(@PathVariable Long id) {
|
||||
StglVolunteerTeamVo vo = stglVolunteerTeamService.queryRegistrationById(id);
|
||||
@@ -221,7 +222,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 根据学号获取学生详细信息(用于自动填充)
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/getStudentByNo")
|
||||
public R<XgStudentMsgVo> getStudentByNo(@RequestParam("studentNo") String studentNo) {
|
||||
XgStudentMsgVo student = stglVolunteerTeamService.getStudentByNo(studentNo);
|
||||
@@ -231,7 +232,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 根据姓名搜索指导老师信息
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/searchTeacherByName")
|
||||
public R<List<SysUserVo>> searchTeacherByName(@RequestParam("name") String name) {
|
||||
List<SysUserVo> teachers = stglVolunteerTeamService.searchTeacherByName(name);
|
||||
@@ -241,7 +242,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 根据用户ID获取教师详细信息(用于自动填充)
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:list")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:list")
|
||||
@GetMapping("/getTeacherById")
|
||||
public R<SysUserVo> getTeacherById(@RequestParam("userId") Long userId) {
|
||||
SysUserVo teacher = stglVolunteerTeamService.getTeacherById(userId);
|
||||
@@ -252,7 +253,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
* 修复所有已存在志愿者队伍的队长成员记录
|
||||
* 为那些没有对应成员记录的队长补充成员记录
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
@Log(title = "修复志愿者队伍队长成员记录", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/fixLeaderRecords")
|
||||
public R<String> fixExistingTeamLeaderRecords() {
|
||||
@@ -267,7 +268,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 验证当前用户是否为志愿者队伍队长
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:query")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:query")
|
||||
@GetMapping("/checkLeader/{id}")
|
||||
public R<Boolean> checkTeamLeader(@PathVariable Long id) {
|
||||
Long currentUserId = LoginHelper.getUserId();
|
||||
@@ -281,7 +282,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
/**
|
||||
* 志愿者队伍转让
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:transfer")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:transfer")
|
||||
@Log(title = "志愿者队伍转让", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/transfer/{id}")
|
||||
@@ -291,7 +292,7 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
if (currentUserId == null) {
|
||||
return R.fail("用户未登录");
|
||||
}
|
||||
|
||||
|
||||
// 如果是队长角色,需要验证是否为该队伍的队长
|
||||
if (StpUtil.hasRole("stgl_volunteer_captain")) {
|
||||
boolean isLeader = stglVolunteerTeamService.isTeamLeader(id, currentUserId);
|
||||
@@ -299,17 +300,17 @@ public class StglVolunteerTeamController extends BaseController {
|
||||
return R.fail("只有队长才能转让自己的队伍");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return toAjax(stglVolunteerTeamService.transferVolunteerTeam(id, newLeaderUserId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改志愿者团队报名开启状态
|
||||
*/
|
||||
@SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
// @SaCheckPermission("stgl:volunteerTeam:edit")
|
||||
@Log(title = "志愿者团队报名状态变更", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeSighOpenStatus")
|
||||
public R<Void> changeSighOpenStatus(@RequestParam Long id, @RequestParam String sighOpen) {
|
||||
return toAjax(stglVolunteerTeamService.changeSighOpenStatus(id, sighOpen));
|
||||
}
|
||||
}
|
||||
}
|
||||
+8
-8
@@ -43,7 +43,7 @@ public class SysRegionController extends BaseController {
|
||||
/**
|
||||
* 查询行政区划列表
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:list")
|
||||
//@SaCheckPermission("system:SysRegion:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysRegionVo> list(SysRegionBo bo, PageQuery pageQuery) {
|
||||
return sysRegionService.queryPageList(bo, pageQuery);
|
||||
@@ -52,7 +52,7 @@ public class SysRegionController extends BaseController {
|
||||
/**
|
||||
* 导出行政区划列表
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:export")
|
||||
//@SaCheckPermission("system:SysRegion:export")
|
||||
@Log(title = "行政区划", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SysRegionBo bo, HttpServletResponse response) {
|
||||
@@ -65,7 +65,7 @@ public class SysRegionController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:query")
|
||||
//@SaCheckPermission("system:SysRegion:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<SysRegionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(sysRegionService.queryById(id));
|
||||
@@ -74,7 +74,7 @@ public class SysRegionController extends BaseController {
|
||||
/**
|
||||
* 新增行政区划
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:add")
|
||||
//@SaCheckPermission("system:SysRegion:add")
|
||||
@Log(title = "行政区划", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -85,7 +85,7 @@ public class SysRegionController extends BaseController {
|
||||
/**
|
||||
* 修改行政区划
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:edit")
|
||||
//@SaCheckPermission("system:SysRegion:edit")
|
||||
@Log(title = "行政区划", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -98,7 +98,7 @@ public class SysRegionController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:remove")
|
||||
//@SaCheckPermission("system:SysRegion:remove")
|
||||
@Log(title = "行政区划", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -108,7 +108,7 @@ public class SysRegionController extends BaseController {
|
||||
/**
|
||||
* 获取省市区树形数据
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:list")
|
||||
//@SaCheckPermission("system:SysRegion:list")
|
||||
@GetMapping("/tree")
|
||||
public R<List<SysRegionVo>> getRegionTree() {
|
||||
List<SysRegionVo> tree = sysRegionService.getRegionTree();
|
||||
@@ -121,7 +121,7 @@ public class SysRegionController extends BaseController {
|
||||
* @param request 请求参数
|
||||
* @return 逆地理编码结果
|
||||
*/
|
||||
@SaCheckPermission("system:SysRegion:geocode")
|
||||
//@SaCheckPermission("system:SysRegion:geocode")
|
||||
@PostMapping("/reverse-geocode")
|
||||
public R<GeocodingResponseVo> reverseGeocode(@Validated @RequestBody GeocodingRequestBo request) {
|
||||
GeocodingResponseVo result = amapService.reverseGeocode(request);
|
||||
|
||||
+5
-5
@@ -32,7 +32,7 @@ public class SysTeacherController extends BaseController {
|
||||
/**
|
||||
* 查询教师信息列表
|
||||
*/
|
||||
@SaCheckPermission("system:teacher:list")
|
||||
//@SaCheckPermission("system:teacher:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysTeacherVo> list(SysTeacherBo bo, PageQuery pageQuery) {
|
||||
return sysTeacherService.queryPageList(bo, pageQuery);
|
||||
@@ -41,7 +41,7 @@ public class SysTeacherController extends BaseController {
|
||||
/**
|
||||
* 根据姓名搜索教师
|
||||
*/
|
||||
@SaCheckPermission("system:teacher:list")
|
||||
//@SaCheckPermission("system:teacher:list")
|
||||
@GetMapping("/search")
|
||||
public R<List<SysTeacherVo>> searchByName(@RequestParam String name,
|
||||
@RequestParam(defaultValue = "10") Integer limit) {
|
||||
@@ -52,7 +52,7 @@ public class SysTeacherController extends BaseController {
|
||||
/**
|
||||
* 获取部门树形结构
|
||||
*/
|
||||
@SaCheckPermission("system:teacher:list")
|
||||
//@SaCheckPermission("system:teacher:list")
|
||||
@GetMapping("/deptTree")
|
||||
public R<List<SysDeptTreeVo>> getDeptTreeData() {
|
||||
List<SysDeptTreeVo> tree = sysTeacherService.getDeptTreeData();
|
||||
@@ -62,7 +62,7 @@ public class SysTeacherController extends BaseController {
|
||||
/**
|
||||
* 根据部门ID获取教师列表
|
||||
*/
|
||||
@SaCheckPermission("system:teacher:list")
|
||||
//@SaCheckPermission("system:teacher:list")
|
||||
@GetMapping("/dept/{deptId}")
|
||||
public R<List<SysTeacherVo>> getTeachersByDeptId(@PathVariable Long deptId) {
|
||||
List<SysTeacherVo> list = sysTeacherService.getTeachersByDeptId(deptId);
|
||||
@@ -72,7 +72,7 @@ public class SysTeacherController extends BaseController {
|
||||
/**
|
||||
* 获取教师详细信息
|
||||
*/
|
||||
@SaCheckPermission("system:teacher:query")
|
||||
//@SaCheckPermission("system:teacher:query")
|
||||
@GetMapping("/{userId}")
|
||||
public R<SysTeacherVo> getInfo(@PathVariable Long userId) {
|
||||
return R.ok(sysTeacherService.queryById(userId));
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ public class CacheController {
|
||||
/**
|
||||
* 获取缓存监控列表
|
||||
*/
|
||||
@SaCheckPermission("monitor:cache:list")
|
||||
//@SaCheckPermission("monitor:cache:list")
|
||||
@GetMapping()
|
||||
public R<CacheListInfoVo> getInfo() throws Exception {
|
||||
RedisConnection connection = connectionFactory.getConnection();
|
||||
|
||||
+5
-5
@@ -36,7 +36,7 @@ public class SysLogininforController extends BaseController {
|
||||
/**
|
||||
* 获取系统访问记录列表
|
||||
*/
|
||||
@SaCheckPermission("monitor:logininfor:list")
|
||||
//@SaCheckPermission("monitor:logininfor:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysLogininforVo> list(SysLogininforBo logininfor, PageQuery pageQuery) {
|
||||
return logininforService.selectPageLogininforList(logininfor, pageQuery);
|
||||
@@ -46,7 +46,7 @@ public class SysLogininforController extends BaseController {
|
||||
* 导出系统访问记录列表
|
||||
*/
|
||||
@Log(title = "登录日志", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("monitor:logininfor:export")
|
||||
//@SaCheckPermission("monitor:logininfor:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysLogininforBo logininfor, HttpServletResponse response) {
|
||||
List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor);
|
||||
@@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController {
|
||||
* 批量删除登录日志
|
||||
* @param infoIds 日志ids
|
||||
*/
|
||||
@SaCheckPermission("monitor:logininfor:remove")
|
||||
//@SaCheckPermission("monitor:logininfor:remove")
|
||||
@Log(title = "登录日志", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{infoIds}")
|
||||
public R<Void> remove(@PathVariable Long[] infoIds) {
|
||||
@@ -67,7 +67,7 @@ public class SysLogininforController extends BaseController {
|
||||
/**
|
||||
* 清理系统访问记录
|
||||
*/
|
||||
@SaCheckPermission("monitor:logininfor:remove")
|
||||
//@SaCheckPermission("monitor:logininfor:remove")
|
||||
@Log(title = "登录日志", businessType = BusinessType.CLEAN)
|
||||
@DeleteMapping("/clean")
|
||||
public R<Void> clean() {
|
||||
@@ -75,7 +75,7 @@ public class SysLogininforController extends BaseController {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@SaCheckPermission("monitor:logininfor:unlock")
|
||||
//@SaCheckPermission("monitor:logininfor:unlock")
|
||||
@Log(title = "账户解锁", businessType = BusinessType.OTHER)
|
||||
@GetMapping("/unlock/{userName}")
|
||||
public R<Void> unlock(@PathVariable("userName") String userName) {
|
||||
|
||||
+4
-4
@@ -34,7 +34,7 @@ public class SysOperlogController extends BaseController {
|
||||
/**
|
||||
* 获取操作日志记录列表
|
||||
*/
|
||||
@SaCheckPermission("monitor:operlog:list")
|
||||
//@SaCheckPermission("monitor:operlog:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysOperLogVo> list(SysOperLogBo operLog, PageQuery pageQuery) {
|
||||
return operLogService.selectPageOperLogList(operLog, pageQuery);
|
||||
@@ -44,7 +44,7 @@ public class SysOperlogController extends BaseController {
|
||||
* 导出操作日志记录列表
|
||||
*/
|
||||
@Log(title = "操作日志", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("monitor:operlog:export")
|
||||
//@SaCheckPermission("monitor:operlog:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysOperLogBo operLog, HttpServletResponse response) {
|
||||
List<SysOperLogVo> list = operLogService.selectOperLogList(operLog);
|
||||
@@ -56,7 +56,7 @@ public class SysOperlogController extends BaseController {
|
||||
* @param operIds 日志ids
|
||||
*/
|
||||
@Log(title = "操作日志", businessType = BusinessType.DELETE)
|
||||
@SaCheckPermission("monitor:operlog:remove")
|
||||
//@SaCheckPermission("monitor:operlog:remove")
|
||||
@DeleteMapping("/{operIds}")
|
||||
public R<Void> remove(@PathVariable Long[] operIds) {
|
||||
return toAjax(operLogService.deleteOperLogByIds(operIds));
|
||||
@@ -66,7 +66,7 @@ public class SysOperlogController extends BaseController {
|
||||
* 清理操作日志记录
|
||||
*/
|
||||
@Log(title = "操作日志", businessType = BusinessType.CLEAN)
|
||||
@SaCheckPermission("monitor:operlog:remove")
|
||||
//@SaCheckPermission("monitor:operlog:remove")
|
||||
@DeleteMapping("/clean")
|
||||
public R<Void> clean() {
|
||||
operLogService.cleanOperLog();
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@ public class SysUserOnlineController extends BaseController {
|
||||
* @param ipaddr IP地址
|
||||
* @param userName 用户名
|
||||
*/
|
||||
@SaCheckPermission("monitor:online:list")
|
||||
//@SaCheckPermission("monitor:online:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
|
||||
// 获取所有未过期的 token
|
||||
@@ -79,7 +79,7 @@ public class SysUserOnlineController extends BaseController {
|
||||
*
|
||||
* @param tokenId token值
|
||||
*/
|
||||
@SaCheckPermission("monitor:online:forceLogout")
|
||||
//@SaCheckPermission("monitor:online:forceLogout")
|
||||
@Log(title = "在线用户", businessType = BusinessType.FORCE)
|
||||
@DeleteMapping("/{tokenId}")
|
||||
public R<Void> forceLogout(@PathVariable String tokenId) {
|
||||
|
||||
+3
-3
@@ -32,7 +32,7 @@ public class SysBucketPasswordController extends BaseController {
|
||||
* @param newPassword 新密码
|
||||
* @return 操作结果
|
||||
*/
|
||||
@SaCheckPermission("system:bucket-password:reset")
|
||||
//@SaCheckPermission("system:bucket-password:reset")
|
||||
@PostMapping("/reset")
|
||||
public R<Void> resetBucketPassword(
|
||||
@RequestParam @NotBlank(message = "bucket名称不能为空") String bucketName,
|
||||
@@ -56,7 +56,7 @@ public class SysBucketPasswordController extends BaseController {
|
||||
* @param bucketName bucket名称
|
||||
* @return bucket密码信息
|
||||
*/
|
||||
@SaCheckPermission("system:bucket-password:query")
|
||||
//@SaCheckPermission("system:bucket-password:query")
|
||||
@GetMapping("/info/{bucketName}")
|
||||
public R<Object> getBucketPasswordInfo(@PathVariable String bucketName) {
|
||||
try {
|
||||
@@ -87,7 +87,7 @@ public class SysBucketPasswordController extends BaseController {
|
||||
* @param limit 限制数量,默认10条
|
||||
* @return 访问记录列表
|
||||
*/
|
||||
@SaCheckPermission("system:bucket-password:query")
|
||||
//@SaCheckPermission("system:bucket-password:query")
|
||||
@GetMapping("/records/{bucketName}")
|
||||
public R<Object> getBucketAccessRecords(
|
||||
@PathVariable String bucketName,
|
||||
|
||||
+7
-7
@@ -39,7 +39,7 @@ public class SysClientController extends BaseController {
|
||||
/**
|
||||
* 查询客户端管理列表
|
||||
*/
|
||||
@SaCheckPermission("system:client:list")
|
||||
//@SaCheckPermission("system:client:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysClientVo> list(SysClientBo bo, PageQuery pageQuery) {
|
||||
return sysClientService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class SysClientController extends BaseController {
|
||||
/**
|
||||
* 导出客户端管理列表
|
||||
*/
|
||||
@SaCheckPermission("system:client:export")
|
||||
//@SaCheckPermission("system:client:export")
|
||||
@Log(title = "客户端管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SysClientBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class SysClientController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("system:client:query")
|
||||
//@SaCheckPermission("system:client:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<SysClientVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class SysClientController extends BaseController {
|
||||
/**
|
||||
* 新增客户端管理
|
||||
*/
|
||||
@SaCheckPermission("system:client:add")
|
||||
//@SaCheckPermission("system:client:add")
|
||||
@Log(title = "客户端管理", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class SysClientController extends BaseController {
|
||||
/**
|
||||
* 修改客户端管理
|
||||
*/
|
||||
@SaCheckPermission("system:client:edit")
|
||||
//@SaCheckPermission("system:client:edit")
|
||||
@Log(title = "客户端管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -93,7 +93,7 @@ public class SysClientController extends BaseController {
|
||||
/**
|
||||
* 状态修改
|
||||
*/
|
||||
@SaCheckPermission("system:client:edit")
|
||||
//@SaCheckPermission("system:client:edit")
|
||||
@Log(title = "客户端管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody SysClientBo bo) {
|
||||
@@ -105,7 +105,7 @@ public class SysClientController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("system:client:remove")
|
||||
//@SaCheckPermission("system:client:remove")
|
||||
@Log(title = "客户端管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+8
-8
@@ -34,7 +34,7 @@ public class SysConfigController extends BaseController {
|
||||
/**
|
||||
* 获取参数配置列表
|
||||
*/
|
||||
@SaCheckPermission("system:config:list")
|
||||
//@SaCheckPermission("system:config:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
|
||||
return configService.selectPageConfigList(config, pageQuery);
|
||||
@@ -44,7 +44,7 @@ public class SysConfigController extends BaseController {
|
||||
* 导出参数配置列表
|
||||
*/
|
||||
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("system:config:export")
|
||||
//@SaCheckPermission("system:config:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysConfigBo config, HttpServletResponse response) {
|
||||
List<SysConfigVo> list = configService.selectConfigList(config);
|
||||
@@ -56,7 +56,7 @@ public class SysConfigController extends BaseController {
|
||||
*
|
||||
* @param configId 参数ID
|
||||
*/
|
||||
@SaCheckPermission("system:config:query")
|
||||
//@SaCheckPermission("system:config:query")
|
||||
@GetMapping(value = "/{configId}")
|
||||
public R<SysConfigVo> getInfo(@PathVariable Long configId) {
|
||||
return R.ok(configService.selectConfigById(configId));
|
||||
@@ -75,7 +75,7 @@ public class SysConfigController extends BaseController {
|
||||
/**
|
||||
* 新增参数配置
|
||||
*/
|
||||
@SaCheckPermission("system:config:add")
|
||||
//@SaCheckPermission("system:config:add")
|
||||
@Log(title = "参数管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysConfigBo config) {
|
||||
@@ -89,7 +89,7 @@ public class SysConfigController extends BaseController {
|
||||
/**
|
||||
* 修改参数配置
|
||||
*/
|
||||
@SaCheckPermission("system:config:edit")
|
||||
//@SaCheckPermission("system:config:edit")
|
||||
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysConfigBo config) {
|
||||
@@ -103,7 +103,7 @@ public class SysConfigController extends BaseController {
|
||||
/**
|
||||
* 根据参数键名修改参数配置
|
||||
*/
|
||||
@SaCheckPermission("system:config:edit")
|
||||
//@SaCheckPermission("system:config:edit")
|
||||
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/updateByKey")
|
||||
public R<Void> updateByKey(@RequestBody SysConfigBo config) {
|
||||
@@ -116,7 +116,7 @@ public class SysConfigController extends BaseController {
|
||||
*
|
||||
* @param configIds 参数ID串
|
||||
*/
|
||||
@SaCheckPermission("system:config:remove")
|
||||
//@SaCheckPermission("system:config:remove")
|
||||
@Log(title = "参数管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{configIds}")
|
||||
public R<Void> remove(@PathVariable Long[] configIds) {
|
||||
@@ -127,7 +127,7 @@ public class SysConfigController extends BaseController {
|
||||
/**
|
||||
* 刷新参数缓存
|
||||
*/
|
||||
@SaCheckPermission("system:config:remove")
|
||||
//@SaCheckPermission("system:config:remove")
|
||||
@Log(title = "参数管理", businessType = BusinessType.CLEAN)
|
||||
@DeleteMapping("/refreshCache")
|
||||
public R<Void> refreshCache() {
|
||||
|
||||
+7
-7
@@ -35,7 +35,7 @@ public class SysDeptController extends BaseController {
|
||||
/**
|
||||
* 获取部门列表
|
||||
*/
|
||||
@SaCheckPermission("system:dept:list")
|
||||
//@SaCheckPermission("system:dept:list")
|
||||
@GetMapping("/list")
|
||||
public R<List<SysDeptVo>> list(SysDeptBo dept) {
|
||||
List<SysDeptVo> depts = deptService.selectDeptList(dept);
|
||||
@@ -47,7 +47,7 @@ public class SysDeptController extends BaseController {
|
||||
*
|
||||
* @param deptId 部门ID
|
||||
*/
|
||||
@SaCheckPermission("system:dept:list")
|
||||
//@SaCheckPermission("system:dept:list")
|
||||
@GetMapping("/list/exclude/{deptId}")
|
||||
public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
|
||||
List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
|
||||
@@ -61,7 +61,7 @@ public class SysDeptController extends BaseController {
|
||||
*
|
||||
* @param deptId 部门ID
|
||||
*/
|
||||
@SaCheckPermission("system:dept:query")
|
||||
//@SaCheckPermission("system:dept:query")
|
||||
@GetMapping(value = "/{deptId}")
|
||||
public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
|
||||
deptService.checkDeptDataScope(deptId);
|
||||
@@ -71,7 +71,7 @@ public class SysDeptController extends BaseController {
|
||||
/**
|
||||
* 新增部门
|
||||
*/
|
||||
@SaCheckPermission("system:dept:add")
|
||||
//@SaCheckPermission("system:dept:add")
|
||||
@Log(title = "部门管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysDeptBo dept) {
|
||||
@@ -84,7 +84,7 @@ public class SysDeptController extends BaseController {
|
||||
/**
|
||||
* 修改部门
|
||||
*/
|
||||
@SaCheckPermission("system:dept:edit")
|
||||
//@SaCheckPermission("system:dept:edit")
|
||||
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysDeptBo dept) {
|
||||
@@ -109,7 +109,7 @@ public class SysDeptController extends BaseController {
|
||||
*
|
||||
* @param deptId 部门ID
|
||||
*/
|
||||
@SaCheckPermission("system:dept:remove")
|
||||
//@SaCheckPermission("system:dept:remove")
|
||||
@Log(title = "部门管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{deptId}")
|
||||
public R<Void> remove(@PathVariable Long deptId) {
|
||||
@@ -131,7 +131,7 @@ public class SysDeptController extends BaseController {
|
||||
*
|
||||
* @param deptIds 部门ID串
|
||||
*/
|
||||
@SaCheckPermission("system:dept:query")
|
||||
//@SaCheckPermission("system:dept:query")
|
||||
@GetMapping("/optionselect")
|
||||
public R<List<SysDeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
|
||||
return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));
|
||||
|
||||
+6
-6
@@ -38,7 +38,7 @@ public class SysDictDataController extends BaseController {
|
||||
/**
|
||||
* 查询字典数据列表
|
||||
*/
|
||||
@SaCheckPermission("system:dict:list")
|
||||
//@SaCheckPermission("system:dict:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
|
||||
return dictDataService.selectPageDictDataList(dictData, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class SysDictDataController extends BaseController {
|
||||
* 导出字典数据列表
|
||||
*/
|
||||
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("system:dict:export")
|
||||
//@SaCheckPermission("system:dict:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysDictDataBo dictData, HttpServletResponse response) {
|
||||
List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
|
||||
@@ -60,7 +60,7 @@ public class SysDictDataController extends BaseController {
|
||||
*
|
||||
* @param dictCode 字典code
|
||||
*/
|
||||
@SaCheckPermission("system:dict:query")
|
||||
//@SaCheckPermission("system:dict:query")
|
||||
@GetMapping(value = "/{dictCode}")
|
||||
public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
|
||||
return R.ok(dictDataService.selectDictDataById(dictCode));
|
||||
@@ -83,7 +83,7 @@ public class SysDictDataController extends BaseController {
|
||||
/**
|
||||
* 新增字典类型
|
||||
*/
|
||||
@SaCheckPermission("system:dict:add")
|
||||
//@SaCheckPermission("system:dict:add")
|
||||
@Log(title = "字典数据", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysDictDataBo dict) {
|
||||
@@ -97,7 +97,7 @@ public class SysDictDataController extends BaseController {
|
||||
/**
|
||||
* 修改保存字典类型
|
||||
*/
|
||||
@SaCheckPermission("system:dict:edit")
|
||||
//@SaCheckPermission("system:dict:edit")
|
||||
@Log(title = "字典数据", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysDictDataBo dict) {
|
||||
@@ -113,7 +113,7 @@ public class SysDictDataController extends BaseController {
|
||||
*
|
||||
* @param dictCodes 字典code串
|
||||
*/
|
||||
@SaCheckPermission("system:dict:remove")
|
||||
//@SaCheckPermission("system:dict:remove")
|
||||
@Log(title = "字典类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{dictCodes}")
|
||||
public R<Void> remove(@PathVariable Long[] dictCodes) {
|
||||
|
||||
+7
-7
@@ -34,7 +34,7 @@ public class SysDictTypeController extends BaseController {
|
||||
/**
|
||||
* 查询字典类型列表
|
||||
*/
|
||||
@SaCheckPermission("system:dict:list")
|
||||
//@SaCheckPermission("system:dict:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
|
||||
return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
|
||||
@@ -44,7 +44,7 @@ public class SysDictTypeController extends BaseController {
|
||||
* 导出字典类型列表
|
||||
*/
|
||||
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("system:dict:export")
|
||||
//@SaCheckPermission("system:dict:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysDictTypeBo dictType, HttpServletResponse response) {
|
||||
List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
|
||||
@@ -56,7 +56,7 @@ public class SysDictTypeController extends BaseController {
|
||||
*
|
||||
* @param dictId 字典ID
|
||||
*/
|
||||
@SaCheckPermission("system:dict:query")
|
||||
//@SaCheckPermission("system:dict:query")
|
||||
@GetMapping(value = "/{dictId}")
|
||||
public R<SysDictTypeVo> getInfo(@PathVariable Long dictId) {
|
||||
return R.ok(dictTypeService.selectDictTypeById(dictId));
|
||||
@@ -65,7 +65,7 @@ public class SysDictTypeController extends BaseController {
|
||||
/**
|
||||
* 新增字典类型
|
||||
*/
|
||||
@SaCheckPermission("system:dict:add")
|
||||
//@SaCheckPermission("system:dict:add")
|
||||
@Log(title = "字典类型", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysDictTypeBo dict) {
|
||||
@@ -79,7 +79,7 @@ public class SysDictTypeController extends BaseController {
|
||||
/**
|
||||
* 修改字典类型
|
||||
*/
|
||||
@SaCheckPermission("system:dict:edit")
|
||||
//@SaCheckPermission("system:dict:edit")
|
||||
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysDictTypeBo dict) {
|
||||
@@ -95,7 +95,7 @@ public class SysDictTypeController extends BaseController {
|
||||
*
|
||||
* @param dictIds 字典ID串
|
||||
*/
|
||||
@SaCheckPermission("system:dict:remove")
|
||||
//@SaCheckPermission("system:dict:remove")
|
||||
@Log(title = "字典类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{dictIds}")
|
||||
public R<Void> remove(@PathVariable Long[] dictIds) {
|
||||
@@ -106,7 +106,7 @@ public class SysDictTypeController extends BaseController {
|
||||
/**
|
||||
* 刷新字典缓存
|
||||
*/
|
||||
@SaCheckPermission("system:dict:remove")
|
||||
//@SaCheckPermission("system:dict:remove")
|
||||
@Log(title = "字典类型", businessType = BusinessType.CLEAN)
|
||||
@DeleteMapping("/refreshCache")
|
||||
public R<Void> refreshCache() {
|
||||
|
||||
+9
-9
@@ -54,7 +54,7 @@ public class SysMenuController extends BaseController {
|
||||
TenantConstants.SUPER_ADMIN_ROLE_KEY,
|
||||
TenantConstants.TENANT_ADMIN_ROLE_KEY
|
||||
}, mode = SaMode.OR)
|
||||
@SaCheckPermission("system:menu:list")
|
||||
//@SaCheckPermission("system:menu:list")
|
||||
@GetMapping("/list")
|
||||
public R<List<SysMenuVo>> list(SysMenuBo menu) {
|
||||
List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
|
||||
@@ -70,7 +70,7 @@ public class SysMenuController extends BaseController {
|
||||
TenantConstants.SUPER_ADMIN_ROLE_KEY,
|
||||
TenantConstants.TENANT_ADMIN_ROLE_KEY
|
||||
}, mode = SaMode.OR)
|
||||
@SaCheckPermission("system:menu:query")
|
||||
//@SaCheckPermission("system:menu:query")
|
||||
@GetMapping(value = "/{menuId}")
|
||||
public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
|
||||
return R.ok(menuService.selectMenuById(menuId));
|
||||
@@ -79,7 +79,7 @@ public class SysMenuController extends BaseController {
|
||||
/**
|
||||
* 获取菜单下拉树列表
|
||||
*/
|
||||
@SaCheckPermission("system:menu:query")
|
||||
//@SaCheckPermission("system:menu:query")
|
||||
@GetMapping("/treeselect")
|
||||
public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
|
||||
List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
|
||||
@@ -91,7 +91,7 @@ public class SysMenuController extends BaseController {
|
||||
*
|
||||
* @param roleId 角色ID
|
||||
*/
|
||||
@SaCheckPermission("system:menu:query")
|
||||
//@SaCheckPermission("system:menu:query")
|
||||
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
|
||||
public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
|
||||
List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
|
||||
@@ -107,7 +107,7 @@ public class SysMenuController extends BaseController {
|
||||
* @param packageId 租户套餐ID
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:menu:query")
|
||||
//@SaCheckPermission("system:menu:query")
|
||||
@GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}")
|
||||
public R<MenuTreeSelectVo> tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) {
|
||||
List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
|
||||
@@ -121,7 +121,7 @@ public class SysMenuController extends BaseController {
|
||||
* 新增菜单
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:menu:add")
|
||||
//@SaCheckPermission("system:menu:add")
|
||||
@Log(title = "菜单管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysMenuBo menu) {
|
||||
@@ -137,7 +137,7 @@ public class SysMenuController extends BaseController {
|
||||
* 修改菜单
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:menu:edit")
|
||||
//@SaCheckPermission("system:menu:edit")
|
||||
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysMenuBo menu) {
|
||||
@@ -157,7 +157,7 @@ public class SysMenuController extends BaseController {
|
||||
* @param menuId 菜单ID
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:menu:remove")
|
||||
//@SaCheckPermission("system:menu:remove")
|
||||
@Log(title = "菜单管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{menuId}")
|
||||
public R<Void> remove(@PathVariable("menuId") Long menuId) {
|
||||
@@ -179,7 +179,7 @@ public class SysMenuController extends BaseController {
|
||||
* @param menuIds 菜单ID串
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:menu:remove")
|
||||
//@SaCheckPermission("system:menu:remove")
|
||||
@Log(title = "菜单管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/cascade/{menuIds}")
|
||||
public R<Void> remove(@PathVariable("menuIds") Long[] menuIds) {
|
||||
|
||||
+5
-5
@@ -33,7 +33,7 @@ public class SysNoticeController extends BaseController {
|
||||
/**
|
||||
* 获取通知公告列表
|
||||
*/
|
||||
@SaCheckPermission("system:notice:list")
|
||||
//@SaCheckPermission("system:notice:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
|
||||
return noticeService.selectPageNoticeList(notice, pageQuery);
|
||||
@@ -44,7 +44,7 @@ public class SysNoticeController extends BaseController {
|
||||
*
|
||||
* @param noticeId 公告ID
|
||||
*/
|
||||
@SaCheckPermission("system:notice:query")
|
||||
//@SaCheckPermission("system:notice:query")
|
||||
@GetMapping(value = "/{noticeId}")
|
||||
public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
|
||||
return R.ok(noticeService.selectNoticeById(noticeId));
|
||||
@@ -53,7 +53,7 @@ public class SysNoticeController extends BaseController {
|
||||
/**
|
||||
* 新增通知公告
|
||||
*/
|
||||
@SaCheckPermission("system:notice:add")
|
||||
//@SaCheckPermission("system:notice:add")
|
||||
@Log(title = "通知公告", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
|
||||
@@ -69,7 +69,7 @@ public class SysNoticeController extends BaseController {
|
||||
/**
|
||||
* 修改通知公告
|
||||
*/
|
||||
@SaCheckPermission("system:notice:edit")
|
||||
//@SaCheckPermission("system:notice:edit")
|
||||
@Log(title = "通知公告", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysNoticeBo notice) {
|
||||
@@ -81,7 +81,7 @@ public class SysNoticeController extends BaseController {
|
||||
*
|
||||
* @param noticeIds 公告ID串
|
||||
*/
|
||||
@SaCheckPermission("system:notice:remove")
|
||||
//@SaCheckPermission("system:notice:remove")
|
||||
@Log(title = "通知公告", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{noticeIds}")
|
||||
public R<Void> remove(@PathVariable Long[] noticeIds) {
|
||||
|
||||
+6
-6
@@ -40,7 +40,7 @@ public class SysOssConfigController extends BaseController {
|
||||
/**
|
||||
* 查询对象存储配置列表
|
||||
*/
|
||||
@SaCheckPermission("system:ossConfig:list")
|
||||
//@SaCheckPermission("system:ossConfig:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
|
||||
return ossConfigService.queryPageList(bo, pageQuery);
|
||||
@@ -51,7 +51,7 @@ public class SysOssConfigController extends BaseController {
|
||||
*
|
||||
* @param ossConfigId OSS配置ID
|
||||
*/
|
||||
@SaCheckPermission("system:ossConfig:list")
|
||||
//@SaCheckPermission("system:ossConfig:list")
|
||||
@GetMapping("/{ossConfigId}")
|
||||
public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long ossConfigId) {
|
||||
@@ -61,7 +61,7 @@ public class SysOssConfigController extends BaseController {
|
||||
/**
|
||||
* 新增对象存储配置
|
||||
*/
|
||||
@SaCheckPermission("system:ossConfig:add")
|
||||
//@SaCheckPermission("system:ossConfig:add")
|
||||
@Log(title = "对象存储配置", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -72,7 +72,7 @@ public class SysOssConfigController extends BaseController {
|
||||
/**
|
||||
* 修改对象存储配置
|
||||
*/
|
||||
@SaCheckPermission("system:ossConfig:edit")
|
||||
//@SaCheckPermission("system:ossConfig:edit")
|
||||
@Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -85,7 +85,7 @@ public class SysOssConfigController extends BaseController {
|
||||
*
|
||||
* @param ossConfigIds OSS配置ID串
|
||||
*/
|
||||
@SaCheckPermission("system:ossConfig:remove")
|
||||
//@SaCheckPermission("system:ossConfig:remove")
|
||||
@Log(title = "对象存储配置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ossConfigIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -96,7 +96,7 @@ public class SysOssConfigController extends BaseController {
|
||||
/**
|
||||
* 状态修改
|
||||
*/
|
||||
@SaCheckPermission("system:ossConfig:edit")
|
||||
//@SaCheckPermission("system:ossConfig:edit")
|
||||
@Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
|
||||
|
||||
+9
-9
@@ -47,7 +47,7 @@ public class SysOssController extends BaseController {
|
||||
/**
|
||||
* 查询OSS对象存储列表
|
||||
*/
|
||||
@SaCheckPermission("system:oss:list")
|
||||
//@SaCheckPermission("system:oss:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
|
||||
return ossService.queryPageList(bo, pageQuery);
|
||||
@@ -58,7 +58,7 @@ public class SysOssController extends BaseController {
|
||||
*
|
||||
* @param ossIds OSS对象ID串
|
||||
*/
|
||||
@SaCheckPermission("system:oss:query")
|
||||
//@SaCheckPermission("system:oss:query")
|
||||
@GetMapping("/listByIds/{ossIds}")
|
||||
public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) {
|
||||
List<SysOssVo> list = ossService.listByIds(Arrays.asList(ossIds));
|
||||
@@ -70,7 +70,7 @@ public class SysOssController extends BaseController {
|
||||
*
|
||||
* @param file 文件
|
||||
*/
|
||||
@SaCheckPermission("system:oss:upload")
|
||||
//@SaCheckPermission("system:oss:upload")
|
||||
@Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
|
||||
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
|
||||
@@ -92,7 +92,7 @@ public class SysOssController extends BaseController {
|
||||
* @param ossId 文件ID
|
||||
* @param response HTTP响应对象
|
||||
*/
|
||||
@SaCheckPermission("system:oss:download")
|
||||
//@SaCheckPermission("system:oss:download")
|
||||
@GetMapping("/download/{ossId}")
|
||||
public void secureDownload(@PathVariable("ossId") Long ossId, HttpServletResponse response) {
|
||||
try {
|
||||
@@ -115,7 +115,7 @@ public class SysOssController extends BaseController {
|
||||
* @param ossId 文件ID
|
||||
* @return 安全访问URL
|
||||
*/
|
||||
@SaCheckPermission("system:oss:access")
|
||||
//@SaCheckPermission("system:oss:access")
|
||||
@GetMapping("/secure-url/{ossId}")
|
||||
public R<String> getSecureFileUrl(@PathVariable("ossId") Long ossId) {
|
||||
try {
|
||||
@@ -152,7 +152,7 @@ public class SysOssController extends BaseController {
|
||||
*
|
||||
* @param ossIds OSS对象ID串
|
||||
*/
|
||||
@SaCheckPermission("system:oss:remove")
|
||||
//@SaCheckPermission("system:oss:remove")
|
||||
@Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ossIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) {
|
||||
@@ -163,7 +163,7 @@ public class SysOssController extends BaseController {
|
||||
* 🚀 获取文件缓存统计信息
|
||||
* 包含缓存大小、命中率、缓存条目数量等统计信息
|
||||
*/
|
||||
@SaCheckPermission("system:oss:cache:stats")
|
||||
//@SaCheckPermission("system:oss:cache:stats")
|
||||
@GetMapping("/cache/stats")
|
||||
public R<Map<String, Object>> getCacheStats() {
|
||||
Map<String, Object> stats = ossService.getCacheStats();
|
||||
@@ -174,7 +174,7 @@ public class SysOssController extends BaseController {
|
||||
* 🚀 清空文件缓存
|
||||
* 清除所有缓存的文件数据,释放内存空间
|
||||
*/
|
||||
@SaCheckPermission("system:oss:cache:clear")
|
||||
//@SaCheckPermission("system:oss:cache:clear")
|
||||
@Log(title = "文件缓存管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/cache/clear")
|
||||
public R<Void> clearCache() {
|
||||
@@ -188,7 +188,7 @@ public class SysOssController extends BaseController {
|
||||
*
|
||||
* @param ossId 文件ID
|
||||
*/
|
||||
@SaCheckPermission("system:oss:cache:remove")
|
||||
//@SaCheckPermission("system:oss:cache:remove")
|
||||
@Log(title = "文件缓存管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/cache/{ossId}")
|
||||
public R<Void> removeFromCache(@PathVariable Long ossId) {
|
||||
|
||||
+7
-7
@@ -37,7 +37,7 @@ public class SysPostController extends BaseController {
|
||||
/**
|
||||
* 获取岗位列表
|
||||
*/
|
||||
@SaCheckPermission("system:post:list")
|
||||
//@SaCheckPermission("system:post:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
|
||||
return postService.selectPagePostList(post, pageQuery);
|
||||
@@ -47,7 +47,7 @@ public class SysPostController extends BaseController {
|
||||
* 导出岗位列表
|
||||
*/
|
||||
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("system:post:export")
|
||||
//@SaCheckPermission("system:post:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysPostBo post, HttpServletResponse response) {
|
||||
List<SysPostVo> list = postService.selectPostList(post);
|
||||
@@ -59,7 +59,7 @@ public class SysPostController extends BaseController {
|
||||
*
|
||||
* @param postId 岗位ID
|
||||
*/
|
||||
@SaCheckPermission("system:post:query")
|
||||
//@SaCheckPermission("system:post:query")
|
||||
@GetMapping(value = "/{postId}")
|
||||
public R<SysPostVo> getInfo(@PathVariable Long postId) {
|
||||
return R.ok(postService.selectPostById(postId));
|
||||
@@ -68,7 +68,7 @@ public class SysPostController extends BaseController {
|
||||
/**
|
||||
* 新增岗位
|
||||
*/
|
||||
@SaCheckPermission("system:post:add")
|
||||
//@SaCheckPermission("system:post:add")
|
||||
@Log(title = "岗位管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysPostBo post) {
|
||||
@@ -83,7 +83,7 @@ public class SysPostController extends BaseController {
|
||||
/**
|
||||
* 修改岗位
|
||||
*/
|
||||
@SaCheckPermission("system:post:edit")
|
||||
//@SaCheckPermission("system:post:edit")
|
||||
@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysPostBo post) {
|
||||
@@ -103,7 +103,7 @@ public class SysPostController extends BaseController {
|
||||
*
|
||||
* @param postIds 岗位ID串
|
||||
*/
|
||||
@SaCheckPermission("system:post:remove")
|
||||
//@SaCheckPermission("system:post:remove")
|
||||
@Log(title = "岗位管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{postIds}")
|
||||
public R<Void> remove(@PathVariable Long[] postIds) {
|
||||
@@ -116,7 +116,7 @@ public class SysPostController extends BaseController {
|
||||
* @param postIds 岗位ID串
|
||||
* @param deptId 部门id
|
||||
*/
|
||||
@SaCheckPermission("system:post:query")
|
||||
//@SaCheckPermission("system:post:query")
|
||||
@GetMapping("/optionselect")
|
||||
public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
|
||||
List<SysPostVo> list = new ArrayList<>();
|
||||
|
||||
+15
-15
@@ -43,7 +43,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 获取角色信息列表
|
||||
*/
|
||||
@SaCheckPermission("system:role:list")
|
||||
//@SaCheckPermission("system:role:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
|
||||
return roleService.selectPageRoleList(role, pageQuery);
|
||||
@@ -53,7 +53,7 @@ public class SysRoleController extends BaseController {
|
||||
* 导出角色信息列表
|
||||
*/
|
||||
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("system:role:export")
|
||||
//@SaCheckPermission("system:role:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysRoleBo role, HttpServletResponse response) {
|
||||
List<SysRoleVo> list = roleService.selectRoleList(role);
|
||||
@@ -65,7 +65,7 @@ public class SysRoleController extends BaseController {
|
||||
*
|
||||
* @param roleId 角色ID
|
||||
*/
|
||||
@SaCheckPermission("system:role:query")
|
||||
//@SaCheckPermission("system:role:query")
|
||||
@GetMapping(value = "/{roleId}")
|
||||
public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
|
||||
roleService.checkRoleDataScope(roleId);
|
||||
@@ -75,7 +75,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 新增角色
|
||||
*/
|
||||
@SaCheckPermission("system:role:add")
|
||||
//@SaCheckPermission("system:role:add")
|
||||
@Log(title = "角色管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysRoleBo role) {
|
||||
@@ -92,7 +92,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 修改保存角色
|
||||
*/
|
||||
@SaCheckPermission("system:role:edit")
|
||||
//@SaCheckPermission("system:role:edit")
|
||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysRoleBo role) {
|
||||
@@ -114,7 +114,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 修改保存数据权限
|
||||
*/
|
||||
@SaCheckPermission("system:role:edit")
|
||||
//@SaCheckPermission("system:role:edit")
|
||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/dataScope")
|
||||
public R<Void> dataScope(@RequestBody SysRoleBo role) {
|
||||
@@ -126,7 +126,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 状态修改
|
||||
*/
|
||||
@SaCheckPermission("system:role:edit")
|
||||
//@SaCheckPermission("system:role:edit")
|
||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody SysRoleBo role) {
|
||||
@@ -140,7 +140,7 @@ public class SysRoleController extends BaseController {
|
||||
*
|
||||
* @param roleIds 角色ID串
|
||||
*/
|
||||
@SaCheckPermission("system:role:remove")
|
||||
//@SaCheckPermission("system:role:remove")
|
||||
@Log(title = "角色管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{roleIds}")
|
||||
public R<Void> remove(@PathVariable Long[] roleIds) {
|
||||
@@ -152,7 +152,7 @@ public class SysRoleController extends BaseController {
|
||||
*
|
||||
* @param roleIds 角色ID串
|
||||
*/
|
||||
@SaCheckPermission("system:role:query")
|
||||
//@SaCheckPermission("system:role:query")
|
||||
@GetMapping("/optionselect")
|
||||
public R<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
|
||||
return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds)));
|
||||
@@ -161,7 +161,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 查询已分配用户角色列表
|
||||
*/
|
||||
@SaCheckPermission("system:role:list")
|
||||
//@SaCheckPermission("system:role:list")
|
||||
@GetMapping("/authUser/allocatedList")
|
||||
public TableDataInfo<SysUserVo> allocatedList(SysUserBo user, PageQuery pageQuery) {
|
||||
return userService.selectAllocatedList(user, pageQuery);
|
||||
@@ -170,7 +170,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 查询未分配用户角色列表
|
||||
*/
|
||||
@SaCheckPermission("system:role:list")
|
||||
//@SaCheckPermission("system:role:list")
|
||||
@GetMapping("/authUser/unallocatedList")
|
||||
public TableDataInfo<SysUserVo> unallocatedList(SysUserBo user, PageQuery pageQuery) {
|
||||
return userService.selectUnallocatedList(user, pageQuery);
|
||||
@@ -179,7 +179,7 @@ public class SysRoleController extends BaseController {
|
||||
/**
|
||||
* 取消授权用户
|
||||
*/
|
||||
@SaCheckPermission("system:role:edit")
|
||||
//@SaCheckPermission("system:role:edit")
|
||||
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
||||
@PutMapping("/authUser/cancel")
|
||||
public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
|
||||
@@ -192,7 +192,7 @@ public class SysRoleController extends BaseController {
|
||||
* @param roleId 角色ID
|
||||
* @param userIds 用户ID串
|
||||
*/
|
||||
@SaCheckPermission("system:role:edit")
|
||||
//@SaCheckPermission("system:role:edit")
|
||||
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
||||
@PutMapping("/authUser/cancelAll")
|
||||
public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
|
||||
@@ -205,7 +205,7 @@ public class SysRoleController extends BaseController {
|
||||
* @param roleId 角色ID
|
||||
* @param userIds 用户ID串
|
||||
*/
|
||||
@SaCheckPermission("system:role:edit")
|
||||
//@SaCheckPermission("system:role:edit")
|
||||
@Log(title = "角色管理", businessType = BusinessType.GRANT)
|
||||
@PutMapping("/authUser/selectAll")
|
||||
public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
|
||||
@@ -218,7 +218,7 @@ public class SysRoleController extends BaseController {
|
||||
*
|
||||
* @param roleId 角色ID
|
||||
*/
|
||||
@SaCheckPermission("system:role:list")
|
||||
//@SaCheckPermission("system:role:list")
|
||||
@GetMapping(value = "/deptTree/{roleId}")
|
||||
public R<DeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
|
||||
DeptTreeSelectVo selectVo = new DeptTreeSelectVo(
|
||||
|
||||
+8
-8
@@ -48,7 +48,7 @@ public class SysTenantController extends BaseController {
|
||||
* 查询租户列表
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:list")
|
||||
//@SaCheckPermission("system:tenant:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
|
||||
return tenantService.queryPageList(bo, pageQuery);
|
||||
@@ -58,7 +58,7 @@ public class SysTenantController extends BaseController {
|
||||
* 导出租户列表
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:export")
|
||||
//@SaCheckPermission("system:tenant:export")
|
||||
@Log(title = "租户管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SysTenantBo bo, HttpServletResponse response) {
|
||||
@@ -72,7 +72,7 @@ public class SysTenantController extends BaseController {
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:query")
|
||||
//@SaCheckPermission("system:tenant:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -84,7 +84,7 @@ public class SysTenantController extends BaseController {
|
||||
*/
|
||||
@ApiEncrypt
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:add")
|
||||
//@SaCheckPermission("system:tenant:add")
|
||||
@Log(title = "租户管理", businessType = BusinessType.INSERT)
|
||||
@Lock4j
|
||||
@RepeatSubmit()
|
||||
@@ -100,7 +100,7 @@ public class SysTenantController extends BaseController {
|
||||
* 修改租户
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:edit")
|
||||
//@SaCheckPermission("system:tenant:edit")
|
||||
@Log(title = "租户管理", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -116,7 +116,7 @@ public class SysTenantController extends BaseController {
|
||||
* 状态修改
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:edit")
|
||||
//@SaCheckPermission("system:tenant:edit")
|
||||
@Log(title = "租户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
|
||||
@@ -130,7 +130,7 @@ public class SysTenantController extends BaseController {
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:remove")
|
||||
//@SaCheckPermission("system:tenant:remove")
|
||||
@Log(title = "租户管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@@ -168,7 +168,7 @@ public class SysTenantController extends BaseController {
|
||||
* @param packageId 套餐id
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenant:edit")
|
||||
//@SaCheckPermission("system:tenant:edit")
|
||||
@Log(title = "租户管理", businessType = BusinessType.UPDATE)
|
||||
@GetMapping("/syncTenantPackage")
|
||||
public R<Void> syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId,
|
||||
|
||||
+8
-8
@@ -44,7 +44,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* 查询租户套餐列表
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:list")
|
||||
//@SaCheckPermission("system:tenantPackage:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
|
||||
return tenantPackageService.queryPageList(bo, pageQuery);
|
||||
@@ -54,7 +54,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* 查询租户套餐下拉选列表
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:list")
|
||||
//@SaCheckPermission("system:tenantPackage:list")
|
||||
@GetMapping("/selectList")
|
||||
public R<List<SysTenantPackageVo>> selectList() {
|
||||
return R.ok(tenantPackageService.selectList());
|
||||
@@ -64,7 +64,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* 导出租户套餐列表
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:export")
|
||||
//@SaCheckPermission("system:tenantPackage:export")
|
||||
@Log(title = "租户套餐", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(SysTenantPackageBo bo, HttpServletResponse response) {
|
||||
@@ -78,7 +78,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* @param packageId 主键
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:query")
|
||||
//@SaCheckPermission("system:tenantPackage:query")
|
||||
@GetMapping("/{packageId}")
|
||||
public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long packageId) {
|
||||
@@ -89,7 +89,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* 新增租户套餐
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:add")
|
||||
//@SaCheckPermission("system:tenantPackage:add")
|
||||
@Log(title = "租户套餐", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -104,7 +104,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* 修改租户套餐
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:edit")
|
||||
//@SaCheckPermission("system:tenantPackage:edit")
|
||||
@Log(title = "租户套餐", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -119,7 +119,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* 状态修改
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:edit")
|
||||
//@SaCheckPermission("system:tenantPackage:edit")
|
||||
@Log(title = "租户套餐", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody SysTenantPackageBo bo) {
|
||||
@@ -132,7 +132,7 @@ public class SysTenantPackageController extends BaseController {
|
||||
* @param packageIds 主键串
|
||||
*/
|
||||
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
|
||||
@SaCheckPermission("system:tenantPackage:remove")
|
||||
//@SaCheckPermission("system:tenantPackage:remove")
|
||||
@Log(title = "租户套餐", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{packageIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+16
-16
@@ -59,7 +59,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 获取用户列表
|
||||
*/
|
||||
@SaCheckPermission("system:user:list")
|
||||
//@SaCheckPermission("system:user:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
|
||||
return userService.selectPageUserList(user, pageQuery);
|
||||
@@ -68,7 +68,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 获取用户列表 通过or条件查询
|
||||
*/
|
||||
@SaCheckPermission("system:user:list")
|
||||
//@SaCheckPermission("system:user:list")
|
||||
@GetMapping("/listByOr")
|
||||
public TableDataInfo<SysUserVo> listByOr(SysUserBo user, PageQuery pageQuery) {
|
||||
return userService.selectPageUserListByOr(user, pageQuery);
|
||||
@@ -78,7 +78,7 @@ public class SysUserController extends BaseController {
|
||||
* 导出用户列表
|
||||
*/
|
||||
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
||||
@SaCheckPermission("system:user:export")
|
||||
//@SaCheckPermission("system:user:export")
|
||||
@PostMapping("/export")
|
||||
public void export(SysUserBo user, HttpServletResponse response) {
|
||||
List<SysUserExportVo> list = userService.selectUserExportList(user);
|
||||
@@ -92,7 +92,7 @@ public class SysUserController extends BaseController {
|
||||
* @param updateSupport 是否更新已存在数据
|
||||
*/
|
||||
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
||||
@SaCheckPermission("system:user:import")
|
||||
//@SaCheckPermission("system:user:import")
|
||||
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
|
||||
ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class,
|
||||
@@ -136,7 +136,7 @@ public class SysUserController extends BaseController {
|
||||
*
|
||||
* @param userId 用户ID
|
||||
*/
|
||||
@SaCheckPermission("system:user:query")
|
||||
//@SaCheckPermission("system:user:query")
|
||||
@GetMapping(value = { "/", "/{userId}" })
|
||||
public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
||||
SysUserInfoVo userInfoVo = new SysUserInfoVo();
|
||||
@@ -164,7 +164,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 新增用户
|
||||
*/
|
||||
@SaCheckPermission("system:user:add")
|
||||
//@SaCheckPermission("system:user:add")
|
||||
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public R<Void> add(@Validated @RequestBody SysUserBo user) {
|
||||
@@ -188,7 +188,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 修改用户
|
||||
*/
|
||||
@SaCheckPermission("system:user:edit")
|
||||
//@SaCheckPermission("system:user:edit")
|
||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public R<Void> edit(@Validated @RequestBody SysUserBo user) {
|
||||
@@ -210,7 +210,7 @@ public class SysUserController extends BaseController {
|
||||
*
|
||||
* @param userIds 角色ID串
|
||||
*/
|
||||
@SaCheckPermission("system:user:remove")
|
||||
//@SaCheckPermission("system:user:remove")
|
||||
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{userIds}")
|
||||
public R<Void> remove(@PathVariable Long[] userIds) {
|
||||
@@ -226,7 +226,7 @@ public class SysUserController extends BaseController {
|
||||
* @param userIds 用户ID串
|
||||
* @param deptId 部门ID
|
||||
*/
|
||||
@SaCheckPermission("system:user:query")
|
||||
//@SaCheckPermission("system:user:query")
|
||||
@GetMapping("/optionselect")
|
||||
public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
|
||||
@RequestParam(required = false) Long deptId) {
|
||||
@@ -237,7 +237,7 @@ public class SysUserController extends BaseController {
|
||||
* 重置密码
|
||||
*/
|
||||
@ApiEncrypt
|
||||
@SaCheckPermission("system:user:resetPwd")
|
||||
//@SaCheckPermission("system:user:resetPwd")
|
||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/resetPwd")
|
||||
public R<Void> resetPwd(@RequestBody SysUserBo user) {
|
||||
@@ -250,7 +250,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 状态修改
|
||||
*/
|
||||
@SaCheckPermission("system:user:edit")
|
||||
//@SaCheckPermission("system:user:edit")
|
||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public R<Void> changeStatus(@RequestBody SysUserBo user) {
|
||||
@@ -264,7 +264,7 @@ public class SysUserController extends BaseController {
|
||||
*
|
||||
* @param userId 用户ID
|
||||
*/
|
||||
@SaCheckPermission("system:user:query")
|
||||
//@SaCheckPermission("system:user:query")
|
||||
@GetMapping("/authRole/{userId}")
|
||||
public R<SysUserInfoVo> authRole(@PathVariable Long userId) {
|
||||
userService.checkUserDataScope(userId);
|
||||
@@ -283,7 +283,7 @@ public class SysUserController extends BaseController {
|
||||
* @param userId 用户Id
|
||||
* @param roleIds 角色ID串
|
||||
*/
|
||||
@SaCheckPermission("system:user:edit")
|
||||
//@SaCheckPermission("system:user:edit")
|
||||
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
||||
@PutMapping("/authRole")
|
||||
public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
|
||||
@@ -295,7 +295,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 获取部门树列表
|
||||
*/
|
||||
@SaCheckPermission("system:user:list")
|
||||
//@SaCheckPermission("system:user:list")
|
||||
@GetMapping("/deptTree")
|
||||
public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
|
||||
return R.ok(deptService.selectDeptTreeList(dept));
|
||||
@@ -304,7 +304,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 获取部门下的所有用户信息
|
||||
*/
|
||||
@SaCheckPermission("system:user:list")
|
||||
//@SaCheckPermission("system:user:list")
|
||||
@GetMapping("/list/dept/{deptId}")
|
||||
public R<List<SysUserVo>> listByDept(@PathVariable @NotNull Long deptId) {
|
||||
return R.ok(userService.selectUserListByDept(deptId));
|
||||
@@ -313,7 +313,7 @@ public class SysUserController extends BaseController {
|
||||
/**
|
||||
* 根据权限标识获取用户列表
|
||||
*/
|
||||
@SaCheckPermission("system:user:list")
|
||||
//@SaCheckPermission("system:user:list")
|
||||
@GetMapping("/list-by-permission")
|
||||
public R<List<SysUser>> listUsersByPermission(
|
||||
@RequestParam("permission") String permission,
|
||||
|
||||
+7
-7
@@ -35,7 +35,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param bo 配置请求参数
|
||||
* @return 微信JS-SDK配置信息
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:config")
|
||||
//@SaCheckPermission("system:wechat:config")
|
||||
@Log(title = "微信JS-SDK配置", businessType = BusinessType.OTHER)
|
||||
@PostMapping("/config")
|
||||
public R<SysWeChatConfigVo> getWeChatConfig(@Validated @RequestBody SysWeChatConfigBo bo) {
|
||||
@@ -56,7 +56,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param bo 上传请求参数
|
||||
* @return 上传结果
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:upload")
|
||||
//@SaCheckPermission("system:wechat:upload")
|
||||
@Log(title = "微信媒体文件上传", businessType = BusinessType.OTHER)
|
||||
@PostMapping("/upload")
|
||||
public R<Object> uploadWeChatMedia(@Validated @RequestBody SysWeChatConfigBo bo) {
|
||||
@@ -77,7 +77,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param mediaId 媒体文件ID
|
||||
* @return 文件下载
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:download")
|
||||
//@SaCheckPermission("system:wechat:download")
|
||||
@Log(title = "微信媒体文件下载", businessType = BusinessType.OTHER)
|
||||
@GetMapping("/download")
|
||||
public R<Object> downloadWeChatMedia(@RequestParam String mediaId) {
|
||||
@@ -98,7 +98,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param code 微信授权码
|
||||
* @return 用户信息
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:userinfo")
|
||||
//@SaCheckPermission("system:wechat:userinfo")
|
||||
@Log(title = "获取微信用户信息", businessType = BusinessType.OTHER)
|
||||
@GetMapping("/userinfo")
|
||||
public R<Object> getWeChatUserInfo(@RequestParam String code) {
|
||||
@@ -119,7 +119,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param bo 支付请求参数
|
||||
* @return 支付配置
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:pay")
|
||||
//@SaCheckPermission("system:wechat:pay")
|
||||
@Log(title = "创建微信支付订单", businessType = BusinessType.OTHER)
|
||||
@PostMapping("/pay/create")
|
||||
public R<Object> createWeChatPay(@Validated @RequestBody SysWeChatConfigBo bo) {
|
||||
@@ -140,7 +140,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param orderId 订单ID
|
||||
* @return 支付状态
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:pay")
|
||||
//@SaCheckPermission("system:wechat:pay")
|
||||
@Log(title = "查询微信支付状态", businessType = BusinessType.OTHER)
|
||||
@GetMapping("/pay/query")
|
||||
public R<Object> queryWeChatPayStatus(@RequestParam String orderId) {
|
||||
@@ -161,7 +161,7 @@ public class SysWeChatController extends BaseController {
|
||||
* @param mediaId 微信媒体文件ID
|
||||
* @return OSS存储结果
|
||||
*/
|
||||
@SaCheckPermission("system:wechat:downloadToOss")
|
||||
//@SaCheckPermission("system:wechat:downloadToOss")
|
||||
@Log(title = "下载微信媒体文件到OSS", businessType = BusinessType.OTHER)
|
||||
@GetMapping("/downloadToOss")
|
||||
public R<SysOssVo> downloadWeChatMediaToOss(@RequestParam String mediaId) {
|
||||
|
||||
+9
-9
@@ -42,7 +42,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 查询班级信息-新版列表
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:list")
|
||||
// @SaCheckPermission("classMsg:classMsg:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgClassMsgVo> list(XgClassMsgBo bo, PageQuery pageQuery) {
|
||||
// Disable the framework default ordering (create_time desc) so the service's
|
||||
@@ -57,7 +57,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 导出班级信息-新版列表
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:export")
|
||||
// @SaCheckPermission("classMsg:classMsg:export")
|
||||
@Log(title = "班级信息-新版", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgClassMsgBo bo, HttpServletResponse response) {
|
||||
@@ -70,7 +70,7 @@ public class XgClassMsgController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:query")
|
||||
// @SaCheckPermission("classMsg:classMsg:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgClassMsgVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgClassMsgService.queryById(id));
|
||||
@@ -79,7 +79,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 新增班级信息-新版
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:add")
|
||||
// @SaCheckPermission("classMsg:classMsg:add")
|
||||
@Log(title = "班级信息-新版", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -90,7 +90,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 修改班级信息-新版
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:edit")
|
||||
// @SaCheckPermission("classMsg:classMsg:edit")
|
||||
@Log(title = "班级信息-新版", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -101,7 +101,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 更新班级状态(仅更新 classStatus)
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:edit")
|
||||
// @SaCheckPermission("classMsg:classMsg:edit")
|
||||
@Log(title = "班级信息-新版", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/status")
|
||||
@@ -112,7 +112,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 批量更新班级状态(仅更新 classStatus)
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:edit")
|
||||
// @SaCheckPermission("classMsg:classMsg:edit")
|
||||
@Log(title = "班级信息-新版", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/status/batch")
|
||||
@@ -125,7 +125,7 @@ public class XgClassMsgController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:remove")
|
||||
// @SaCheckPermission("classMsg:classMsg:remove")
|
||||
@Log(title = "班级信息-新版", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -135,7 +135,7 @@ public class XgClassMsgController extends BaseController {
|
||||
/**
|
||||
* 获取当前登录人作为班主任所管理的班级列表
|
||||
*/
|
||||
@SaCheckPermission("classMsg:classMsg:list")
|
||||
// @SaCheckPermission("classMsg:classMsg:list")
|
||||
@GetMapping("/myClassListAsTeacher")
|
||||
public R<List<XgClassMsgVo>> myClassListAsTeacher() {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
|
||||
+7
-7
@@ -39,7 +39,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
/**
|
||||
* 查询班级干部职务配置列表
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:list")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgClassPosDictVo> list(XgClassPosDictBo bo, PageQuery pageQuery) {
|
||||
return xgClassPosDictService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
/**
|
||||
* 导出班级干部职务配置列表
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:export")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:export")
|
||||
@Log(title = "班级干部职务配置", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgClassPosDictBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:query")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgClassPosDictVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgClassPosDictService.queryById(id));
|
||||
@@ -70,7 +70,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
/**
|
||||
* 新增班级干部职务配置
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:add")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:add")
|
||||
@Log(title = "班级干部职务配置", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -81,7 +81,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
/**
|
||||
* 修改班级干部职务配置
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:edit")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:edit")
|
||||
@Log(title = "班级干部职务配置", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -94,7 +94,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:remove")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:remove")
|
||||
@Log(title = "班级干部职务配置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -107,7 +107,7 @@ public class XgClassPosDictController extends BaseController {
|
||||
* @param positionName 职务名称(非必填,支持模糊查询)
|
||||
* @return 有效的职务信息列表
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosDict:xgClassPosDict:list")
|
||||
// @SaCheckPermission("xgClassPosDict:xgClassPosDict:list")
|
||||
@GetMapping("/validPositions")
|
||||
public R<List<XgClassPosDictVo>> getValidPositions(@RequestParam(required = false) String positionName) {
|
||||
XgClassPosDictBo bo = new XgClassPosDictBo();
|
||||
|
||||
+7
-7
@@ -42,7 +42,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
* 查询班级干部信息列表
|
||||
* 增加一个参数 deptId
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:list")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgClassPosMsgVo> list(XgClassPosMsgBo bo, PageQuery pageQuery,
|
||||
@RequestParam(required = false) Long deptId) {
|
||||
@@ -52,7 +52,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
/**
|
||||
* 导出班级干部信息列表
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:export")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:export")
|
||||
@Log(title = "班级干部信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgClassPosMsgBo bo, HttpServletResponse response) {
|
||||
@@ -65,7 +65,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:query")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgClassPosMsgVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgClassPosMsgService.queryById(id));
|
||||
@@ -74,7 +74,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
/**
|
||||
* 新增班级干部信息
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:add")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:add")
|
||||
@Log(title = "班级干部信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -85,7 +85,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
/**
|
||||
* 修改班级干部信息
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit")
|
||||
@Log(title = "班级干部信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -98,7 +98,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:remove")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:remove")
|
||||
@Log(title = "班级干部信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -114,7 +114,7 @@ public class XgClassPosMsgController extends BaseController {
|
||||
* @param dismissalReason 离任原因
|
||||
* @return 操作结果
|
||||
*/
|
||||
@SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit")
|
||||
// @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:edit")
|
||||
@Log(title = "学生干部离任", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/dismiss/{id}")
|
||||
public R<Void> dismissCadre(
|
||||
|
||||
+6
-6
@@ -39,7 +39,7 @@ public class XgClassTeacherCounselorRelController extends BaseController {
|
||||
/**
|
||||
* 查询班级班主任辅导员关联列表
|
||||
*/
|
||||
@SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:list")
|
||||
// @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgClassTeacherCounselorRelVo> list(XgClassTeacherCounselorRelBo bo, PageQuery pageQuery) {
|
||||
return xgClassTeacherCounselorRelService.queryPageList(bo, pageQuery);
|
||||
@@ -48,7 +48,7 @@ public class XgClassTeacherCounselorRelController extends BaseController {
|
||||
/**
|
||||
* 导出班级班主任辅导员关联列表
|
||||
*/
|
||||
@SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:export")
|
||||
// @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:export")
|
||||
@Log(title = "班级班主任辅导员关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgClassTeacherCounselorRelBo bo, HttpServletResponse response) {
|
||||
@@ -61,7 +61,7 @@ public class XgClassTeacherCounselorRelController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:query")
|
||||
// @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgClassTeacherCounselorRelVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
@@ -71,7 +71,7 @@ public class XgClassTeacherCounselorRelController extends BaseController {
|
||||
/**
|
||||
* 新增班级班主任辅导员关联
|
||||
*/
|
||||
@SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:add")
|
||||
// @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:add")
|
||||
@Log(title = "班级班主任辅导员关联", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class XgClassTeacherCounselorRelController extends BaseController {
|
||||
/**
|
||||
* 修改班级班主任辅导员关联
|
||||
*/
|
||||
@SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:edit")
|
||||
// @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:edit")
|
||||
@Log(title = "班级班主任辅导员关联", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class XgClassTeacherCounselorRelController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:remove")
|
||||
// @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:remove")
|
||||
@Log(title = "班级班主任辅导员关联", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
+7
-7
@@ -43,7 +43,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* 查询二级学院分管领导配置列表
|
||||
*/
|
||||
@Operation(summary = "查询二级学院分管领导配置列表")
|
||||
@SaCheckPermission("xg:ejxyfgld:list")
|
||||
// @SaCheckPermission("xg:ejxyfgld:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgCollegeLeaderVo> list(XgCollegeLeaderBo bo, PageQuery pageQuery) {
|
||||
return xgCollegeLeaderService.queryPageList(bo, pageQuery);
|
||||
@@ -53,7 +53,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* 根据学院ID查询分管领导列表
|
||||
*/
|
||||
@Operation(summary = "根据学院ID查询分管领导列表")
|
||||
@SaCheckPermission("xg:ejxyfgld:list")
|
||||
// @SaCheckPermission("xg:ejxyfgld:list")
|
||||
@GetMapping("/listByCollege/{collegeId}")
|
||||
public R<List<XgCollegeLeaderVo>> listByCollege(@PathVariable Long collegeId) {
|
||||
List<XgCollegeLeaderVo> list = xgCollegeLeaderService.queryByCollegeId(collegeId);
|
||||
@@ -64,7 +64,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* 导出二级学院分管领导配置列表
|
||||
*/
|
||||
@Operation(summary = "导出二级学院分管领导配置列表")
|
||||
@SaCheckPermission("xg:ejxyfgld:export")
|
||||
// @SaCheckPermission("xg:ejxyfgld:export")
|
||||
@Log(title = "二级学院分管领导配置", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgCollegeLeaderBo bo, HttpServletResponse response) {
|
||||
@@ -78,7 +78,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* @param id 主键
|
||||
*/
|
||||
@Operation(summary = "获取二级学院分管领导配置详细信息")
|
||||
@SaCheckPermission("xg:ejxyfgld:query")
|
||||
// @SaCheckPermission("xg:ejxyfgld:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgCollegeLeaderVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgCollegeLeaderService.queryById(id));
|
||||
@@ -88,7 +88,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* 新增二级学院分管领导配置
|
||||
*/
|
||||
@Operation(summary = "新增二级学院分管领导配置")
|
||||
@SaCheckPermission("xg:ejxyfgld:add")
|
||||
// @SaCheckPermission("xg:ejxyfgld:add")
|
||||
@Log(title = "二级学院分管领导配置", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -100,7 +100,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* 修改二级学院分管领导配置
|
||||
*/
|
||||
@Operation(summary = "修改二级学院分管领导配置")
|
||||
@SaCheckPermission("xg:ejxyfgld:edit")
|
||||
// @SaCheckPermission("xg:ejxyfgld:edit")
|
||||
@Log(title = "二级学院分管领导配置", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -114,7 +114,7 @@ public class XgCollegeLeaderController extends BaseController {
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@Operation(summary = "删除二级学院分管领导配置")
|
||||
@SaCheckPermission("xg:ejxyfgld:remove")
|
||||
// @SaCheckPermission("xg:ejxyfgld:remove")
|
||||
@Log(title = "二级学院分管领导配置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
|
||||
+9
-9
@@ -43,7 +43,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
/**
|
||||
* 查询学生宿舍申请单表(调宿+退宿)列表
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:list")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgDormApplicationVo> list(XgDormApplicationBo bo, PageQuery pageQuery) {
|
||||
return xgDormApplicationService.queryPageList(bo, pageQuery);
|
||||
@@ -52,7 +52,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取学生选择器选项列表(支持按学号、姓名检索)
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:list")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:list")
|
||||
@GetMapping("/studentOptions")
|
||||
public TableDataInfo<StudentOptionVo> getStudentOptions(StudentOptionBo bo, PageQuery pageQuery) {
|
||||
return xgDormApplicationService.getStudentOptions(bo, pageQuery);
|
||||
@@ -61,7 +61,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
/**
|
||||
* 导出学生宿舍申请单表(调宿+退宿)列表
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:export")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:export")
|
||||
@Log(title = "学生宿舍申请单表(调宿+退宿)", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgDormApplicationBo bo, HttpServletResponse response) {
|
||||
@@ -74,7 +74,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:query")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgDormApplicationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgDormApplicationService.queryById(id));
|
||||
@@ -83,7 +83,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
/**
|
||||
* 新增学生宿舍申请单表(调宿+退宿)
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:add")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:add")
|
||||
@Log(title = "学生宿舍申请单表(调宿+退宿)", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -95,7 +95,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
/**
|
||||
* 修改学生宿舍申请单表(调宿+退宿)
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:edit")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:edit")
|
||||
@Log(title = "学生宿舍申请单表(调宿+退宿)", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -108,7 +108,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:remove")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:remove")
|
||||
@Log(title = "学生宿舍申请单表(调宿+退宿)", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -120,7 +120,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
*
|
||||
* @param collegeId 学院ID
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:list")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:list")
|
||||
@GetMapping("/getCollegeApprovers")
|
||||
public R<List<Map<String, Object>>> getCollegeApprovers(@RequestParam Long collegeId) {
|
||||
List<Map<String, Object>> approvers = xgDormApplicationService.getCollegeApprovers(collegeId);
|
||||
@@ -130,7 +130,7 @@ public class XgDormApplicationController extends BaseController {
|
||||
/**
|
||||
* 获取学工处审批人列表
|
||||
*/
|
||||
@SaCheckPermission("dormApplication:dormApplication:list")
|
||||
// @SaCheckPermission("dormApplication:dormApplication:list")
|
||||
@GetMapping("/getStudentAffairsApprovers")
|
||||
public R<List<Map<String, Object>>> getStudentAffairsApprovers() {
|
||||
List<Map<String, Object>> approvers = xgDormApplicationService.getStudentAffairsApprovers();
|
||||
|
||||
+7
-7
@@ -40,7 +40,7 @@ public class XgDormAreaController extends BaseController {
|
||||
/**
|
||||
* 查询宿舍区信息列表
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:list")
|
||||
// @SaCheckPermission("ssqxx:dormArea:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgDormAreaVo> list(XgDormAreaBo bo, PageQuery pageQuery) {
|
||||
return xgDormAreaService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +49,7 @@ public class XgDormAreaController extends BaseController {
|
||||
/**
|
||||
* 导出宿舍区信息列表
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:export")
|
||||
// @SaCheckPermission("ssqxx:dormArea:export")
|
||||
@Log(title = "宿舍区信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgDormAreaBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +62,7 @@ public class XgDormAreaController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:query")
|
||||
// @SaCheckPermission("ssqxx:dormArea:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgDormAreaVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgDormAreaService.queryById(id));
|
||||
@@ -71,7 +71,7 @@ public class XgDormAreaController extends BaseController {
|
||||
/**
|
||||
* 新增宿舍区信息
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:add")
|
||||
// @SaCheckPermission("ssqxx:dormArea:add")
|
||||
@Log(title = "宿舍区信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class XgDormAreaController extends BaseController {
|
||||
/**
|
||||
* 修改宿舍区信息
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:edit")
|
||||
// @SaCheckPermission("ssqxx:dormArea:edit")
|
||||
@Log(title = "宿舍区信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class XgDormAreaController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:remove")
|
||||
// @SaCheckPermission("ssqxx:dormArea:remove")
|
||||
@Log(title = "宿舍区信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -106,7 +106,7 @@ public class XgDormAreaController extends BaseController {
|
||||
* 获取宿舍区树形结构数据
|
||||
* 以校区为根节点,宿舍区为子节点
|
||||
*/
|
||||
@SaCheckPermission("ssqxx:dormArea:query")
|
||||
// @SaCheckPermission("ssqxx:dormArea:query")
|
||||
@GetMapping("/tree")
|
||||
public R<List<TreeSelectVo>> getAreaTree() {
|
||||
return R.ok(xgDormAreaService.getAreaTree());
|
||||
|
||||
+10
-10
@@ -40,7 +40,7 @@ public class XgDormBedController extends BaseController {
|
||||
/**
|
||||
* 查询宿舍床位信息列表
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:list")
|
||||
// @SaCheckPermission("dormbed:dormBed:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgDormBedVo> list(XgDormBedBo bo, PageQuery pageQuery) {
|
||||
return xgDormBedService.queryPageList(bo, pageQuery);
|
||||
@@ -49,7 +49,7 @@ public class XgDormBedController extends BaseController {
|
||||
/**
|
||||
* 导出宿舍床位信息列表
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:export")
|
||||
// @SaCheckPermission("dormbed:dormBed:export")
|
||||
@Log(title = "宿舍床位信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgDormBedBo bo, HttpServletResponse response) {
|
||||
@@ -62,7 +62,7 @@ public class XgDormBedController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:query")
|
||||
// @SaCheckPermission("dormbed:dormBed:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgDormBedVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgDormBedService.queryById(id));
|
||||
@@ -71,7 +71,7 @@ public class XgDormBedController extends BaseController {
|
||||
/**
|
||||
* 新增宿舍床位信息
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:add")
|
||||
// @SaCheckPermission("dormbed:dormBed:add")
|
||||
@Log(title = "宿舍床位信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -82,7 +82,7 @@ public class XgDormBedController extends BaseController {
|
||||
/**
|
||||
* 修改宿舍床位信息
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:edit")
|
||||
// @SaCheckPermission("dormbed:dormBed:edit")
|
||||
@Log(title = "宿舍床位信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -95,7 +95,7 @@ public class XgDormBedController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:remove")
|
||||
// @SaCheckPermission("dormbed:dormBed:remove")
|
||||
@Log(title = "宿舍床位信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -107,7 +107,7 @@ public class XgDormBedController extends BaseController {
|
||||
*
|
||||
* @param roomId 房间ID
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:query")
|
||||
// @SaCheckPermission("dormbed:dormBed:query")
|
||||
@GetMapping("/details/room/{roomId}")
|
||||
public R<List<XgDormBedDetailVo>> getBedDetailsByRoomId(@NotNull(message = "房间ID不能为空") @PathVariable Long roomId) {
|
||||
List<XgDormBedDetailVo> list = xgDormBedService.queryBedDetailsByRoomId(roomId);
|
||||
@@ -119,7 +119,7 @@ public class XgDormBedController extends BaseController {
|
||||
*
|
||||
* @param roomId 房间ID
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:query")
|
||||
// @SaCheckPermission("dormbed:dormBed:query")
|
||||
@GetMapping("/details/college/room/{roomId}")
|
||||
public R<List<XgDormBedDetailVo>> getBedDetailsByRoomIdForCurrentUserCollege(
|
||||
@NotNull(message = "房间ID不能为空") @PathVariable Long roomId) {
|
||||
@@ -132,7 +132,7 @@ public class XgDormBedController extends BaseController {
|
||||
*
|
||||
* @param buildingId 宿舍楼ID
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:query")
|
||||
// @SaCheckPermission("dormbed:dormBed:query")
|
||||
@GetMapping("/details/building/{buildingId}")
|
||||
public R<List<XgDormBedDetailVo>> getBedDetailsByBuildingId(
|
||||
@NotNull(message = "宿舍楼ID不能为空") @PathVariable Long buildingId) {
|
||||
@@ -146,7 +146,7 @@ public class XgDormBedController extends BaseController {
|
||||
* @param roomId 房间ID
|
||||
* @param classId 班级ID
|
||||
*/
|
||||
@SaCheckPermission("dormbed:dormBed:query")
|
||||
// @SaCheckPermission("dormbed:dormBed:query")
|
||||
@GetMapping("/details/room/{roomId}/class/{classId}")
|
||||
public R<List<XgDormBedDetailVo>> getBedDetailsByRoomIdAndClassId(
|
||||
@NotNull(message = "房间ID不能为空") @PathVariable Long roomId,
|
||||
|
||||
+27
-27
@@ -44,7 +44,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 查询床位学生分配关系列表
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<XgDormBedStudentVo> list(XgDormBedStudentBo bo, PageQuery pageQuery) {
|
||||
return xgDormBedStudentService.queryPageList(bo, pageQuery);
|
||||
@@ -53,7 +53,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 导出床位学生分配关系列表
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:export")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:export")
|
||||
@Log(title = "床位学生分配关系", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(XgDormBedStudentBo bo, HttpServletResponse response) {
|
||||
@@ -66,7 +66,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:query")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<XgDormBedStudentVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
|
||||
return R.ok(xgDormBedStudentService.queryById(id));
|
||||
@@ -75,7 +75,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 新增床位学生分配关系
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
@Log(title = "床位学生分配关系", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@@ -86,7 +86,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 修改床位学生分配关系
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "床位学生分配关系", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@@ -99,7 +99,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:remove")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:remove")
|
||||
@Log(title = "床位学生分配关系", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
|
||||
@@ -111,7 +111,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
*
|
||||
* @param bo 批量分配参数
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
@Log(title = "批量分配床位给二级学院", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchAllocate")
|
||||
@@ -124,7 +124,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
*
|
||||
* @param bo 批量分配给班级参数
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
@Log(title = "批量分配床位给班级", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchAllocateToClass")
|
||||
@@ -136,7 +136,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 批量收回宿舍床位
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "批量收回宿舍床位", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchRecall")
|
||||
@@ -147,7 +147,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 批量回收班级分配床位(保留学院分配)
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "批量回收班级分配床位", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/batchRecallClassAllocation")
|
||||
@@ -159,7 +159,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 获取当前用户二级学院的宿舍楼树形结构
|
||||
* 校区-宿舍楼二级结构,校区不可选,只有宿舍楼可以选择
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/currentUserCollegeDormTree")
|
||||
public R<List<DormBuildingTreeVo>> getCurrentUserCollegeDormBuildingTree() {
|
||||
List<DormBuildingTreeVo> treeData = xgDormBedStudentService.getCurrentUserCollegeDormBuildingTree();
|
||||
@@ -170,7 +170,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 获取班主任管理的班级宿舍楼树形结构
|
||||
* 校区-宿舍楼二级结构,只显示班主任管理班级分配到的宿舍楼
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/getClassTeacherDormTree")
|
||||
public R<List<DormBuildingTreeVo>> getClassTeacherDormTree(@RequestParam(required = false) Long classId) {
|
||||
List<DormBuildingTreeVo> treeData = xgDormBedStudentService.getClassTeacherDormTree(classId);
|
||||
@@ -180,7 +180,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 获取班主任管理班级的房间床位详情(带学生信息)
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/getClassTeacherBedDetails")
|
||||
public R<List<Object>> getClassTeacherBedDetails(@RequestParam(required = false) Long buildingId,
|
||||
@RequestParam(required = false) Long classId) {
|
||||
@@ -191,7 +191,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 获取班主任管理的未分配床位学生列表
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/getClassTeacherUnallocatedStudents")
|
||||
public R<List<Object>> getClassTeacherUnallocatedStudents(@RequestParam(required = false) Long classId) {
|
||||
List<Object> students = xgDormBedStudentService.getClassTeacherUnallocatedStudents(classId);
|
||||
@@ -201,7 +201,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 班主任一键随机分配床位
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
@Log(title = "班主任随机分配床位", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherRandomAllocation")
|
||||
@@ -213,7 +213,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 班主任一键按学号分配床位
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
@Log(title = "班主任按学号分配床位", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherStudentNoAllocation")
|
||||
@@ -225,7 +225,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 班主任选择性分配床位(弹窗模式)
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:add")
|
||||
@Log(title = "班主任选择性分配床位", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherSelectiveAllocation")
|
||||
@@ -237,7 +237,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 班主任一键收回床位
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "班主任收回床位", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherRecallBeds")
|
||||
@@ -249,7 +249,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 班主任收回选中床位
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "班主任收回选中床位", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherRecallSelectedBeds")
|
||||
@@ -261,7 +261,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
/**
|
||||
* 班主任批量退宿
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "班主任批量退宿", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherStayawaySelectedBeds")
|
||||
@@ -274,7 +274,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 班主任床位互换
|
||||
* 将两个学生的床位进行互换
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "班主任床位互换", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherExchangeBeds")
|
||||
@@ -288,7 +288,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 班主任床位移动
|
||||
* 将学生从当前床位移动到指定的空闲床位
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
|
||||
@Log(title = "班主任床位移动", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/classTeacherMoveBed")
|
||||
@@ -303,7 +303,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 包含床位信息(校区名称、宿舍区名称、楼栋名称、房间名称、床位名称)
|
||||
* 和学生信息(学生姓名、学号、性别)
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/getClassOccupiedBedDetails")
|
||||
public R<List<Object>> getClassOccupiedBedDetails(@RequestParam(required = false) Long classId) {
|
||||
List<Object> occupiedBedDetails = xgDormBedStudentService.getClassOccupiedBedDetails(classId);
|
||||
@@ -314,7 +314,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 获取班级所有未安排学生的床位信息
|
||||
* 包含床位信息(校区名称、宿舍区名称、楼栋名称、房间名称、床位名称)
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/getClassUnoccupiedBedDetails")
|
||||
public R<List<Object>> getClassUnoccupiedBedDetails(@RequestParam(required = false) Long classId) {
|
||||
List<Object> unoccupiedBedDetails = xgDormBedStudentService.getClassUnoccupiedBedDetails(classId);
|
||||
@@ -325,7 +325,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 根据房间ID获取住在当前房间的所有学生信息
|
||||
* 包含学生姓名、学号、性别、学院名称、专业名称、班级名称、床位编码、床位ID
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/getRoomStudents")
|
||||
public R<List<Object>> getRoomStudents(@RequestParam Long roomId) {
|
||||
List<Object> roomStudents = xgDormBedStudentService.getRoomStudents(roomId);
|
||||
@@ -336,7 +336,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 根据学生ID获取当前宿舍信息
|
||||
* 包含校区、宿舍楼、房间号、床位号等信息
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/currentDormInfo/{studentId}")
|
||||
public R<Object> getCurrentDormInfo(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
|
||||
Object currentDormInfo = xgDormBedStudentService.getCurrentDormInfo(studentId);
|
||||
@@ -347,7 +347,7 @@ public class XgDormBedStudentController extends BaseController {
|
||||
* 根据床位ID获取该床位的学生信息
|
||||
* 包含学生基本信息、学院、专业、班级等信息
|
||||
*/
|
||||
@SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
// @SaCheckPermission("dormBedStudent:dormBedStudent:list")
|
||||
@GetMapping("/bedStudentInfo/{bedId}")
|
||||
public R<Object> getBedStudentInfo(@NotNull(message = "床位ID不能为空") @PathVariable Long bedId) {
|
||||
Object bedStudentInfo = xgDormBedStudentService.getBedStudentInfo(bedId);
|
||||
|
||||
Loaded 100 of 156 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user