bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -75,7 +75,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id查询当前所有合同
      */
-    @GetMapping("/get-contractInfo-by-pid")
+    @GetMapping("/get-contractInfo")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据项目id查询当前所有合同", notes = "传入pid")
     public R<List<ContractInfo>> findContractInfoByPid(String pid) {
@@ -180,7 +180,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 查询角色的岗位
      */
-    @GetMapping("/get-job-by-roleId")
+    @GetMapping("/get-jobs")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "查询角色下的岗位", notes = "传入id")
     public R<List<CRolePostVO>> findJobByRoleId(@ApiParam(value = "id", required = true)
@@ -304,7 +304,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 保存-项目合同段分配人员
      */
-    @PostMapping("/save-userInfo-by-projectTow")
+    @PostMapping("/save-userInfo-by-project-tow")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "保存-项目合同段分配人员", notes = "传入项目id、合同id、岗位处roleId、用户id")
     @Transactional(rollbackFor = Exception.class)
@@ -374,7 +374,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 项目分配用户逻辑删除当前项目下所有合同段角色信息
      */
-    @PostMapping("/remove-user-projectInfoAndRole-by-id")
+    @PostMapping("/remove-userProjectInfo-role-byId")
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "逻辑删除当前项目下所有合同段角色信息", notes = "传入dataInfo内的一个id")
     public R removeUserProjectInfoAndRoleById(@ApiParam(value = "dataInfo内的一个id", required = true) @RequestParam String id) {
@@ -406,7 +406,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 保存或修改分配合同段wbs树
      */
-    @PostMapping("/submit-wbsTree-in-contract")
+    @PostMapping("/submit-wbsTree-contract")
     @ApiOperationSupport(order = 17)
     @ApiOperation(value = "保存或修改分配合同段wbs树", notes = "传入WbsTreeContractDTO")
     public R submitWbsTreeInContract(@RequestBody WbsTreeContractDTO wbsTreeContractDTO) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java

@@ -209,7 +209,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 保存或修改分配项目级wbs树
      */
-    @PostMapping("/submit-wbsTree-in-project")
+    @PostMapping("/submit-wbsTree-project")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "保存或修改分配项目级wbs树", notes = "传入WbsTreeContractDTO")
     public R submitWbsTreeInProject(@RequestBody WbsTreeContractDTO pawDTO) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java

@@ -160,7 +160,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入该节点id")
-    @RequestMapping(value = "/get-wbsTree-tableSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-table-same-level", method = RequestMethod.GET)
     public R<List<WbsFormElementDTO2>> findWbsTreeTableSameLevel(@RequestParam("id") String id) {
         List<WbsFormElementDTO2> trees = wbsFormElementService.findWbsTreeTableSameLevel(id);
         return R.data(trees);
@@ -171,7 +171,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsFormElementDTO2集合,id=表单id")
-    @RequestMapping(value = "/submit-wbsTree-table-sort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-table-sort", method = RequestMethod.POST)
     public R wbsTreeTableSort(@RequestBody List<WbsFormElementDTO2> wbsTreeDTO) {
         boolean b = wbsFormElementService.wbsTreeTableSort(wbsTreeDTO);
         return R.status(b);
@@ -183,7 +183,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "提交清表关联公有Wbs树并创建元素", notes = "节点id、表名、元素DTO")
-    @RequestMapping(value = "/submit-excel-relation-wbsTreeAndElement", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-excel-relation-wbsTree-element", method = RequestMethod.POST)
     public R submitExcelRelationWbsTreeAndElement(@RequestBody FormElementDTO2 formElementDTO) {
         return R.status(wbsFormElementService.submitExcelRelationWbsTreeAndElement(formElementDTO));
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java

@@ -158,7 +158,7 @@ public class WbsInfoController extends BladeController {
     /**
      * 根据类型查找
      */
-    @GetMapping("/get-by-wbsType")
+    @GetMapping("/get-wbs-type")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据类型查找", notes = "传入type,1=质检 2=实验 3=计量")
     public R<List<WbsInfo>> findByWbsType(String type) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -152,7 +152,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 查询当前节点下所有表单（根据节点ID查询当前表单）
      */
-    @GetMapping("/get-by-node-table")
+    @GetMapping("/get-node-table")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入父节点id")
     public R<List<WbsNodeTableVO>> selectByNodeTable(@ApiParam(value = "父节点id", required = true) @RequestParam String id) {
@@ -166,7 +166,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 删除表单
      */
-    @GetMapping("/remove-table-by-id")
+    @GetMapping("/remove-table")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "表单删除", notes = "传入id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -307,7 +307,7 @@ public class WbsTreePrivateController extends BladeController {
     /**
      * 查询当前节点下所有表单（根据节点ID查询当前表单）
      */
-    @GetMapping("/get-node-table-by-condition")
+    @GetMapping("/get-node-tables")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "查询当前节点下所有元素表", notes = "传入父节点id、wbsId、projectId")
     public R<List<WbsNodeTableVO>> findNodeTableByCondition(@RequestParam("parentId") String parentId,
@@ -321,7 +321,7 @@ public class WbsTreePrivateController extends BladeController {
     }
 
 
-    @GetMapping("/remove-table-by-condition")
+    @GetMapping("/remove-table")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "删除节点下的元素表", notes = "传入表单id、wbsId、projectId")
     public R removeTableByCondition(@RequestParam("id") String id,