yxh

yxh

2023-04-22 532ce3e0c3c899699ce67b70f1a60bf434d6a32d

yxh

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

@@ -283,11 +283,10 @@
        remShare.setDonorbank(serviceReimbursement.getDonorbank());
        remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
        remShare.setDonorremark(serviceReimbursement.getDonorremark());
        remShare.setDonorpayee(serviceReimbursement.getDonorpayee());

        //nTemp = serviceReimbursement.getDonoramount();
        //if(nTemp == null) nTemp = 0.0;
        remShare.setDonoramount(serviceReimbursement.getDonoramount());
        nTemp = serviceReimbursement.getDonoramount();
        if(nTemp == null) nTemp = 0.0;
        remShare.setDonoramount(nTemp);
        remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
        //remShare.setOaid(serviceReimbursement.getOaid());
        //remShare.setDonorno(serviceReimbursement.getDonorno());

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,116 @@
package com.ruoyi.project.controller;

import java.util.Arrays;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
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.enums.BusinessType;
import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * æŠ¥é”€ç”³è¯·æ˜Žç»†Controller
 * 
 * @author ruoyi
 * @date 2023-04-20
 */
@Api("报销申请明细")
@RestController
@RequestMapping("/project/reimbursementdetailshared")
public class ServiceReimbursementdetailSharedController extends BaseController
{
    @Autowired
    private IServiceReimbursementdetailSharedService serviceReimbursementdetailSharedService;

    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·æ˜Žç»†åˆ—表
     */
    @ApiOperation("查询报销申请明细列表")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceReimbursementdetailShared serviceReimbursementdetailShared)
    {
        startPage();
        List<ServiceReimbursementdetailShared> list = serviceReimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæŠ¥é”€ç”³è¯·æ˜Žç»†åˆ—表
     */
    @ApiOperation("导出报销申请明细列表")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:export')")
    @Log(title = "报销申请明细", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceReimbursementdetailShared serviceReimbursementdetailShared)
    {
        List<ServiceReimbursementdetailShared> list = serviceReimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
        ExcelUtil<ServiceReimbursementdetailShared> util = new ExcelUtil<ServiceReimbursementdetailShared>(ServiceReimbursementdetailShared.class);
        return util.exportExcel(list, "报销申请明细数据");
    }

    /**
     * èŽ·å–报销申请明细详细信息
     */
    @ApiOperation("获取报销申请明细详细信息")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return AjaxResult.success(serviceReimbursementdetailSharedService.getById(id));
    }

    /**
     * æ–°å¢žæŠ¥é”€ç”³è¯·æ˜Žç»†
     */
    @ApiOperation("新增报销申请明细")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:add')")
    @Log(title = "报销申请明细", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
    {
        return toAjax(serviceReimbursementdetailSharedService.save(serviceReimbursementdetailShared));
    }

    /**
     * ä¿®æ”¹æŠ¥é”€ç”³è¯·æ˜Žç»†
     */
    @ApiOperation("修改报销申请明细")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:edit')")
    @Log(title = "报销申请明细", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
    {
        return toAjax(serviceReimbursementdetailSharedService.updateById(serviceReimbursementdetailShared));
    }

    /**
     * åˆ é™¤æŠ¥é”€ç”³è¯·æ˜Žç»†
     */
    @ApiOperation("删除报销申请明细")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:remove')")
    @Log(title = "报销申请明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceReimbursementdetailSharedService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/resources/application.yml

@@ -10,9 +10,9 @@
  demoEnabled: true
  # æ–‡ä»¶è·¯å¾„ ç¤ºä¾‹ï¼ˆ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  #开发环境
  #profile: D:/YYJQ/OPO/WEB/Upload
  profile: D:/YYJQ/OPO/WEB/Upload
  #医院环境
  profile: E:/YYJQ/OPO/WEB/Upload
  #profile: E:/YYJQ/OPO/WEB/Upload
  # èŽ·å–ip地址开关
  addressEnabled: false
  # éªŒè¯ç ç±»åž‹ math æ•°ç»„计算 char å­—符验证
@@ -69,14 +69,14 @@
  # redis é…ç½®
  redis:
    # åœ°å€ã€å¯†ç ã€ç«¯å£ï¼ˆé»˜è®¤ä¸º6379）：医院环境
    host: 129.88.242.37
    password: jqserver
    port: 6379
    #host: 129.88.242.37
    #password: jqserver
    #port: 6379

    # åœ°å€ã€å¯†ç ã€ç«¯å£ï¼ˆé»˜è®¤ä¸º6379）：开发环境
    #host: 116.62.18.175
    #password: Smartor
    #port: 6020
    host: 116.62.18.175
    password: Smartor
    port: 6020

    # æ•°æ®åº“索引
    database: 0

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java

@@ -9,7 +9,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -221,12 +220,10 @@
    private String donorremark;

    @ApiModelProperty("捐献家属费用金额")
    private BigDecimal donoramount;
    private Double donoramount;

    @ApiModelProperty("捐献家属人数")
    private Integer donorrelatives;
    @ApiModelProperty("捐献家属收款人")
    private String donorpayee;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java

@@ -257,13 +257,10 @@
    private String donorremark;

    @ApiModelProperty("捐献家属费用金额")
    private BigDecimal donoramount;
    private Double donoramount;

    @ApiModelProperty("捐献家属人数")
    private Integer donorrelatives;

    @ApiModelProperty("捐献家属收款人")
    private String donorpayee;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
package com.ruoyi.project.domain;

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æŠ¥é”€ç”³è¯·æ˜Žç»†å¯¹è±¡ service_reimbursementdetail_shared
 * 
 * @author ruoyi
 * @date 2023-04-20
 */
@Data
@ApiModel("报销申请明细")
public class ServiceReimbursementdetailShared extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** ä¸»é”®ID */
    @ApiModelProperty("主键ID")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** èµ„金申请主表ID */
    @ApiModelProperty("资金申请主表ID")
    @Excel(name = "资金申请主表ID")
    private Long rbid;

    /** äººå‘˜ç±»åˆ« */
    @ApiModelProperty("人员类别")
    @Excel(name = "人员类别")
    private String persontype;

    /** äººå‘˜å§“名 */
    @ApiModelProperty("人员姓名")
    @Excel(name = "人员姓名")
    private String personname;

    /** é¡ºåºå· */
    @ApiModelProperty("顺序号")
    @Excel(name = "顺序号")
    private Long orderno;

    /** å‡ºå‘时间 */
    @ApiModelProperty("出发时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date starttime;

    /** å‡ºå‘地点 */
    @ApiModelProperty("出发地点")
    @Excel(name = "出发地点")
    private String departure;

    /** åˆ°è¾¾æ—¶é—´ */
    @ApiModelProperty("到达时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date endtime;

    /** åˆ°è¾¾åœ°ç‚¹ */
    @ApiModelProperty("到达地点")
    @Excel(name = "到达地点")
    private String destination;

    /** å¤©æ•° */
    @ApiModelProperty("天数")
    @Excel(name = "天数")
    private Long days;

    /** äº¤é€šè´¹ */
    @ApiModelProperty("交通费")
    @Excel(name = "交通费")
    private BigDecimal trafficexpense;

    /** äº¤é€šå·¥å…· */
    @ApiModelProperty("交通工具")
    @Excel(name = "交通工具")
    private String traffictype;

    /** å¸‚内交通费 */
    @ApiModelProperty("市内交通费")
    @Excel(name = "市内交通费")
    private BigDecimal cityfee;

    /** ä½å®¿è´¹ */
    @ApiModelProperty("住宿费")
    @Excel(name = "住宿费")
    private BigDecimal hotelexpense;

    /** å‘票张数 */
    @ApiModelProperty("发票张数")
    @Excel(name = "发票张数")
    private Long invoicecount;

    /** é™„件张数 */
    @ApiModelProperty("附件张数")
    @Excel(name = "附件张数")
    private Long attachcount;

    /** æ‚è´¹ */
    @ApiModelProperty("杂费")
    @Excel(name = "杂费")
    private BigDecimal otherexpense;

    /** ä¼™é£Ÿè´¹ */
    @ApiModelProperty("伙食费")
    @Excel(name = "伙食费")
    private BigDecimal foodexpenses;

    /** ä¼™é£Ÿè´¹è¡¥åŠ© */
    @ApiModelProperty("伙食费补助")
    @Excel(name = "伙食费补助")
    private BigDecimal foodallowance;

    /** é™„件表 */
    @ApiModelProperty("附件表")
    @Excel(name = "附件表")
    private String annexfiles;

    /** ä¸Šä¼ æ ‡è¯† */
    @ApiModelProperty("上传标识")
    @Excel(name = "上传标识")
    private String uploadFlag;

    /** ä¸Šä¼ æ—¶é—´ */
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date uploadTime;

    /** ç›®çš„地省份 */
    @ApiModelProperty("目的地省份")
    @Excel(name = "目的地省份")
    private String travelprovince;

    /** ç›®çš„地省份名称 */
    @ApiModelProperty("目的地省份名称")
    @Excel(name = "目的地省份名称")
    private String travelprovincename;

    /** ç›®çš„地地市 */
    @ApiModelProperty("目的地地市")
    @Excel(name = "目的地地市")
    private String travelcity;

    /** ç›®çš„地地市名称 */
    @ApiModelProperty("目的地地市名称")
    @Excel(name = "目的地地市名称")
    private String travelcityname;

    /** ç›®çš„地区县 */
    @ApiModelProperty("目的地区县")
    @Excel(name = "目的地区县")
    private String traveltown;

    /** ç›®çš„地区县名称 */
    @ApiModelProperty("目的地区县名称")
    @Excel(name = "目的地区县名称")
    private String traveltownname;

    /** å…¶ä»–费用金额 */
    @ApiModelProperty("其他费用金额")
    @Excel(name = "其他费用金额")
    private BigDecimal otherfeeamount;

    /** å…¶ä»–费用说明 */
    @ApiModelProperty("其他费用说明")
    @Excel(name = "其他费用说明")
    private String otherfeedesc;

    /** é‡‘额-接口 */
    @ApiModelProperty("金额-接口")
    @Excel(name = "金额-接口")
    private String jine;

    /** ç†ç”±-接口 */
    @ApiModelProperty("理由-接口")
    @Excel(name = "理由-接口")
    private String liyou;

}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailSharedMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.project.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import com.ruoyi.project.domain.ServiceReimbursementdetailShared;

/**
 * æŠ¥é”€ç”³è¯·æ˜Žç»†Mapper接口
 * 
 * @author ruoyi
 * @date 2023-04-20
 */
public interface ServiceReimbursementdetailSharedMapper extends BaseMapper<ServiceReimbursementdetailShared>
{
    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·æ˜Žç»†åˆ—表
     *
     * @param serviceReimbursementdetailShared æŠ¥é”€ç”³è¯·æ˜Žç»†
     * @return æŠ¥é”€ç”³è¯·æ˜Žç»†é›†åˆ
     */
    public List<ServiceReimbursementdetailShared> selectServiceReimbursementdetailSharedList(ServiceReimbursementdetailShared serviceReimbursementdetailShared);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementdetailSharedService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.project.service;

import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceReimbursementdetailShared;

/**
 * æŠ¥é”€ç”³è¯·æ˜Žç»†Service接口
 * 
 * @author ruoyi
 * @date 2023-04-20
 */
public interface IServiceReimbursementdetailSharedService extends IService<ServiceReimbursementdetailShared>
{

    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·æ˜Žç»†åˆ—表
     * 
     * @param serviceReimbursementdetailShared æŠ¥é”€ç”³è¯·æ˜Žç»†
     * @return æŠ¥é”€ç”³è¯·æ˜Žç»†é›†åˆ
     */
    public List<ServiceReimbursementdetailShared> queryList(ServiceReimbursementdetailShared serviceReimbursementdetailShared);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
package com.ruoyi.project.service.impl;

import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.ArrayList;
import java.util.Map;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceReimbursementdetailSharedMapper;
import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;

/**
 * æŠ¥é”€ç”³è¯·æ˜Žç»†Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-04-20
 */
@Service
public class ServiceReimbursementdetailSharedServiceImpl extends ServiceImpl<ServiceReimbursementdetailSharedMapper, ServiceReimbursementdetailShared> implements IServiceReimbursementdetailSharedService 
{


    /**
     * æŸ¥è¯¢æŠ¥é”€ç”³è¯·æ˜Žç»†åˆ—表
     * 
     * @param serviceReimbursementdetailShared æŠ¥é”€ç”³è¯·æ˜Žç»†
     * @return æŠ¥é”€ç”³è¯·æ˜Žç»†
     */
    @Override
    public List<ServiceReimbursementdetailShared> queryList(ServiceReimbursementdetailShared serviceReimbursementdetailShared) {
        LambdaQueryWrapper<ServiceReimbursementdetailShared> wrappers = Wrappers.lambdaQuery();
        if (serviceReimbursementdetailShared.getRbid() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getRbid ,serviceReimbursementdetailShared.getRbid());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getPersontype())){
            wrappers.eq(ServiceReimbursementdetailShared::getPersontype ,serviceReimbursementdetailShared.getPersontype());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getPersonname())){
            wrappers.like(ServiceReimbursementdetailShared::getPersonname ,serviceReimbursementdetailShared.getPersonname());
        }
        if (serviceReimbursementdetailShared.getOrderno() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getOrderno ,serviceReimbursementdetailShared.getOrderno());
        }
        if (serviceReimbursementdetailShared.getStarttime() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getStarttime ,serviceReimbursementdetailShared.getStarttime());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getDeparture())){
            wrappers.eq(ServiceReimbursementdetailShared::getDeparture ,serviceReimbursementdetailShared.getDeparture());
        }
        if (serviceReimbursementdetailShared.getEndtime() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getEndtime ,serviceReimbursementdetailShared.getEndtime());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getDestination())){
            wrappers.eq(ServiceReimbursementdetailShared::getDestination ,serviceReimbursementdetailShared.getDestination());
        }
        if (serviceReimbursementdetailShared.getDays() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getDays ,serviceReimbursementdetailShared.getDays());
        }
        if (serviceReimbursementdetailShared.getTrafficexpense() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getTrafficexpense ,serviceReimbursementdetailShared.getTrafficexpense());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTraffictype())){
            wrappers.eq(ServiceReimbursementdetailShared::getTraffictype ,serviceReimbursementdetailShared.getTraffictype());
        }
        if (serviceReimbursementdetailShared.getCityfee() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getCityfee ,serviceReimbursementdetailShared.getCityfee());
        }
        if (serviceReimbursementdetailShared.getHotelexpense() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getHotelexpense ,serviceReimbursementdetailShared.getHotelexpense());
        }
        if (serviceReimbursementdetailShared.getInvoicecount() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getInvoicecount ,serviceReimbursementdetailShared.getInvoicecount());
        }
        if (serviceReimbursementdetailShared.getAttachcount() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getAttachcount ,serviceReimbursementdetailShared.getAttachcount());
        }
        if (serviceReimbursementdetailShared.getOtherexpense() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getOtherexpense ,serviceReimbursementdetailShared.getOtherexpense());
        }
        if (serviceReimbursementdetailShared.getFoodexpenses() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getFoodexpenses ,serviceReimbursementdetailShared.getFoodexpenses());
        }
        if (serviceReimbursementdetailShared.getFoodallowance() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getFoodallowance ,serviceReimbursementdetailShared.getFoodallowance());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getAnnexfiles())){
            wrappers.eq(ServiceReimbursementdetailShared::getAnnexfiles ,serviceReimbursementdetailShared.getAnnexfiles());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getRemark())){
            wrappers.eq(ServiceReimbursementdetailShared::getRemark ,serviceReimbursementdetailShared.getRemark());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getUploadFlag())){
            wrappers.eq(ServiceReimbursementdetailShared::getUploadFlag ,serviceReimbursementdetailShared.getUploadFlag());
        }
        if (serviceReimbursementdetailShared.getUploadTime() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getUploadTime ,serviceReimbursementdetailShared.getUploadTime());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelprovince())){
            wrappers.eq(ServiceReimbursementdetailShared::getTravelprovince ,serviceReimbursementdetailShared.getTravelprovince());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelprovincename())){
            wrappers.like(ServiceReimbursementdetailShared::getTravelprovincename ,serviceReimbursementdetailShared.getTravelprovincename());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelcity())){
            wrappers.eq(ServiceReimbursementdetailShared::getTravelcity ,serviceReimbursementdetailShared.getTravelcity());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelcityname())){
            wrappers.like(ServiceReimbursementdetailShared::getTravelcityname ,serviceReimbursementdetailShared.getTravelcityname());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTraveltown())){
            wrappers.eq(ServiceReimbursementdetailShared::getTraveltown ,serviceReimbursementdetailShared.getTraveltown());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTraveltownname())){
            wrappers.like(ServiceReimbursementdetailShared::getTraveltownname ,serviceReimbursementdetailShared.getTraveltownname());
        }
        if (serviceReimbursementdetailShared.getOtherfeeamount() != null){
            wrappers.eq(ServiceReimbursementdetailShared::getOtherfeeamount ,serviceReimbursementdetailShared.getOtherfeeamount());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getOtherfeedesc())){
            wrappers.eq(ServiceReimbursementdetailShared::getOtherfeedesc ,serviceReimbursementdetailShared.getOtherfeedesc());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getJine())){
            wrappers.eq(ServiceReimbursementdetailShared::getJine ,serviceReimbursementdetailShared.getJine());
        }
        if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getLiyou())){
            wrappers.eq(ServiceReimbursementdetailShared::getLiyou ,serviceReimbursementdetailShared.getLiyou());
        }
        return this.list(wrappers);
    }

}

 ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml

