2024年5月15日15:02:48

ruoyi-anpin/src/main/java/com/ruoyi/anpin/domain/CostManagementDetailExcel.java

@@ -39,6 +39,9 @@ public class CostManagementDetailExcel {
     @Excel(name = "报销方式", dictType = "reimbursement_method")
     private String expenseType;
 
+    @Excel(name = "报销人")
+    private String reimburser;
+
 //    @Excel(name = "备注")
 //    private String remark;
 

ruoyi-anpin/src/main/java/com/ruoyi/anpin/domain/CostManagementExcel.java

@@ -39,6 +39,12 @@ public class CostManagementExcel {
     @Excel(name = "报销方式", dictType = "reimbursement_method")
     private String expenseType;
 
+    /**
+     * 报销人
+     */
+    @Excel(name = "报销人")
+    private String reimburser;
+
     @Excel(name = "备注")
     private String remark;
 

ruoyi-anpin/src/main/resources/mapper/anpin/TCostManagementMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.anpin.mapper.TCostManagementMapper">
-    
+
     <resultMap type="TCostManagement" id="TCostManagementResult">
         <result property="fId"    column="f_id"    />
         <result property="fNo"    column="f_no"    />
@@ -32,12 +32,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fReviewDate"    column="f_review_date"    />
         <result property="printTime"    column="print_time"    />
         <result property="printDate"    column="print_date"    />
+        <result property="reimburser"    column="reimburser"    />
+        <result property="invoiceNo"    column="invoice_no"    />
     </resultMap>
 
     <sql id="selectTCostManagementVo">
         select f_id, f_no, create_by, create_time, update_by, update_time, remark, del_flag, f_status, dept_id, dept_name,
                create_dept, create_dept_name, business_time, business_type, expense_type, total_amount, create_by_id, account, opening_bank, opening_bank_account,
-               f_billstatus, applicant_id, applicant_name, f_review_date
+               f_billstatus, applicant_id, applicant_name, f_review_date,reimburser,invoice_no
         from t_cost_management
     </sql>
 
@@ -88,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             TCM.applicant_id,
             TCM.applicant_name,
             TCM.f_review_date,
+            TCM.invoice_no,
+            TCM.reimburser,
             CASE
             when TCM.business_type = '0' THEN '费用'
             when TCM.business_type = '1' THEN '工资'
@@ -126,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by TCM.create_time desc
     </select>
-    
+
     <select id="selectTCostManagementById" parameterType="Long" resultMap="TCostManagementResult">
         select TCM.f_id, TCM.f_no, TCM.create_by, TCM.create_time, TCM.update_by, TCM.update_time, TCM.remark, TCM.del_flag, TCM.f_status, TCM.dept_id, TCM.dept_name,
         TCM.create_dept, TCM.create_dept_name, TCM.business_time, TCM.business_type, TCM.expense_type, TCM.total_amount,
@@ -134,6 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         TCM.applicant_name,TCM.f_review_date,
         TCM.print_time,
         TCM.print_date,
+        TCM.invoice_no,
+        TCM.reimburser,
         CASE
             WHEN TCM.f_status = '0' THEN '录入'
             WHEN TCM.f_status = '1' THEN '请核'
@@ -150,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and f_id = #{fId}
         </where>
     </select>
-        
+
     <insert id="insertTCostManagement" parameterType="TCostManagement" useGeneratedKeys="true" keyProperty="fId">
         insert into t_cost_management
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -178,6 +184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applicantId != null">applicant_id,</if>
             <if test="applicantName != null">applicant_name,</if>
             <if test="fReviewDate != null">f_review_date,</if>
+            <if test="invoiceNo != null">invoice_no,</if>
+            <if test="reimburser != null">reimburser,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fNo != null">#{fNo},</if>
@@ -204,6 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applicantId != null">#{applicantId},</if>
             <if test="applicantName != null">#{applicantName},</if>
             <if test="fReviewDate != null">#{fReviewDate},</if>
+            <if test="invoiceNo != null">#{invoiceNo},</if>
+            <if test="reimburser != null">#{reimburser},</if>
          </trim>
     </insert>
 
@@ -233,6 +243,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applicantId != null">applicant_id = #{applicantId},</if>
             <if test="applicantName != null">applicant_name = #{applicantName},</if>
             <if test="fReviewDate != null">f_review_date = #{fReviewDate},</if>
+            <if test="invoiceNo != null">invoice_no = #{invoiceNo},</if>
+            <if test="reimburser != null">reimburser = #{reimburser},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1711,7 +1723,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         TCMI.personnel_name AS personnelName,
         TCMI.department_name AS departmentName,
         TCMI.matter_name AS matterName,
-        TCMI.remark AS remarkDetail
+        TCMI.remark AS remarkDetail,
+        TCMI.reimburser AS reimburser
         FROM
         t_cost_management TCM
         LEFT JOIN t_cost_management_item TCMI ON TCMI.f_pid = TCM.f_id
@@ -1775,7 +1788,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         TCM.applicant_name AS applicantName,
         TCM.f_review_date AS fReviewDate,
         TCM.business_type AS businessType,
-        TCM.expense_type AS expenseType
+        TCM.expense_type AS expenseType,
+        TCM.reimburser AS reimburser
         FROM
         t_cost_management TCM
         LEFT JOIN t_cost_management_item TCMI ON TCMI.f_pid = TCM.f_id
@@ -1813,4 +1827,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by TCM.create_time desc
     </select>
 
-</mapper>
+</mapper>