朱园亮 / xingyun-erp · Commits

Commit 47b880bf76c22ab973a23e8cef8e811a6fa32273

Authored by 房远帅
1 parent 1e7e6eae

采购:供应商报价项目-权限

Inline Side-by-side
Showing 2 changed files with 6 additions and 7 deletions
... ... @@ -36,7 +36,7 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
36 36 private SupplierQuotationProjectService supplierQuotationProjectService;
37 37
38 38 @ApiOperation("新增")
39   - @HasPermission({"procure-manage:supplier-quote-project:add"})
  39 + @HasPermission({"procure-manage:supplier-price:add"})
40 40 @PostMapping
41 41 public InvokeResult<Void> create(@Valid @RequestBody CreateSupplierQuotationProjectVo vo) {
42 42 supplierQuotationProjectService.create(vo);
... ... @@ -44,7 +44,7 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
44 44 }
45 45
46 46 @ApiOperation("分页查询")
47   - @HasPermission({"procure-manage:supplier-quote-project:query"})
  47 + @HasPermission({"procure-manage:supplier-price:query"})
48 48 @GetMapping("/query")
49 49 public InvokeResult<PageResult<SupplierQuotationProject>> query(@Valid QuerySupplierQuotationProjectVo vo) {
50 50 return InvokeResultBuilder.success(
... ... @@ -52,7 +52,7 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
52 52 }
53 53
54 54 @ApiOperation("详情")
55   - @HasPermission({"procure-manage:supplier-quote-project:query"})
  55 + @HasPermission({"procure-manage:supplier-price:query"})
56 56 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
57 57 @GetMapping("")
58 58 public InvokeResult<SupplierQuotationProject> get(@NotBlank(message = "id不能为空！") String id) {
... ... @@ -64,7 +64,7 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
64 64 }
65 65
66 66 @ApiOperation("修改")
67   - @HasPermission({"procure-manage:supplier-quote-project:modify"})
  67 + @HasPermission({"procure-manage:supplier-price:modify"})
68 68 @PutMapping
69 69 public InvokeResult<Void> update(@Valid @RequestBody UpdateSupplierQuotationProjectVo vo) {
70 70 supplierQuotationProjectService.update(vo);
... ... @@ -72,7 +72,7 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
72 72 }
73 73
74 74 @ApiOperation("更新项目状态")
75   - @HasPermission({"procure-manage:supplier-quote-project:modify"})
  75 + @HasPermission({"procure-manage:supplier-price:modify", "procure-manage:supplier-price:publish"})
76 76 @GetMapping("/updateStatus")
77 77 public InvokeResult<Void> updateStatus(@NotBlank(message = "id不能为空！") String id, @NotBlank(message = "status不能为空！") String status) {
78 78 supplierQuotationProjectService.updateStatus(id, status);
... ... @@ -80,7 +80,7 @@ public class SupplierQuotationProjectController extends DefaultBaseController {
80 80 }
81 81
82 82 @ApiOperation("删除")
83   - @HasPermission({"procure-manage:supplier-quote-project:delete"})
  83 + @HasPermission({"procure-manage:supplier-price:delete"})
84 84 @DeleteMapping("")
85 85 public InvokeResult<Void> delete(@NotBlank(message = "id不能为空！") String id) {
86 86 supplierQuotationProjectService.delete(id);
... ...
... ... @@ -65,7 +65,6 @@ public class SupplierQuotationProjectServiceImpl
65 65
66 66 PageHelperUtil.startPage(pageIndex, pageSize);
67 67 List<SupplierQuotationProject> datas = this.query(vo);
68   - fillComputedStatus(datas);
69 68 return PageResultUtil.convert(new PageInfo<>(datas));
70 69 }
71 70
... ...