From dc4f8829472baf47345e3a01384d7b5eaf7ee727 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 20 五月 2025 14:49:10 +0800
Subject: [PATCH] 增加专家导出字段
---
expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
index 2ff51f7..fa80caa 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
@@ -36,6 +36,8 @@
<result property="incomeTaxPayable" column="income_tax_payable" />
<result property="taxExpertFee" column="tax_expert_fee" />
<result property="billingInstructions" column="billing_instructions" />
+ <result property="travelExpenses" column="travel_expenses" />
+ <result property="accommodationFee" column="accommodation_fee" />
</resultMap>
<resultMap type="com.gkhy.system.domain.vo.response.ProjectExpertExportInfoRes" id="ProjectExpertExportInfoResult">
@@ -59,6 +61,8 @@
<result property="incomeTaxPayable" column="income_tax_payable" />
<result property="taxExpertFee" column="tax_expert_fee" />
<result property="billingInstructions" column="billing_instructions" />
+ <result property="travelExpenses" column="travel_expenses" />
+ <result property="accommodationFee" column="accommodation_fee" />
</resultMap>
@@ -66,7 +70,7 @@
<sql id="selectProjectExpertVo">
select id, project_id, expert_id, score, evaluation_state, selection_mode, team_leader, del_flag, create_by, create_time, update_by, update_time, professional_ethics, impartial_honest, comprehensive_coordination, professional_ability, expressing_opinions, others, comprehensive_evaluation, major_dangers, general_hazards, content,
- freight_basis, billing_duration, after_tax_amount, open_bank, bank_card,taxable_income,income_tax_payable,tax_expert_fee,billing_instructions from project_expert
+ freight_basis, billing_duration, after_tax_amount, open_bank, bank_card,taxable_income,income_tax_payable,tax_expert_fee,billing_instructions,travel_expenses, accommodation_fee from project_expert
</sql>
<select id="selectProjectExpertList" parameterType="ProjectExpert" resultMap="ProjectExpertResult">
<include refid="selectProjectExpertVo"/>
@@ -133,6 +137,8 @@
<if test="taxableIncome != null">taxable_income,</if>
<if test="incomeTaxPayable != null">income_tax_payable,</if>
<if test="taxExpertFee != null">tax_expert_fee,</if>
+ <if test="travelExpenses != null">travel_expenses,</if>
+ <if test="accommodationFee != null">accommodation_fee,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
@@ -164,6 +170,8 @@
<if test="taxableIncome != null"> #{taxableIncome},</if>
<if test="incomeTaxPayable != null">#{incomeTaxPayable},</if>
<if test="taxExpertFee != null">#{taxExpertFee},</if>
+ <if test="travelExpenses != null">#{travelExpenses},</if>
+ <if test="accommodationFee != null">#{accommodationFee},</if>
</trim>
</insert>
@@ -207,7 +215,8 @@
<if test="incomeTaxPayable != null">income_tax_payable = #{incomeTaxPayable},</if>
<if test="taxExpertFee != null">tax_expert_fee = #{taxExpertFee},</if>
<if test="billingInstructions != null" > billing_instructions = #{billingInstructions},</if>
-
+ <if test="travelExpenses != null">travel_expenses = #{travelExpenses},</if>
+ <if test="accommodationFee != null" > accommodation_fee = #{accommodationFee},</if>
</trim>
where id = #{id}
</update>
@@ -291,7 +300,7 @@
<select id="projectExpertExportList" parameterType="Long" resultMap="ProjectExpertExportInfoResult">
select a.project_name ,a.dept_name,a.project_code
,c.name,c.id_card,c.name,c.job,c.title,c.company_name,b.freight_basis,b.billing_instructions,
- b.billing_duration, b.after_tax_amount, b.open_bank, b.bank_card,b.taxable_income,b.income_tax_payable,b.tax_expert_fee
+ b.billing_duration, b.after_tax_amount, b.open_bank, b.bank_card,b.taxable_income,b.income_tax_payable,b.tax_expert_fee,b.travel_expenses,b.accommodation_fee
from project_management a
left join project_expert b on a.id = b.project_id and b.del_flag = 0
left join sys_expert_info c on b.expert_id = c.id
--
Gitblit v1.9.2