From 78ee837585bf67ca1b462db6adbdb8135de05fb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 十二月 2023 17:50:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 f2504ab..3f052e6 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
@@ -75,7 +75,7 @@
}
- @DeleteMapping("/deleteByRBId/{rbid}")
+ @GetMapping("/deleteByRBId/{rbid}")
public AjaxResult removeAllDetail(@PathVariable("rbid") Long rbid) {
List<Long> ids = serviceReimbursementdetailService.getAllIds(rbid);
Long[] arr = (Long[]) ids.toArray(new Long[ids.size()]);
@@ -103,8 +103,12 @@
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
+ //灏嗗墠绔紶鏉ョ殑闄勪欢闆嗗悎杞垚瀛楃涓�
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
+ }
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
+ serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
}
return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
}
@@ -130,13 +134,42 @@
@ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/reimbursementdetailEdit")
//@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
+ if (serviceReimbursementdetailVO.getTrafficexpense() == null) {
+ serviceReimbursementdetailVO.setTrafficexpense(new BigDecimal(0));
+ }
+ if (serviceReimbursementdetailVO.getCityfee() == null) {
+ serviceReimbursementdetailVO.setCityfee(new BigDecimal(0));
+ }
+ if (serviceReimbursementdetailVO.getHotelexpense() == null) {
+ serviceReimbursementdetailVO.setHotelexpense(new BigDecimal(0));
+ }
+ if (serviceReimbursementdetailVO.getFoodexpenses() == null) {
+ serviceReimbursementdetailVO.setFoodexpenses(new BigDecimal(0));
+ }
+ if (serviceReimbursementdetailVO.getFoodallowance() == null) {
+ serviceReimbursementdetailVO.setFoodallowance(new BigDecimal(0));
+ }
+ if (serviceReimbursementdetailVO.getOtherexpense() == null) {
+ serviceReimbursementdetailVO.setOtherexpense(new BigDecimal(0));
+ }
+ if (serviceReimbursementdetailVO.getOtherfeeamount() == null) {
+ serviceReimbursementdetailVO.setOtherfeeamount(new BigDecimal(0));
+ }
ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
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));
}
@@ -147,7 +180,7 @@
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceReimbursementdetailService.removeByIds(Arrays.asList(ids)));
}
@@ -158,7 +191,7 @@
*/
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
- @DeleteMapping("/deleteDetail/{id}")
+ @GetMapping("/deleteDetail/{id}")
public AjaxResult deleteDetail(@PathVariable Long id) {
return AjaxResult.success(serviceReimbursementdetailService.deleteDetail(id));
}
--
Gitblit v1.9.3