From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 e0c12bf..ac9af61 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
@@ -4,8 +4,10 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.ApplyChangeCyclePriceDTO;
import com.doumee.dao.business.dto.ApplyChangeOptDTO;
import com.doumee.dao.business.dto.CountCyclePriceDTO;
@@ -15,7 +17,8 @@
import com.doumee.service.business.ApplyChangeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -64,11 +67,11 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
+ @ApiOperation("淇敼淇℃伅")
+ @PostMapping("/update")
@RequiresPermissions("business:applychange:update")
- public ApiResponse updateById(@RequestBody ApplyChange applyChange) {
- applyChangeService.updateById(applyChange);
+ public ApiResponse update(@RequestBody ApplyChange applyChange) {
+ applyChangeService.update(applyChange);
return ApiResponse.success(null);
}
@@ -83,7 +86,7 @@
@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")
@@ -113,10 +116,9 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:applychange:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse<ApplyChange> findById(@PathVariable Integer id) {
return ApiResponse.success(applyChangeService.findDetail(id));
}
-
@ApiOperation(value = "涓氬姟澶勭悊",notes = "閫�鍥炵敵璇凤紝鍏抽棴绛�")
@PostMapping("/applyChangeOpt")
@@ -131,4 +133,11 @@
return ApiResponse.success("鎿嶄綔鎴愬姛",applyChangeService.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO));
}
+ @ApiOperation("鎶曚繚纭涔︾绔犱笟鍔�")
+ @GetMapping("/getChangeMemberListOnlineSignLink/{id}")
+ @RequiresPermissions("business:applychange:query")
+ public ApiResponse<String> getChangeMemberListOnlineSignLink(@PathVariable Integer id) {
+ return ApiResponse.success(applyChangeService.getChangeMemberListOnlineSignLink(id));
+ }
+
}
--
Gitblit v1.9.3