Commit 47b880bf76c22ab973a23e8cef8e811a6fa32273

Authored by 房远帅
1 parent 1e7e6eae

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

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