代码修改

liusheng

2023-05-06 2b04605163633cbc4c1c801f31211d1ae0ccf0f5

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java

@@ -1,13 +1,13 @@
package com.ruoyi.project.controller;
package com.ruoyi.web.controller.project;

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.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.Reimbursementpayee;
import io.netty.util.internal.ObjectUtil;
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;
@@ -34,17 +34,19 @@

/**
 * 差旅报销付款信息Controller
 * 
 *
 * @author ruoyi
 * @date 2023-04-20
 */
@Api("差旅报销付款信息")
@RestController
@RequestMapping("/project/reimbursementpayee")
public class ServiceReimbursementpayeeController extends BaseController
{
public class ServiceReimbursementpayeeController extends BaseController {
    @Autowired
    private IServiceReimbursementpayeeService serviceReimbursementpayeeService;

    @Autowired
    private IServiceReimbursementpayeeSharedService serviceReimbursementpayeeSharedService;

    /**
     * 查询差旅报销付款信息列表
@@ -52,13 +54,12 @@
    @ApiOperation("查询差旅报销付款信息列表")
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceReimbursementpayee serviceReimbursementpayee)
    {
    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();
        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());
@@ -79,8 +80,7 @@
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:export')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee)
    {
    public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee) {
        List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
        ExcelUtil<ServiceReimbursementpayee> util = new ExcelUtil<ServiceReimbursementpayee>(ServiceReimbursementpayee.class);
        return util.exportExcel(list, "差旅报销付款信息数据");
@@ -92,42 +92,47 @@
    @ApiOperation("获取差旅报销付款信息详细信息")
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceReimbursementpayeeService.getById(id));
    }

    /**
     * 新增差旅报销付款信息
     * 新增或修改差旅报销付款信息
     */
    @ApiOperation("新增差旅报销付款信息")
    @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);
            }
    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;
        if(!CollectionUtils.isEmpty(addserviceReimbursementpayees)){
            b = serviceReimbursementpayeeService.saveBatch(addserviceReimbursementpayees);
        }else {
            b = serviceReimbursementpayeeService.updateBatchById(updateserviceReimbursementpayees);
        }
        b = serviceReimbursementpayeeService.saveOrUpdateBatch(payees);
        b = serviceReimbursementpayeeSharedService.saveOrUpdateBatch(payeeSareds);

        return toAjax(b);
    }

@@ -139,8 +144,7 @@
    @Log(title = "差旅报销付款信息", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee)
    {
    public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
        return toAjax(serviceReimbursementpayeeService.save(serviceReimbursementpayee));
    }

@@ -151,9 +155,8 @@
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
        return toAjax(serviceReimbursementpayeeService.updateById(serviceReimbursementpayee));
    }

@@ -164,8 +167,7 @@
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceReimbursementpayeeService.removeByIds(Arrays.asList(ids)));
    }
}