From 0ea6562494682740c8c948658cd3e32769d81c9a Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 27 四月 2023 18:12:16 +0800 Subject: [PATCH] “代码提交” --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 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 9f51e08..75f20a3 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,11 +1,19 @@ 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; @@ -48,7 +56,20 @@ { startPage(); List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee); - return getDataTable(list); + 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); } /** @@ -80,6 +101,40 @@ * 鏂板宸梾鎶ラ攢浠樻淇℃伅 */ @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')") @Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT) @PostMapping -- Gitblit v1.9.3