From 8e7e81802c743b96ef49969817749069fe0818e1 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期四, 18 四月 2024 14:51:25 +0800 Subject: [PATCH] 单兵端查询自己发起的全部申请提交 --- ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java b/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java index b1bcad4..f061476 100644 --- a/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java +++ b/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java @@ -109,7 +109,7 @@ } @PostMapping("/sendCheckCommandersPosition") - @ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�") + //@ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�") public AjaxResult sendCheckCommandersPosition(@RequestBody Map<String,Object> para) { String usersId = SecurityUtils.getUserId(); try{ @@ -122,7 +122,7 @@ } @PostMapping("/sendCheckSYCarsPosition") - @ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆") + //@ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆") public AjaxResult sendCheckSYCarsPosition(@RequestBody Map<String,Object> para) { String usersId = SecurityUtils.getUserId(); try{ @@ -135,7 +135,7 @@ } @GetMapping("/getCheckPosition") - @ApiOperation("鎸囨尌绔煡鐪嬩綅缃敵璇�") + //@ApiOperation("鎸囨尌绔煡鐪嬩綅缃敵璇�") public AjaxResult getCheckPosition() { String usersId = SecurityUtils.getUserId(); try{ @@ -148,7 +148,7 @@ } @PutMapping("/approvalCheckPosition") - @ApiOperation("鎸囨尌绔鎵圭敵璇�") + //@ApiOperation("鎸囨尌绔鎵圭敵璇�") public AjaxResult approvalCheckPosition(@RequestBody Map<String,String> para) { String commanderId = SecurityUtils.getUserId(); try{ @@ -161,7 +161,7 @@ } @GetMapping("/getCheckPositionTrue") - @ApiOperation("鎸囨尌绔煡鐪嬮�氳繃鐨勭敵璇�") + //@ApiOperation("鎸囨尌绔煡鐪嬮�氳繃鐨勭敵璇�") public AjaxResult getCheckPositionTrue() { String commanderId = SecurityUtils.getUserId(); try{ @@ -174,7 +174,7 @@ } @GetMapping("/getCheckPositionOwn") - @ApiOperation("鍗曞叺绔煡鐪嬪凡瀹℃壒鐨勭敵璇�") + //@ApiOperation("鍗曞叺绔煡鐪嬪凡瀹℃壒鐨勭敵璇�") public AjaxResult getCheckPositionOwn() { String soilderId = SecurityUtils.getUserId(); try{ @@ -187,7 +187,7 @@ } @PutMapping("/approvalCheckPositionOwn") - @ApiOperation("鍗曞叺绔鎵规洿鏀规煡鐪嬫爣璁�") + //@ApiOperation("鍗曞叺绔鎵规洿鏀规煡鐪嬫爣璁�") public AjaxResult approvalCheckPositionOwn(@RequestBody Map<String,String> para) { String soilderId = SecurityUtils.getUserId(); try{ @@ -200,7 +200,7 @@ } @GetMapping("/getSendPositionTrue") - @ApiOperation("鍗曞叺绔煡鐪嬮�氳繃鐨勭敵璇�") + //@ApiOperation("鍗曞叺绔煡鐪嬮�氳繃鐨勭敵璇�") public AjaxResult getSendPositionTrue() { String soilderId = SecurityUtils.getUserId(); try{ @@ -213,7 +213,7 @@ } @GetMapping("/getCheckPositionNo") - @ApiOperation("PC绔煡鐪嬫湭瀹℃壒鐨勭敵璇�") + //@ApiOperation("PC绔煡鐪嬫湭瀹℃壒鐨勭敵璇�") public AjaxResult getCheckPositionNo() {// String commanderId = SecurityUtils.getUserId(); try{ @@ -226,7 +226,7 @@ } @PostMapping("/getSoilderAndCarPositionByCommanderIdNear") - @ApiOperation("PC绔寚鎸ョ鏌ョ湅鍗曞叺绔強杞﹁締浣嶇疆") + //@ApiOperation("PC绔寚鎸ョ鏌ョ湅鍗曞叺绔強杞﹁締浣嶇疆") public AjaxResult getSoilderAndCarPositionByCommanderIdNear(@RequestBody Map<String, Double> para) { String commanderId = SecurityUtils.getUserId(); try{ @@ -237,4 +237,17 @@ return AjaxResult.error(); } } + + @GetMapping("/getSendPositionALL") + //@ApiOperation("鍗曞叺绔煡鐪嬪彂璧风殑鍏ㄩ儴鐢宠") + public AjaxResult getSendPositionALL() { + String soilderId = SecurityUtils.getUserId(); + try{ + Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getSendPositionALL(soilderId); + return AjaxResult.success(result); + }catch(Exception e){ + e.printStackTrace(); + return AjaxResult.error(); + } + } } -- Gitblit v1.9.3