From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
index 313f3fe..ca09670 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -52,7 +52,7 @@
* 鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃
*/
@ApiOperation("鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceReimbursementdetail serviceReimbursementdetail) {
startPage();
@@ -65,7 +65,7 @@
* 瀵煎嚭鎶ラ攢鐢宠鏄庣粏鍒楄〃
*/
@ApiOperation("瀵煎嚭鎶ラ攢鐢宠鏄庣粏鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:export')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceReimbursementdetail serviceReimbursementdetail) {
@@ -87,7 +87,7 @@
* 鑾峰彇鎶ラ攢鐢宠鏄庣粏璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎶ラ攢鐢宠鏄庣粏璇︾粏淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceReimbursementdetailService.getById(id));
@@ -97,9 +97,9 @@
* 鏂板鎶ラ攢鐢宠鏄庣粏
*/
@ApiOperation("鏂板鎶ラ攢鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:add')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
@@ -110,14 +110,15 @@
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
}
- return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
+ boolean save = serviceReimbursementdetailService.save(serviceReimbursementdetail);
+ return AjaxResult.success(serviceReimbursementdetail);
}
/**
* 淇敼鎶ラ攢鐢宠鏄庣粏
*/
@ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "淇敼鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PostMapping("/updateRDlList")
public AjaxResult updateRDlList(@RequestBody List<ServiceReimbursementdetail> serviceReimbursementdetails) {
@@ -132,7 +133,7 @@
* 淇敼鎶ラ攢鐢宠鏄庣粏
*/
@ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PostMapping("/reimbursementdetailEdit")
//@RepeatSubmit
@@ -162,10 +163,14 @@
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
//瀵瑰墠绔紶杩囨潵鐨勬暟缁勶紝杩涜JSON搴忓垪鍖栵紝骞惰祴鍊肩粰Annexfiles
serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
+ } else {
+ serviceReimbursementdetail.setAnnexfiles(null);
}
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
//瀵瑰墠绔紶杩囨潵鐨勬暟缁勶紝杩涜JSON搴忓垪鍖栵紝骞惰祴鍊肩粰Invoicefiles
serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
+ } else {
+ serviceReimbursementdetail.setInvoicefiles(null);
}
return toAjax(serviceReimbursementdetailService.updateById(serviceReimbursementdetail));
}
@@ -174,7 +179,7 @@
* 鍒犻櫎鎶ラ攢鐢宠鏄庣粏
*/
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
--
Gitblit v1.9.3