@@ -50,7 +50,6 @@
        <result property="costtype"    column="costtype"    />
        <result property="costtypename"    column="costtypename"    />
        <result property="fileurl"    column="fileurl"    />
        <result property="donorpayee"    column="donorpayee"    />
        <result property="donorbank"    column="donorbank"    />
        <result property="donorbankcard"    column="donorbankcard"    />
        <result property="donorremark"    column="donorremark"    />
@@ -59,7 +58,7 @@
    </resultMap>

    <sql id="selectServiceReimbursementVo">
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives,donorpayee from service_reimbursement
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives from service_reimbursement
    </sql>

    <select id="selectServiceReimbursementList" parameterType="ServiceReimbursement" resultMap="ServiceReimbursementResult">

 ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml

@@ -54,7 +54,6 @@
        <result property="filename"    column="filename"    />
        <result property="fileid"    column="fileid"    />
        <result property="reimid"    column="reimid"    />
        <result property="donorpayee"    column="donorpayee"    />
        <result property="donorbank"    column="donorbank"    />
        <result property="donorbankcard"    column="donorbankcard"    />
        <result property="donorremark"    column="donorremark"    />
@@ -63,7 +62,7 @@
    </resultMap>

    <sql id="selectServiceReimbursementSharedVo">
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark,donoramount,donorrelatives,donorpayee from service_reimbursement_shared
        select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark, donoramount,donorrelatives from service_reimbursement_shared
    </sql>

    <select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">

 ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceReimbursementdetailSharedMapper">
    
    <resultMap type="ServiceReimbursementdetailShared" id="ServiceReimbursementdetailSharedResult">
        <result property="id"    column="ID"    />
        <result property="rbid"    column="RBID"    />
        <result property="persontype"    column="persontype"    />
        <result property="personname"    column="personname"    />
        <result property="orderno"    column="OrderNo"    />
        <result property="starttime"    column="StartTime"    />
        <result property="departure"    column="Departure"    />
        <result property="endtime"    column="EndTime"    />
        <result property="destination"    column="Destination"    />
        <result property="days"    column="Days"    />
        <result property="trafficexpense"    column="TrafficExpense"    />
        <result property="traffictype"    column="TrafficType"    />
        <result property="cityfee"    column="CityFee"    />
        <result property="hotelexpense"    column="HotelExpense"    />
        <result property="invoicecount"    column="InvoiceCount"    />
        <result property="attachcount"    column="AttachCount"    />
        <result property="otherexpense"    column="OtherExpense"    />
        <result property="foodexpenses"    column="FoodExpenses"    />
        <result property="foodallowance"    column="FoodAllowance"    />
        <result property="annexfiles"    column="AnnexFiles"    />
        <result property="remark"    column="Remark"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="uploadFlag"    column="upload_flag"    />
        <result property="uploadTime"    column="upload_time"    />
        <result property="travelprovince"    column="travelprovince"    />
        <result property="travelprovincename"    column="travelprovincename"    />
        <result property="travelcity"    column="travelcity"    />
        <result property="travelcityname"    column="travelcityname"    />
        <result property="traveltown"    column="traveltown"    />
        <result property="traveltownname"    column="traveltownname"    />
        <result property="otherfeeamount"    column="otherfeeamount"    />
        <result property="otherfeedesc"    column="otherfeedesc"    />
        <result property="jine"    column="jine"    />
        <result property="liyou"    column="liyou"    />
    </resultMap>

    <sql id="selectServiceReimbursementdetailSharedVo">
        select ID, RBID, persontype, personname, OrderNo, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, Remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, jine, liyou from service_reimbursementdetail_shared
    </sql>

    <select id="selectServiceReimbursementdetailSharedList" parameterType="ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
        <include refid="selectServiceReimbursementdetailSharedVo"/>
        <where>
            <if test="rbid != null "> and RBID = #{rbid}</if>
            <if test="persontype != null  and persontype != ''"> and persontype = #{persontype}</if>
            <if test="personname != null  and personname != ''"> and personname like concat('%', #{personname}, '%')</if>
            <if test="orderno != null "> and OrderNo = #{orderno}</if>
            <if test="starttime != null "> and StartTime = #{starttime}</if>
            <if test="departure != null  and departure != ''"> and Departure = #{departure}</if>
            <if test="endtime != null "> and EndTime = #{endtime}</if>
            <if test="destination != null  and destination != ''"> and Destination = #{destination}</if>
            <if test="days != null "> and Days = #{days}</if>
            <if test="trafficexpense != null "> and TrafficExpense = #{trafficexpense}</if>
            <if test="traffictype != null  and traffictype != ''"> and TrafficType = #{traffictype}</if>
            <if test="cityfee != null "> and CityFee = #{cityfee}</if>
            <if test="hotelexpense != null "> and HotelExpense = #{hotelexpense}</if>
            <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
            <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
            <if test="otherexpense != null "> and OtherExpense = #{otherexpense}</if>
            <if test="foodexpenses != null "> and FoodExpenses = #{foodexpenses}</if>
            <if test="foodallowance != null "> and FoodAllowance = #{foodallowance}</if>
            <if test="annexfiles != null  and annexfiles != ''"> and AnnexFiles = #{annexfiles}</if>
            <if test="remark != null  and remark != ''"> and Remark = #{remark}</if>
            <if test="uploadFlag != null  and uploadFlag != ''"> and upload_flag = #{uploadFlag}</if>
            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
            <if test="travelprovince != null  and travelprovince != ''"> and travelprovince = #{travelprovince}</if>
            <if test="travelprovincename != null  and travelprovincename != ''"> and travelprovincename like concat('%', #{travelprovincename}, '%')</if>
            <if test="travelcity != null  and travelcity != ''"> and travelcity = #{travelcity}</if>
            <if test="travelcityname != null  and travelcityname != ''"> and travelcityname like concat('%', #{travelcityname}, '%')</if>
            <if test="traveltown != null  and traveltown != ''"> and traveltown = #{traveltown}</if>
            <if test="traveltownname != null  and traveltownname != ''"> and traveltownname like concat('%', #{traveltownname}, '%')</if>
            <if test="otherfeeamount != null "> and otherfeeamount = #{otherfeeamount}</if>
            <if test="otherfeedesc != null  and otherfeedesc != ''"> and otherfeedesc = #{otherfeedesc}</if>
            <if test="jine != null  and jine != ''"> and jine = #{jine}</if>
            <if test="liyou != null  and liyou != ''"> and liyou = #{liyou}</if>
        </where>
    </select>

</mapper>