From 0028d554cb0dcae4d5250dac3d0f2a1e5d2f2da2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 七月 2023 15:27:57 +0800
Subject: [PATCH] 修改字段
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 100 +++++++++----------------------------------------
1 files changed, 19 insertions(+), 81 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 75f20a3..a42ef85 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.project.controller;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.ruoyi.project.domain.ReimbursementService;
-import com.ruoyi.project.domain.Reimbursementpayee;
-import io.netty.util.internal.ObjectUtil;
-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
@@ -50,33 +35,20 @@
* 鏌ヨ宸梾鎶ラ攢浠樻淇℃伅鍒楄〃
*/
@ApiOperation("鏌ヨ宸梾鎶ラ攢浠樻淇℃伅鍒楄〃")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')")
+ //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')")
@GetMapping("/list")
public TableDataInfo list(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,9 +62,9 @@
* 鑾峰彇宸梾鎶ラ攢浠樻淇℃伅璇︾粏淇℃伅
*/
@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));
}
@@ -101,41 +73,7 @@
* 鏂板宸梾鎶ラ攢浠樻淇℃伅
*/
@ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
- @PostMapping("/addOrUpdateRBpayee")
- public AjaxResult addOrUpdateRBpayee(@RequestBody List<Reimbursementpayee> reimbursementPayees)
- {
- List<ServiceReimbursementpayee> addserviceReimbursementpayees=new ArrayList<>();
- List<ServiceReimbursementpayee> updateserviceReimbursementpayees=new ArrayList<>();
- for (Reimbursementpayee reimbursementPayee:reimbursementPayees) {
- ServiceReimbursementpayee serviceReimbursementpayee=new ServiceReimbursementpayee();
- serviceReimbursementpayee.setRbid(reimbursementPayee.getRbid());
- serviceReimbursementpayee.setPersonname(reimbursementPayee.getCol_personname());
- serviceReimbursementpayee.setPersontype(reimbursementPayee.getCol_personType());
- serviceReimbursementpayee.setBankname(reimbursementPayee.getCol_bank());
- serviceReimbursementpayee.setBankcardno(reimbursementPayee.getCol_accounts());
- serviceReimbursementpayee.setPaiddate(reimbursementPayee.getCol_date());
- serviceReimbursementpayee.setRemark(reimbursementPayee.getCol_illustrate());
- serviceReimbursementpayee.setId(reimbursementPayee.getId());
- if(ObjectUtils.isEmpty(reimbursementPayee.getId())){
- addserviceReimbursementpayees.add(serviceReimbursementpayee);
- }else {
- updateserviceReimbursementpayees.add(serviceReimbursementpayee);
- }
- }
- boolean b = false;
- if(!CollectionUtils.isEmpty(addserviceReimbursementpayees)){
- b = serviceReimbursementpayeeService.saveBatch(addserviceReimbursementpayees);
- }else {
- b = serviceReimbursementpayeeService.updateBatchById(updateserviceReimbursementpayees);
- }
- return toAjax(b);
- }
-
- /**
- * 鏂板宸梾鎶ラ攢浠樻淇℃伅
- */
- @ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
+ //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
@@ -148,7 +86,7 @@
* 淇敼宸梾鎶ラ攢浠樻淇℃伅
*/
@ApiOperation("淇敼宸梾鎶ラ攢浠樻淇℃伅")
- @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')")
+ //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
@RepeatSubmit
@@ -161,10 +99,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)
+ public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(serviceReimbursementpayeeService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.3