代码提交

liusheng

2023-10-13 22655ad10d386f0fc3c38389f519d3d188b46f19

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -72,10 +72,6 @@
    @PostMapping("/common/upload")
    public AjaxResult uploadFile(MultipartFile file) throws Exception {

        int tomcatPort1 = getTomcatPort();
        log.info("tomcatPort1的值为： {}", tomcatPort1);
        //这个省人民是8099，所以直接写死
        int tomcatPort = 8099;
        try {
            // 上传文件路径
            String filePath = RuoYiConfig.getUploadPath();

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

@@ -128,6 +128,7 @@
        Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
        Integer pageNum = spFinancialExpensesIn.getPageNum();
        Integer pageSize = spFinancialExpensesIn.getPageSize();
        Integer checkstatus = spFinancialExpensesIn.getCheckstatus();

        if (pageNum == null) {
            pageNum = 1;
@@ -150,7 +151,7 @@
        }

        //startPage();
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus);
        //通过捐献者过滤
        if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
            list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());

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

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

import java.io.*;
import java.util.*;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
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.ServiceFunddetail;
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.common.utils.poi.ExcelUtil;
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.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.service.IServiceFunddetailService;
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

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

@@ -135,6 +135,7 @@
        String APPLICATIONENDTIME = spFinancialExpensesIn.getAPPLICATIONENDTIME();
        Integer CHECKFLAG = spFinancialExpensesIn.getCHECKFLAG();
        Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
        Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
        Integer pageNum = spFinancialExpensesIn.getPageNum();
        Integer pageSize = spFinancialExpensesIn.getPageSize();

@@ -158,7 +159,7 @@
            APPLICATIONENDTIME = "";
        }
        //startPage();
        List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus);
        //根据经办人筛选
        if (StringUtils.isNotBlank(spFinancialExpensesIn.getUsername())) {
            list = list.stream().filter(reimbursementOut -> reimbursementOut.getUsername().contains(spFinancialExpensesIn.getUsername())).collect(Collectors.toList()); // 按name字段过滤

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

@@ -103,9 +103,13 @@
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
        ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
        //将前端传来的附件集合转成字符串
        if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
            serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
        }
        if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
            serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
        }
        return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
    }


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

@@ -329,8 +329,8 @@
    /**
     * 预审状态：1、待预审；2、预算通过，等待纸质报销材料；3、收到纸质报销材料
     */
    @ApiModelProperty("预审状态：1、待预审；2、预算通过，等待纸质报销材料；3、收到纸质报销材料")
    @Excel(name = "预审状态：1、待预审；2、预算通过，等待纸质报销材料；3、收到纸质报销材料")
    @ApiModelProperty("预审状态：1、待审查；2、审核通过等待材料；3、已收到材料")
    @Excel(name = "预审状态：1、待审查；2、审核通过等待材料；3、已收到材料")
    private Integer checkstatus;

    /**

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

@@ -333,6 +333,12 @@
    @ApiModelProperty("附件文件地址")
    private String annexfiles;

    /**
     * 附件文件地址
     */
    @ApiModelProperty("发票文件地址")
    private String invoiceFiles;


    /**
     * 计算税费时间

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

@@ -116,6 +116,12 @@
    private String annexfiles;

    /**
     * 附件文件地址
     */
    @ApiModelProperty("发票文件地址")
    private String invoiceFiles;

    /**
     * 工作单位
     */
    @ApiModelProperty("工作单位")

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

@@ -339,6 +339,18 @@
    private String annexfiles;

    /**
     * 发票文件地址集合（用于接收前端传来的地址）
     */
    @ApiModelProperty("发票文件地址集合")
    private List invoiceFilesList;

    /**
     * 附件文件地址
     */
    @ApiModelProperty("发票文件地址")
    private String invoiceFiles;

    /**
     * 计算税费时间
     */
    @ApiModelProperty("计算税费时间")

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

@@ -155,6 +155,14 @@
    private String annexfiles;

    /**
     * 发票附件表
     */
    @ApiModelProperty("发票附件表")
    @Excel(name = "发票附件表")
    private String invoicefiles;


    /**
     * 上传标识
     */
    @ApiModelProperty("上传标识")

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

@@ -136,6 +136,11 @@
    @Excel(name = "附件表")
    private String annexfiles;

    /** 附件表 */
    @ApiModelProperty("发票附件表")
    @Excel(name = "发票附件表")
    private String invoicefiles;

    /** 上传标识 */
    @ApiModelProperty("上传标识")
    @Excel(name = "上传标识")

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

@@ -159,6 +159,18 @@
    private List annexfilesList;

    /**
     * 发票集合表
     */
    private List invoicefilesList;

    /**
     * 发票附件表
     */
    @ApiModelProperty("发票附件表")
    @Excel(name = "发票附件表")
    private String invoicefiles;

    /**
     * 上传标识
     */
    @ApiModelProperty("上传标识")

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java

