yxh

yxh

2023-05-11 1c6d2cc4867b730a055164b75dd1ff43eeb049b0

yxh

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

@@ -1,15 +1,16 @@
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.fasterxml.jackson.annotation.JsonFormat;
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;

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

/**
 * 报销申请明细对象 service_reimbursementdetail
@@ -70,6 +71,11 @@
    @ApiModelProperty("交通工具")
    @Excel(name = "交通工具")
    private String traffictype;
    /** 交通工具 */
    @ApiModelProperty("交通工具")
    @Excel(name = "交通工具")
    private String traffictype2;


    /** 市内交通费 */
    @ApiModelProperty("市内交通费")

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

@@ -91,6 +91,11 @@
    @Excel(name = "交通工具")
    private String traffictype;

    /** 交通工具 */
    @ApiModelProperty("交通工具")
    @Excel(name = "交通工具")
    private String traffictype2;

    /** 市内交通费 */
    @ApiModelProperty("市内交通费")
    @Excel(name = "市内交通费")

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

@@ -41,7 +41,7 @@
    </resultMap>

    <sql id="selectServiceReimbursementdetailVo">
        select ID, RBID, 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, OrderNo,personname,persontype from service_reimbursementdetail
        select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType,TrafficType2, 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, OrderNo,personname,persontype from service_reimbursementdetail
    </sql>

    <select id="selectServiceReimbursementdetailList" parameterType="ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">