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/LedgerController.kt | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/LedgerController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/LedgerController.kt
index f26771b..66405a0 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/LedgerController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/LedgerController.kt
@@ -1,6 +1,8 @@
package cn.flightfeather.supervision.lightshare.web
import cn.flightfeather.supervision.lightshare.service.LedgerService
+import cn.flightfeather.supervision.lightshare.vo.CopyLedgerVo
+import cn.flightfeather.supervision.lightshare.vo.LedgerCheckVo
import cn.flightfeather.supervision.lightshare.vo.LedgerVo
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
@@ -50,7 +52,7 @@
@ApiParam("鐢ㄦ埛id") @PathVariable userId: String,
@ApiParam(value = "鍙拌处瀛愮被鍨媔d锛� 濡傛灉涓嶄紶锛屽垯榛樿鏍规嵁鍦烘櫙绫诲瀷鑾峰彇鎵�鏈夊彴璐�", required = false) @RequestParam(value = "ledgerSubTypeId", required = false) ledgerSubTypeId: Int?,
@ApiParam("鍦烘櫙绫诲瀷id") @RequestParam(value = "sceneType") sceneType: Int,
- @ApiParam(value = "鏃堕棿", example = "yyyy-MM-dd") @RequestParam(value = "time") time: String
+ @ApiParam(value = "鏃堕棿", example = "yyyy-MM-dd") @RequestParam(value = "time", required = false) time: String?
) = ledgerService.getLedgerDetail2(userId, ledgerSubTypeId, sceneType, time)
@ApiOperation(value = "涓婁紶鍙拌处淇℃伅")
@@ -60,6 +62,15 @@
@ApiParam("鍙拌处淇℃伅json") @RequestParam("params") ledgerVoList: String,
@ApiParam("鍙拌处鍥剧墖") @RequestPart("images") files:Array<MultipartFile>
) = ledgerService.uploadLedger(userId, ledgerVoList, files)
+
+ @ApiOperation("涓婁紶涓嶆秹鍙婂彴璐�")
+ @PostMapping("/upload/noLedger")
+ fun uploadNoLedger(
+ @RequestParam("userId") userId: String,
+ @RequestParam("time") time: String,
+ @RequestParam(required = false) remark: String?,
+ @RequestBody ledgerIdList: List<Int>
+ ) = ledgerService.uploadNoLedger(userId, time, remark, ledgerIdList)
@ApiOperation(value = "鑾峰彇鏌愪釜鍙拌处鏄剧ず鍥炬爣url")
@GetMapping("/{userId}/img")
@@ -75,4 +86,20 @@
@ApiParam("鐢ㄦ埛id") @PathVariable userId: String,
@ApiParam("鍙拌处绫诲瀷id鏁扮粍") @RequestParam("ledgerTypes") ledgerTypes: List<Int>
) = ledgerService.getLedgerImgs(userId, ledgerTypes)
+
+ @ApiOperation("澶嶅埗鍦烘櫙鐨勫彴璐�")
+ @PostMapping("/copy")
+ fun copyLedger(
+ @RequestParam("userId") userId: String,
+ @RequestParam("time") time: String,
+ @RequestBody copyLedgerList: List<CopyLedgerVo>
+ ) = ledgerService.copyLedger(userId, time, copyLedgerList)
+
+ @ApiOperation("瀹℃牳鍙拌处")
+ @PostMapping("/check")
+ fun checkLedger(
+ @RequestParam("verifierId") verifierId: String,
+ @RequestParam(value = "remark", required = false) remark: String?,
+ @RequestBody recordList: List<LedgerCheckVo>
+ ) = ledgerService.checkLedger(verifierId, remark, recordList)
}
\ No newline at end of file
--
Gitblit v1.9.3