@@ -69,4 +69,9 @@
    @ApiModelProperty("金额")
    private Double money;

    /**
     * 金额
     */
    @ApiModelProperty("金额")
    private Integer checkstatus;
}

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

@@ -34,7 +34,7 @@

    List<FundVO> selectVOList(FundVO fundVO);

    List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE);
    List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS);


}

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

@@ -32,7 +32,7 @@

    List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);

    List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE);
    List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS);

    List<ServiceReimbursement> getInfoByInfoId(Long infoid);


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

@@ -52,7 +52,7 @@

    String returnId(Long id);

    List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE);
    List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS);

    int countItem(Long infoid, Long itemid);


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

@@ -38,7 +38,7 @@

    List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);

    List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE);
    List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS);

    List<ServiceReimbursement> getInfoByInfoId(Long infoid);


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

@@ -659,8 +659,8 @@
    }

    @Override
    public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
        return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
    public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS) {
        return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE,CHECKSTATUS);
    }

    @Override
@@ -696,6 +696,9 @@
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
                serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
            }
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoiceFilesList())) {
                serviceFunddetailVO.setInvoiceFiles(JSON.toJSONString(serviceFunddetailVO.getInvoiceFilesList()));
            }
            ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);

            if (serviceFunddetailVO.getId() == null) {

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

@@ -205,8 +205,8 @@
    }

    @Override
    public List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
        return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
    public List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS) {
        return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE,CHECKSTATUS);
    }

    @Override

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

@@ -245,7 +245,7 @@

    <select id="getListBypower" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
        call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
        call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER})
    </select>



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

@@ -57,6 +57,8 @@
        <result property="subjecttype" column="subjecttype"/>
        <result property="subjecttypename" column="subjecttypename"/>
        <result property="annexfiles" column="AnnexFiles"/>
        <result property="invoiceFiles" column="InvoiceFiles"/>

        <result property="taxTime" column="tax_time"/>
        <result property="jxrq" column="jxrq"/>
        <result property="itemdescribe" column="ItemDescribe"/>
@@ -115,6 +117,7 @@
               subjecttype,
               subjecttypename,
               AnnexFiles,
               InvoiceFiles,
               tax_time,
               jxrq,
               ItemDescribe

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

@@ -30,6 +30,8 @@
        <result property="branchbankname" column="BranchBankName"/>
        <result property="annexbankcard" column="AnnexBankCard"/>
        <result property="annexregistform" column="AnnexRegistForm"/>
        <result property="annexfiles" column="AnnexFiles"/>
        <result property="invoiceFiles" column="InvoiceFiles"/>
        <result property="quantity" column="Quantity"/>
        <result property="price" column="Price"/>
        <result property="amount" column="Amount"/>

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

@@ -158,7 +158,7 @@

    <select id="getListBypower" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut">
        call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
        call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER})
    </select>
    <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceReimbursement">
        <include refid="selectServiceReimbursementVo"/>

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

@@ -22,6 +22,7 @@
        <result property="foodexpenses"    column="FoodExpenses"    />
        <result property="foodallowance"    column="FoodAllowance"    />
        <result property="annexfiles"    column="AnnexFiles"    />
        <result property="invoicefiles"    column="InvoiceFiles"    />
        <result property="remark"    column="remark"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />

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

@@ -1,87 +1,134 @@
<?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">
        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="com.ruoyi.project.domain.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="del_flag"    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"    />

    <resultMap type="com.ruoyi.project.domain.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="invoicefiles" column="InvoiceFiles"/>
        <result property="remark" column="Remark"/>
        <result property="del_flag" 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"/>
    </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 from service_reimbursementdetail_shared
        select ID,
               RBID,
               persontype,
               personname,
               OrderNo,
               StartTime,
               Departure,
               EndTime,
               Destination,
               Days,
               TrafficExpense,
               TrafficType,
               CityFee,
               HotelExpense,
               InvoiceCount,
               AttachCount,
               OtherExpense,
               FoodExpenses,
               FoodAllowance,
               AnnexFiles,
               invoicefiles,
               Remark,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               upload_flag,
               upload_time,
               travelprovince,
               travelprovincename,
               travelcity,
               travelcityname,
               traveltown,
               traveltownname,
               otherfeeamount,
               otherfeedesc
        from service_reimbursementdetail_shared
    </sql>

    <select id="selectServiceReimbursementdetailSharedList" parameterType="com.ruoyi.project.domain.ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
    <select id="selectServiceReimbursementdetailSharedList"
            parameterType="com.ruoyi.project.domain.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>
            <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>