From 2c16ba7f4cdfedf4ec05395e20caf9c87f2b5101 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 09 八月 2023 18:15:50 +0800
Subject: [PATCH] 修改funddetail文件上传
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 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 1e49609..a8dd91f 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
@@ -1,11 +1,20 @@
package com.ruoyi.web.controller.project;
+import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.project.domain.ServiceReimbursementdetailVO;
+import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -26,17 +35,18 @@
/**
* 鎶ラ攢鐢宠鏄庣粏Controller
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
@Api("鎶ラ攢鐢宠鏄庣粏")
@RestController
@RequestMapping("/project/reimbursementdetail")
-public class ServiceReimbursementdetailController extends BaseController
-{
+public class ServiceReimbursementdetailController extends BaseController {
@Autowired
private IServiceReimbursementdetailService serviceReimbursementdetailService;
+ @Autowired
+ private IServiceReimbursementdetailSharedService detailSharedService;
/**
* 鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃
@@ -44,8 +54,7 @@
@ApiOperation("鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public TableDataInfo list(ServiceReimbursementdetail serviceReimbursementdetail) {
startPage();
//List<ServiceReimbursementdetail> list = serviceReimbursementdetailService.queryList(serviceReimbursementdetail);
List<ServiceReimbursementdetail> list = serviceReimbursementdetailService.selectServiceReimbursementdetailList(serviceReimbursementdetail);
@@ -59,8 +68,7 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:export')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public AjaxResult export(ServiceReimbursementdetail serviceReimbursementdetail) {
List<ServiceReimbursementdetail> list = serviceReimbursementdetailService.queryList(serviceReimbursementdetail);
ExcelUtil<ServiceReimbursementdetail> util = new ExcelUtil<ServiceReimbursementdetail>(ServiceReimbursementdetail.class);
return util.exportExcel(list, "鎶ラ攢鐢宠鏄庣粏鏁版嵁");
@@ -68,9 +76,9 @@
@DeleteMapping("/deleteByRBId/{rbid}")
- public AjaxResult removeAllDetail(@PathVariable("rbid") Long rbid){
+ public AjaxResult removeAllDetail(@PathVariable("rbid") Long rbid) {
List<Long> ids = serviceReimbursementdetailService.getAllIds(rbid);
- Long[] arr = (Long[])ids.toArray(new Long[ids.size()]);
+ Long[] arr = (Long[]) ids.toArray(new Long[ids.size()]);
return remove(arr);
}
@@ -81,8 +89,7 @@
@ApiOperation("鑾峰彇鎶ラ攢鐢宠鏄庣粏璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceReimbursementdetailService.getById(id));
}
@@ -94,8 +101,11 @@
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
+ ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
+ serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
+ }
return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
}
@@ -104,11 +114,30 @@
*/
@ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
+ @Log(title = "淇敼鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateRDlList")
+ public AjaxResult updateRDlList(@RequestBody List<ServiceReimbursementdetail> serviceReimbursementdetails) {
+ for (ServiceReimbursementdetail serviceReimbursementdetail : serviceReimbursementdetails) {
+ serviceReimbursementdetailService.saveOrUpdate(serviceReimbursementdetail);
+
+ }
+ return null;
+ }
+
+ /**
+ * 淇敼鎶ラ攢鐢宠鏄庣粏
+ */
+ @ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
+ //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/reimbursementdetailEdit")
//@RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceReimbursementdetail serviceReimbursementdetail)
- {
+ public AjaxResult edit(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
+ ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
+ //瀵瑰墠绔紶杩囨潵鐨勬暟缁勶紝杩涜JSON搴忓垪鍖栵紝骞惰祴鍊肩粰Annexfiles
+ serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
+ }
return toAjax(serviceReimbursementdetailService.updateById(serviceReimbursementdetail));
}
@@ -119,8 +148,7 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceReimbursementdetailService.removeByIds(Arrays.asList(ids)));
}
@@ -131,8 +159,7 @@
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/deleteDetail/{id}")
- public AjaxResult deleteDetail(@PathVariable Long id)
- {
+ public AjaxResult deleteDetail(@PathVariable Long id) {
return AjaxResult.success(serviceReimbursementdetailService.deleteDetail(id));
}
--
Gitblit v1.9.3