From 686bd303ddc68db338fe352c38392194217168a5 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 11 三月 2025 15:27:59 +0800
Subject: [PATCH] 修改业务逻辑增加项目编码
---
expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
index 5fa846f..8d44d68 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
@@ -32,11 +32,16 @@
<result property="afterTaxAmount" column="after_tax_amount" />
<result property="openBank" column="open_bank" />
<result property="bankCard" column="bank_card" />
+ <result property="taxableIncome" column="taxable_income" />
+ <result property="incomeTaxPayable" column="income_tax_payable" />
+ <result property="taxExpertFee" column="tax_expert_fee" />
+ <result property="billingInstructions" column="billing_instructions" />
</resultMap>
<resultMap type="com.gkhy.system.domain.vo.response.ProjectExpertExportInfoRes" id="ProjectExpertExportInfoResult">
<result property="projectName" column="project_name" />
<result property="deptName" column="dept_name" />
+ <result property="projectCode" column="project_code" />
<collection property="projectExpertExportResps" javaType="java.util.List" resultMap="ExpertExport" />
</resultMap>
<resultMap id="ExpertExport" type="com.gkhy.system.domain.vo.response.ProjectExpertExportResp">
@@ -50,13 +55,18 @@
<result property="afterTaxAmount" column="after_tax_amount" />
<result property="openBank" column="open_bank" />
<result property="bankCard" column="bank_card" />
+ <result property="taxableIncome" column="taxable_income" />
+ <result property="incomeTaxPayable" column="income_tax_payable" />
+ <result property="taxExpertFee" column="tax_expert_fee" />
+ <result property="billingInstructions" column="billing_instructions" />
+
</resultMap>
<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 from project_expert
+ freight_basis, billing_duration, after_tax_amount, open_bank, bank_card,taxable_income,income_tax_payable,tax_expert_fee,billing_instructions from project_expert
</sql>
<select id="selectProjectExpertList" parameterType="ProjectExpert" resultMap="ProjectExpertResult">
<include refid="selectProjectExpertVo"/>
@@ -120,6 +130,9 @@
<if test="afterTaxAmount != null">after_tax_amount,</if>
<if test="openBank != null">open_bank,</if>
<if test="bankCard != null">bank_card,</if>
+ <if test="taxableIncome != null">taxable_income,</if>
+ <if test="incomeTaxPayable != null">income_tax_payable,</if>
+ <if test="taxExpertFee != null">tax_expert_fee,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
@@ -148,6 +161,9 @@
<if test="afterTaxAmount != null">#{afterTaxAmount},</if>
<if test="openBank != null">#{openBank},</if>
<if test="bankCard != null">#{bankCard},</if>
+ <if test="taxableIncome != null"> #{taxableIncome},</if>
+ <if test="incomeTaxPayable != null">#{incomeTaxPayable},</if>
+ <if test="taxExpertFee != null">#{taxExpertFee},</if>
</trim>
</insert>
@@ -187,6 +203,11 @@
<if test="afterTaxAmount != null">after_tax_amount = #{afterTaxAmount},</if>
<if test="openBank != null">open_bank = #{openBank},</if>
<if test="bankCard != null">bank_card = #{bankCard},</if>
+ <if test="taxableIncome != null">taxable_income = #{taxableIncome},</if>
+ <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>
+
</trim>
where id = #{id}
</update>
@@ -224,9 +245,11 @@
<select id="projectExpertEvaluationList" parameterType="Long" resultType="com.gkhy.system.domain.vo.response.ProjectExpertEvaluationResp">
select b.id ,b.expert_id expertId ,c.name,c.sex,c.id_card idCard,c.domain,c.rating_level ratingLevel,
- b.selection_mode selectionMode,b.team_leader teamLeader,b.score,b.evaluation_state evaluationState
+ b.selection_mode selectionMode,b.team_leader teamLeader,b.score,b.evaluation_state evaluationState,
+ d.classify_name bigClassifyName
from project_expert b
left join sys_expert_info c on b.expert_id = c.id
+ left join sys_expert_classify d on c.big_classify = d.id
where b.del_flag = 0 and b.project_id = #{projectId}
order by b.team_leader asc , b.selection_mode asc, b.create_time desc
</select>
@@ -257,13 +280,14 @@
<if test="endTime != null "><!-- 结束时间检索 -->
and date_format(b.update_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
- order by b.team_leader asc , b.create_time desc
+ order by b.update_time desc
</select>
<select id="projectExpertExportList" parameterType="Long" resultMap="ProjectExpertExportInfoResult">
- select a.project_name ,a.dept_name
- ,c.name,c.id_card,c.name,c.job,c.title,c.company_name,b.freight_basis,b.billing_duration, b.after_tax_amount, b.open_bank, b.bank_card
+ 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
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