代码提交

liusheng

2023-09-28 8aaffe80f14469a81d0c1c54a3a60908de66ce37

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

@@ -31,6 +31,7 @@
        <result property="deptmentname" column="DeptmentName"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="president" column="president"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="officedirector" column="OfficeDirector"/>
        <result property="financedirector" column="FinanceDirector"/>
@@ -58,6 +59,9 @@
        <result property="backflowlevel" column="backFlowLevel"/>
        <result property="zffs" column="zffs"/>
        <result property="riqi" column="riqi"/>
        <result property="bh" column="bh"/>
        <result property="checkstatus" column="checkstatus"/>
        <result property="performancetype" column="performancetype"/>
    </resultMap>

    <sql id="selectServiceReimbursementVo">
@@ -87,6 +91,7 @@
               DeptmentName,
               OPOchecker,
               FinVicePresident,
               president,
               BusVicePresident,
               OfficeDirector,
               FinanceDirector,
@@ -111,7 +116,10 @@
               donorrelatives,
               backFlowLevel,
               zffs,
               riqi
               riqi,
               bh,
               checkstatus,
               performancetype
        from service_reimbursement
    </sql>

@@ -163,11 +171,11 @@

    <select id="getRDInfoByItem" resultType="com.ruoyi.project.domain.ServiceReimbursementEo">
        SELECT a.id as id,a.UserNo as userno,a.FlowLevel as recordstatus,b.persontype as persontype,a.create_time as
        createTime,
        createTime,a.managername as managername,a.bh as bh,a.OPOchecker as opochecker,a.FinVicePresident as finvicepresident,a.BusVicePresident as busvicepresident,a.OfficeDirector  as officedirector,a.FinanceDirector  as financedirector,a.FinanceChecher  as financechecher,
        a.UserName as username,b.personname as travelers,a.AmountRequested as amountrequested,a.Reason as reason,a.Phone
        as phone,a.DepositBank as depositbank,a.BankCardNo as bankcardno,a.DonorName as donorname,b.trafficexpense as
        trafficexpense,b.hotelexpense as hotelexpense,b.FoodExpenses as foodexpenses, b.foodallowance as foodallowance,
        b.otherexpense as otherexpense,b.otherfeeamount as otherfeeamount FROM service_reimbursement a LEFT JOIN
        b.otherexpense as otherexpense,b.otherfeeamount as otherfeeamount,b.CityFee as cityfee FROM service_reimbursement a LEFT JOIN
        service_reimbursementdetail b on a.id=b.RBID where a.del_flag != 1 and b.del_flag!=1
        <if test="id != null">
            and a.id = #{id}