From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
index 6256cca..d8a1d53 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.ApplyChange;
+import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.service.business.ApplyChangeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,7 @@
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Api(tags = "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃")
@RestController
@@ -37,7 +38,46 @@
public ApiResponse create(@RequestBody ApplyChange applyChange) {
return ApiResponse.success(applyChangeService.create(applyChange));
}
-
+ @PreventRepeat
+ @ApiOperation("骞冲彴閫�鍥炴姇淇�")
+ @PostMapping("/back")
+ @RequiresPermissions("business:applychange:back")
+ public ApiResponse back(@RequestBody ApplyChange applyChange) {
+ return ApiResponse.success(applyChangeService.back(applyChange));
+ }
+ @PreventRepeat
+ @ApiOperation("骞冲彴澶勭悊閫�鍥炵敵璇�")
+ @PostMapping("/dealBackApply")
+ @RequiresPermissions("business:applychange:dealBackApply")
+ public ApiResponse dealBackApply(@RequestBody ApplyChange applyChange) {
+ return ApiResponse.success(applyChangeService.dealBackApply(applyChange));
+ }
+ @PreventRepeat
+ @ApiOperation("骞冲彴涓婁紶鎵瑰崟")
+ @PostMapping("/uploadPidan")
+ @RequiresPermissions("business:applychange:uploadPidan")
+ public ApiResponse uploadPidan(@RequestBody ApplyChange applyChange) {
+ return ApiResponse.success(applyChangeService.uploadPidan(applyChange));
+ }
+ @PreventRepeat
+ @ApiOperation("骞冲彴淇敼鎵瑰崟")
+ @PostMapping("/editPidan")
+ @RequiresPermissions("business:applychange:uploadPidan")
+ public ApiResponse editPidan(@RequestBody ApplyChange applyChange) {
+ return ApiResponse.success(applyChangeService.editPidan(applyChange));
+ }
+ @ApiOperation("鑾峰彇鍔犲噺淇濈绔犲湴鍧�")
+ @PostMapping("/getJiajianBaoSignLink")
+ @RequiresPermissions("business:applychange:sign")
+ public ApiResponse<String> getSignLinkJiajiabao (@RequestBody ApplyChange model, HttpServletResponse response) {
+ return ApiResponse.success( applyChangeService.getSignLinkJiajiabao(model));
+ }
+ @ApiOperation("鑾峰彇缂撳瓨鐢宠绛剧珷鍦板潃")
+ @PostMapping("/getChangeUnitSignLink")
+ @RequiresPermissions("business:applychange:sign")
+ public ApiResponse<String> getChangeUnitSignLink (@RequestBody ApplyChange model, HttpServletResponse response) {
+ return ApiResponse.success( applyChangeService.getSignLinkChangeUnit(model));
+ }
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@RequiresPermissions("business:applychange:delete")
@@ -71,20 +111,34 @@
@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")
@PostMapping("/exportExcel")
@RequiresPermissions("business:applychange:exportExcel")
public void exportExcel (@RequestBody PageWrap<ApplyChange> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃", response);
+ ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPageForCompany(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃", response);
}
+
+ @ApiOperation("瀵煎嚭鍔犲噺淇濊鎯呭崟")
+ @PostMapping("/exportJiajianBaoExcel")
+ @RequiresPermissions("business:applychange:exportExcel")
+ public void exportJiajianBaoExcel (@RequestBody ApplyChange model, HttpServletResponse response) {
+ ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcel(applyChangeService.exportJiajianBaoExcel(model), response);
+ }
+ @ApiOperation("瀵煎嚭鎹㈠巶鐢宠璇︽儏鍗�")
+ @PostMapping("/exportChangeUnitExcel")
+ @RequiresPermissions("business:applychange: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));
+ public ApiResponse<ApplyChange> findById(@PathVariable Integer id) {
+ return ApiResponse.success(applyChangeService.findDetail(id));
}
}
--
Gitblit v1.9.3