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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 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 a8dd91f..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) {
@@ -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()]);
@@ -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,23 +97,28 @@
* 鏂板鎶ラ攢鐢宠鏄庣粏
*/
@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);
+ //灏嗗墠绔紶鏉ョ殑闄勪欢闆嗗悎杞垚瀛楃涓�
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
}
- return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
+ serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
+ }
+ 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) {
@@ -128,15 +133,44 @@
* 淇敼鎶ラ攢鐢宠鏄庣粏
*/
@ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@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));
}
@@ -145,9 +179,9 @@
* 鍒犻櫎鎶ラ攢鐢宠鏄庣粏
*/
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:remove')")
+ //// @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 +192,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