From 1bfec53e4e3a196a3ca53e06e9bec88139cbb689 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 18:06:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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..699d0de 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")
@@ -80,11 +82,33 @@
public void exportExcel (@RequestBody PageWrap<ApplyChange> pageWrap, HttpServletResponse response) {
ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃", response);
}
+ @ApiOperation("瀵煎嚭鍔犲噺淇濊鎯呭崟")
+ @PostMapping("/exportJiajianBaoExcel")
+ @RequiresPermissions("business:insuranceapply:exportExcel")
+ public void exportJiajianBaoExcel (@RequestBody ApplyChange model, HttpServletResponse response) {
+ ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcel(applyChangeService.exportJiajianBaoExcel(model), response);
+ }
+ @ApiOperation("瀵煎嚭鎹㈠巶鐢宠璇︽儏鍗�")
+ @PostMapping("/exportChangeUnitExcel")
+ @RequiresPermissions("business:insuranceapply:exportExcel")
+ public void exportChangeUnitExcel (@RequestBody ApplyChange model, HttpServletResponse response) {
+ ExcelExporter.build(ApplyChange.class).exportChangeUnitExcel(applyChangeService.exportChangeUnitExcel(model), response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@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