From 2a2885f45160b4048a27e75d5be03ba9232c7363 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 10 九月 2024 17:34:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java index 0c01b88..751ab03 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java @@ -1,5 +1,6 @@ package com.ycl.platform.controller; +import com.ycl.platform.domain.query.DistributeWorkOrderQuery; import com.ycl.platform.domain.query.ReportQuery; import com.ycl.platform.domain.vo.ReportVO; import com.ycl.platform.domain.vo.YwUnitVO; @@ -40,18 +41,21 @@ @PostMapping @ApiOperation(value = "娣诲姞", notes = "娣诲姞") + @PreAuthorize("@ss.hasPermi('unit:add')") public Result add(@RequestBody @Validated(Add.class) YwUnitForm form) { return ywUnitService.add(form); } @PutMapping @ApiOperation(value = "淇敼", notes = "淇敼") + @PreAuthorize("@ss.hasPermi('unit:edit')") public Result update(@RequestBody @Validated(Update.class) YwUnitForm form) { return ywUnitService.update(form); } @DeleteMapping("/{ids}") @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") + @PreAuthorize("@ss.hasPermi('unit:remove')") public Result remove(@PathVariable String ids) { return ywUnitService.remove(Arrays.asList(ids.split(","))); } @@ -59,23 +63,34 @@ // @PreAuthorize("@ss.hasPermi('unit:list')") @PostMapping("/page") @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") + @PreAuthorize("@ss.hasPermi('unit:page')") public Result page(@RequestBody YwUnitQuery query) { return ywUnitService.page(query); } @GetMapping("/{id}") @ApiOperation(value = "璇︽儏", notes = "璇︽儏") + @PreAuthorize("@ss.hasPermi('unit:query')") public Result detail(@PathVariable("id") String id) { return ywUnitService.detail(id); } @GetMapping("/list") @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") +// @PreAuthorize("@ss.hasPermi('unit:list')") public Result list() { return ywUnitService.all(); } + @GetMapping("/work/list") + @ApiOperation(value = "缁熻杩愮淮鍗曚綅宸ュ崟鏁伴噺", notes = "缁熻杩愮淮鍗曚綅宸ュ崟鏁伴噺") + public Result workList(DistributeWorkOrderQuery query) { + return ywUnitService.workList(query); + } + @PostMapping("/export") + @ApiOperation(value = "瀵煎嚭", notes = "瀵煎嚭") + @PreAuthorize("@ss.hasPermi('unit:export')") public void export(HttpServletResponse response, YwUnitQuery query) { List<YwUnitVO> list = ywUnitService.export(query); -- Gitblit v1.8.0