From f28e4b29ec8e8d2246ef0c634661d1b062365d71 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 一月 2024 15:28:28 +0800
Subject: [PATCH] 测试提交
---
ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java | 95 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 87 insertions(+), 8 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 f4b7176..72120d3 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
@@ -4,6 +4,7 @@
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.app.application.domain.ArdAppApplication;
import com.ruoyi.common.utils.SecurityUtils;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +21,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.app.application.domain.ArdAppApplication;
+
import com.ruoyi.app.application.service.IArdAppApplicationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -29,7 +30,7 @@
* 鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆Controller
*
* @author ard
- * @date 2024-01-23
+ * @date 2024-01-25
*/
@RestController
@RequestMapping("/app/application")
@@ -67,10 +68,10 @@
* 鑾峰彇鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('app:application:query')")
- @GetMapping(value = "/{applicationId}")
- public AjaxResult getInfo(@PathVariable("applicationId") String applicationId)
+ @GetMapping(value = "/{soilderId}")
+ public AjaxResult getInfo(@PathVariable("soilderId") String soilderId)
{
- return success(ardAppApplicationService.selectArdAppApplicationByApplicationId(applicationId));
+ return success(ardAppApplicationService.selectArdAppApplicationBySoilderId(soilderId));
}
/**
@@ -100,10 +101,10 @@
*/
@PreAuthorize("@ss.hasPermi('app:application:remove')")
@Log(title = "鍗曞叺绔敵璇锋煡鐪嬫寚鎸ョ浣嶇疆鎴栦笁涓�杞﹁締浣嶇疆", businessType = BusinessType.DELETE)
- @DeleteMapping("/{applicationIds}")
- public AjaxResult remove(@PathVariable String[] applicationIds)
+ @DeleteMapping("/{soilderIds}")
+ public AjaxResult remove(@PathVariable String[] soilderIds)
{
- return toAjax(ardAppApplicationService.deleteArdAppApplicationByApplicationIds(applicationIds));
+ return toAjax(ardAppApplicationService.deleteArdAppApplicationBySoilderIds(soilderIds));
}
@PostMapping("/sendCheckCommandersPosition")
@@ -144,4 +145,82 @@
return AjaxResult.error();
}
}
+
+ @PutMapping("/approvalCheckPosition")
+ @ApiOperation("鎸囨尌绔鎵圭敵璇�")
+ public AjaxResult approvalCheckPosition(@RequestBody Map<String,String> para) {
+ String commanderId = SecurityUtils.getUserId();
+ try{
+ int result = ardAppApplicationService.approvalCheckPosition(commanderId,para);
+ return result > 0 ? AjaxResult.success() : AjaxResult.error();
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @GetMapping("/getCheckPositionTrue")
+ @ApiOperation("鎸囨尌绔煡鐪嬮�氳繃鐨勭敵璇�")
+ public AjaxResult getCheckPositionTrue() {
+ String commanderId = SecurityUtils.getUserId();
+ try{
+ Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getCheckPositionTrue(commanderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @GetMapping("/getCheckPositionOwn")
+ @ApiOperation("鍗曞叺绔煡鐪嬪凡瀹℃壒鐨勭敵璇�")
+ public AjaxResult getCheckPositionOwn() {
+ String soilderId = SecurityUtils.getUserId();
+ try{
+ Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getCheckPositionOwn(soilderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @PutMapping("/approvalCheckPositionOwn")
+ @ApiOperation("鍗曞叺绔鎵规洿鏀规煡鐪嬫爣璁�")
+ public AjaxResult approvalCheckPositionOwn(@RequestBody Map<String,String> para) {
+ String soilderId = SecurityUtils.getUserId();
+ try{
+ int result = ardAppApplicationService.approvalCheckPositionOwn(soilderId,para);
+ return result > 0 ? AjaxResult.success() : AjaxResult.error();
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @GetMapping("/getSendPositionTrue")
+ @ApiOperation("鍗曞叺绔煡鐪嬮�氳繃鐨勭敵璇�")
+ public AjaxResult getSendPositionTrue() {
+ String soilderId = SecurityUtils.getUserId();
+ try{
+ Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getSendPositionTrue(soilderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @GetMapping("/getCheckPositionNo")
+ @ApiOperation("PC绔煡鐪嬫湭瀹℃壒鐨勭敵璇�")
+ public AjaxResult getCheckPositionNo() {//
+ String commanderId = SecurityUtils.getUserId();
+ try{
+ List<Map<String,Object>> result = ardAppApplicationService.getCheckPositionNo(commanderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
}
--
Gitblit v1.9.3