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/ServiceReimbursementpayeeController.java | 122 ++++++++--------------------------------
1 files changed, 26 insertions(+), 96 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
index 21d267d..8b71d1f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -1,42 +1,27 @@
package com.ruoyi.web.controller.project;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
-import com.ruoyi.project.domain.Reimbursementpayee;
-import com.ruoyi.project.domain.ServiceReimbursementpayeeShared;
-import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ObjectUtils;
-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;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceReimbursementpayee;
import com.ruoyi.project.service.IServiceReimbursementpayeeService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 宸梾鎶ラ攢浠樻淇℃伅Controller
*
* @author ruoyi
- * @date 2023-04-20
+ * @date 2023-05-10
*/
@Api("宸梾鎶ラ攢浠樻淇℃伅")
@RestController
@@ -45,39 +30,23 @@
@Autowired
private IServiceReimbursementpayeeService serviceReimbursementpayeeService;
- @Autowired
- private IServiceReimbursementpayeeSharedService serviceReimbursementpayeeSharedService;
-
/**
* 鏌ヨ宸梾鎶ラ攢浠樻淇℃伅鍒楄〃
*/
@ApiOperation("鏌ヨ宸梾鎶ラ攢浠樻淇℃伅鍒楄〃")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceReimbursementpayee serviceReimbursementpayee) {
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')")
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
startPage();
List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
- List<Reimbursementpayee> reimbursementpayees = new ArrayList<>();
- for (int i = 0; i < list.size(); i++) {
- Reimbursementpayee reimbursementpayee = new Reimbursementpayee();
- reimbursementpayee.setCol_personname(list.get(i).getPersonname());
- reimbursementpayee.setCol_personType(list.get(i).getPersontype());
- reimbursementpayee.setCol_accounts(list.get(i).getBankcardno());
- reimbursementpayee.setCol_date(list.get(i).getPaiddate());
- reimbursementpayee.setCol_illustrate(list.get(i).getRemark());
- reimbursementpayee.setId(list.get(i).getId());
- reimbursementpayee.setRbid(list.get(i).getRbid());
- reimbursementpayee.setCol_bank(list.get(i).getBankname());
- reimbursementpayees.add(reimbursementpayee);
- }
- return getDataTable(reimbursementpayees);
+ return getDataTable(list);
}
/**
* 瀵煎嚭宸梾鎶ラ攢浠樻淇℃伅鍒楄〃
*/
@ApiOperation("瀵煎嚭宸梾鎶ラ攢浠樻淇℃伅鍒楄〃")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:export')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee) {
@@ -90,71 +59,32 @@
* 鑾峰彇宸梾鎶ラ攢浠樻淇℃伅璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇宸梾鎶ラ攢浠樻淇℃伅璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(serviceReimbursementpayeeService.getById(id));
- }
-
- /**
- * 鏂板鎴栦慨鏀瑰樊鏃呮姤閿�浠樻淇℃伅
- */
- @ApiOperation("鏂板鎴栦慨鏀瑰樊鏃呮姤閿�浠樻淇℃伅")
- @PostMapping("/addOrUpdateRBpayee")
- public AjaxResult addOrUpdateRBpayee(@RequestBody List<Reimbursementpayee> reimbursementPayees) {
- List<ServiceReimbursementpayee> payees = new ArrayList<>();
- List<ServiceReimbursementpayeeShared> payeeSareds = new ArrayList<>();
- for (Reimbursementpayee reimbursementPayee : reimbursementPayees) {
- //灏佽鏀粯鏁版嵁
- ServiceReimbursementpayee payee = new ServiceReimbursementpayee();
- payee.setRbid(reimbursementPayee.getRbid());
- payee.setPersonname(reimbursementPayee.getCol_personname());
- payee.setPersontype(reimbursementPayee.getCol_personType());
- payee.setBankname(reimbursementPayee.getCol_bank());
- payee.setBankcardno(reimbursementPayee.getCol_accounts());
- payee.setPaiddate(reimbursementPayee.getCol_date());
- payee.setRemark(reimbursementPayee.getCol_illustrate());
- payee.setId(reimbursementPayee.getId());
- //灏佽鏀粯鍒嗕韩鏁版嵁
- ServiceReimbursementpayeeShared payeeShared = new ServiceReimbursementpayeeShared();
- payeeShared.setRbid(reimbursementPayee.getRbid());
- payeeShared.setPersonname(reimbursementPayee.getCol_personname());
- payeeShared.setPersontype(reimbursementPayee.getCol_personType());
- payeeShared.setBankname(reimbursementPayee.getCol_bank());
- payeeShared.setBankcardno(reimbursementPayee.getCol_accounts());
- payeeShared.setPaiddate(reimbursementPayee.getCol_date());
- payeeShared.setRemark(reimbursementPayee.getCol_illustrate());
- payeeShared.setId(reimbursementPayee.getId());
-
- payees.add(payee);
- payeeSareds.add(payeeShared);
- }
- boolean b = false;
- b = serviceReimbursementpayeeService.saveOrUpdateBatch(payees);
- b = serviceReimbursementpayeeSharedService.saveOrUpdateBatch(payeeSareds);
-
- return toAjax(b);
}
/**
* 鏂板宸梾鎶ラ攢浠樻淇℃伅
*/
@ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
- return toAjax(serviceReimbursementpayeeService.save(serviceReimbursementpayee));
+ boolean save = serviceReimbursementpayeeService.save(serviceReimbursementpayee);
+ return AjaxResult.success(serviceReimbursementpayee);
}
/**
* 淇敼宸梾鎶ラ攢浠樻淇℃伅
*/
@ApiOperation("淇敼宸梾鎶ラ攢浠樻淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/reimbursementpayeeEdit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
return toAjax(serviceReimbursementpayeeService.updateById(serviceReimbursementpayee));
@@ -164,10 +94,10 @@
* 鍒犻櫎宸梾鎶ラ攢浠樻淇℃伅
*/
@ApiOperation("鍒犻櫎宸梾鎶ラ攢浠樻淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(serviceReimbursementpayeeService.removeByIds(Arrays.asList(ids)));
}
}
--
Gitblit v1.9.3