From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 八月 2024 11:57:15 +0800
Subject: [PATCH] 2024.8.15 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/CommitmentController.kt | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/CommitmentController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/CommitmentController.kt
index f053f90..2e89d21 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/CommitmentController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/CommitmentController.kt
@@ -1,6 +1,7 @@
package cn.flightfeather.supervision.lightshare.web
import cn.flightfeather.supervision.lightshare.service.CommitmentService
+import cn.flightfeather.supervision.lightshare.vo.BaseResponse
import cn.flightfeather.supervision.lightshare.vo.CommitmentVo
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
@@ -8,6 +9,8 @@
import io.swagger.annotations.ApiResponse
import org.springframework.web.bind.annotation.*
import org.springframework.web.multipart.MultipartFile
+import org.springframework.web.multipart.MultipartHttpServletRequest
+import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
/**
@@ -28,6 +31,12 @@
response: HttpServletResponse
) = commitmentService.getLetterOfCommitment(userId, page, perPage, response)
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鎵胯涔︽ā鏉�")
+ @GetMapping("/letter/template")
+ fun getTemplateOfCommitment(
+ @ApiParam(value = "鐢ㄦ埛id") @RequestParam("userId") userId: String,
+ ) = commitmentService.getTemplateOfCommitment(userId)
+
@ApiOperation(value = "涓婁紶鎵胯涔�")
@PostMapping("/letter/upload")
fun uploadLetterOfCommitment(
@@ -38,10 +47,14 @@
@ApiOperation(value = "鐢熸垚鎵胯涔�")
@PostMapping("/letter/create")
- fun createLetterOfCommitment(
- @ApiParam(value = "鐢ㄦ埛id") @RequestParam userId: String,
- @ApiParam(value = "鎵胯涔﹀弬鏁�") @RequestBody vo: CommitmentVo,
- @ApiParam(value = "鎵胯涔︾鍚�") @RequestPart("sign") sign: MultipartFile,
- @ApiParam(value = "鎵胯涔︾洊绔�", required = false) @RequestPart("seal") seal: MultipartFile?
- ) = commitmentService.createLetterOfCommitment(userId, vo, sign, seal)
+ fun createLetterOfCommitment(request: HttpServletRequest) = if (request is MultipartHttpServletRequest) {
+ val sign = request.getFile("sign")
+ val seal = request.getFile("seal")
+ val userId = request.getParameter("userId")
+ val vo = request.getParameter("coVo")
+
+ commitmentService.createLetterOfCommitment(userId, vo, sign, seal)
+ } else {
+ BaseResponse(false)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3