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/java/com/gkhy/system/domain/vo/response/ProjectExpertExportResp.java | 5 +++++
expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml | 15 ++++++++++++---
expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java | 4 ++++
expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml | 3 ++-
expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java | 4 ++++
expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDataResp.java | 4 ++++
6 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java b/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java
index 6fb0e71..1dd92ae 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java
@@ -150,6 +150,10 @@
private BigDecimal taxExpertFee;
+ @ApiModelProperty(value = "交通费")
+ private BigDecimal travelExpenses;
+ @ApiModelProperty(value = "住宿费")
+ private BigDecimal accommodationFee;
}
\ No newline at end of file
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java
index af3dc62..8d9a413 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectExpertScoreSaveReq.java
@@ -112,7 +112,11 @@
@NotNull(message = "专家费不能为空")
private BigDecimal taxExpertFee;
+ @ApiModelProperty(value = "交通费")
+ private BigDecimal travelExpenses;
+ @ApiModelProperty(value = "住宿费")
+ private BigDecimal accommodationFee;
@Data
static public class Score {
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDataResp.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDataResp.java
index 671de36..94be6ef 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDataResp.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDataResp.java
@@ -26,5 +26,9 @@
private Long majorDangers;
@ApiModelProperty(value = "发现一般隐患")
private Long generalHazards;
+ @ApiModelProperty(value = "交通费")
+ private BigDecimal travelExpenses;
+ @ApiModelProperty(value = "住宿费")
+ private BigDecimal accommodationFee;
}
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertExportResp.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertExportResp.java
index db7a5b6..2c67006 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertExportResp.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertExportResp.java
@@ -59,4 +59,9 @@
@ApiModelProperty(value = "专家费(税前)")
private BigDecimal taxExpertFee;
+ @ApiModelProperty(value = "交通费")
+ private BigDecimal travelExpenses;
+
+ @ApiModelProperty(value = "住宿费")
+ private BigDecimal accommodationFee;
}
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
diff --git a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
index 2eeb029..ea1e776 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
@@ -100,7 +100,8 @@
</select>
<select id="selectProjectData" parameterType="ProjectManagement" resultType="com.gkhy.system.domain.vo.response.ProjectDataResp">
- select a.dept_name deptName,c.name expertName,b.tax_expert_fee expertFee,a.create_time createTime,a.project_name projectName,b.major_dangers majorDangers,b.general_hazards generalHazards
+ select a.dept_name deptName,c.name expertName,b.tax_expert_fee expertFee,a.create_time createTime,a.project_name projectName,
+ b.major_dangers majorDangers,b.general_hazards generalHazards,b.travel_expenses travelExpenses,b.accommodation_fee accommodationFee
from project_management a
left join project_expert b on a.id = b.project_id and b.del_flag = 0 and b.evaluation_state = 1
left join sys_expert_info c on b.expert_id = c.id
--
Gitblit v1.9.2