From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
index 6256cca..a44a11f 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -6,6 +6,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
+import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
import com.doumee.dao.business.model.ApplyChange;
import com.doumee.service.business.ApplyChangeService;
import io.swagger.annotations.Api;
@@ -20,7 +22,7 @@
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Api(tags = "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃")
@RestController
@@ -71,7 +73,7 @@
@PostMapping("/page")
@RequiresPermissions("business:applychange:query")
public ApiResponse<PageData<ApplyChange>> findPage (@RequestBody PageWrap<ApplyChange> pageWrap) {
- return ApiResponse.success(applyChangeService.findPage(pageWrap));
+ return ApiResponse.success(applyChangeService.findPageForCompany(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@@ -85,6 +87,16 @@
@GetMapping("/{id}")
@RequiresPermissions("business:applychange:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(applyChangeService.findById(id));
+ return ApiResponse.success(applyChangeService.findDetail(id));
}
+
+
+ @ApiOperation(value = "涓氬姟澶勭悊",notes = "閫�鍥炵敵璇凤紝鍏抽棴绛�")
+ @PostMapping("/applyChangeOpt")
+ public ApiResponse applyChangeOpt (@RequestBody ApplyChangeOptDTO applyChangeOptDTO) {
+ applyChangeService.changeOpt(applyChangeOptDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
}
--
Gitblit v1.9.3