From 05600d089901d44e8d5036046025b6a90ceb896a Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Tue, 03 Dec 2024 16:57:20 +0800
Subject: [PATCH] 修改及增加功能
---
expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
index c9195e0..bcbc067 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
@@ -9,9 +9,10 @@
<result property="projectName" column="project_name" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
- <result property="companyName" column="company_name" />
+ <result property="jobCategory" column="job_category" />
<result property="projectAddress" column="project_address" />
- <result property="deptUserName" column="dept_user_name" />
+<!-- <result property="deptUserName" column="dept_user_name" />-->
+ <result property="deptPostName" column="dept_post_name" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result property="version" column="version" />
<result property="state" column="state" />
<result property="remark" column="remark" />
@@ -40,7 +41,7 @@
<result property="remark" column="remark" />
<result property="state" column="state" />
<result property="step" column="step" />
- <result property="companyName" column="company_name" />
+ <result property="jobCategory" column="job_category" />
<result property="projectAddress" column="project_address" />
<!-- <result property="deptUserName" column="dept_user_name" />-->
<result property="projectDateStart" column="project_date_start" />
@@ -58,10 +59,14 @@
<result property="ratingLevel" column="rating_level" />
<result property="selectionMode" column="selection_mode" />
<result property="teamLeader" column="team_leader" />
+ <result property="companyName" column="company_name" />
+ <result property="phone" column="phone" />
+ <result property="selectionTime" column="selection_time" />
+ <result property="expertRemark" column="expert_remark" />
</resultMap>
<sql id="selectProjectManagementVo">
- select id, project_name, dept_id, dept_name, company_name, project_address, dept_user_name,
+ select id, project_name, dept_id, dept_name, job_category, project_address,dept_post_name,
version, state, remark, project_date_start, project_date_end, expert_certificate,
evaluation_state, expert_num, del_flag, create_by, create_time, update_by, update_time,project_check_time,expert_id,
expert_name,project_end_time,`desc`,step
@@ -75,9 +80,9 @@
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
- <if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+ <if test="jobCategory != null and jobCategory != ''"> and job_category like concat('%', #{jobCategory}, '%')</if>
<if test="projectAddress != null and projectAddress != ''"> and project_address = #{projectAddress}</if>
- <if test="deptUserName != null and deptUserName != ''"> and dept_user_name like concat('%', #{deptUserName}, '%')</if>
+<!-- <if test="deptUserName != null and deptUserName != ''"> and dept_user_name like concat('%', #{deptUserName}, '%')</if>-->
<if test="version != null "> and version = #{version}</if>
<if test="state != null "> and state = #{state}</if>
<if test="step!= null "> and step = #{step}</if>
@@ -100,9 +105,10 @@
<if test="projectName != null and projectName != ''">project_name,</if>
<if test="deptId != null">dept_id,</if>
<if test="deptName != null and deptName != ''">dept_name,</if>
- <if test="companyName != null and companyName != ''">company_name,</if>
+ <if test="jobCategory != null and jobCategory != ''">job_category,</if>
<if test="projectAddress != null and projectAddress != ''">project_address,</if>
- <if test="deptUserName != null and deptUserName != ''">dept_user_name,</if>
+<!-- <if test="deptUserName != null and deptUserName != ''">dept_user_name,</if>-->
+ <if test="deptPostName != null and deptPostName != ''">dept_post_name,</if>
<if test="version != null">version,</if>
<if test="state != null">state,</if>
<if test="step != null">step,</if>
@@ -122,9 +128,10 @@
<if test="projectName != null and projectName != ''">#{projectName},</if>
<if test="deptId != null">#{deptId},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
- <if test="companyName != null and companyName != ''">#{companyName},</if>
+ <if test="jobCategory != null and jobCategory != ''">#{jobCategory},</if>
<if test="projectAddress != null and projectAddress != ''">#{projectAddress},</if>
- <if test="deptUserName != null and deptUserName != ''">#{deptUserName},</if>
+<!-- <if test="deptUserName != null and deptUserName != ''">#{deptUserName},</if>-->
+ <if test="deptPostName != null and deptPostName != ''">#{deptPostName},</if>
<if test="version != null">#{version},</if>
<if test="state != null">#{state},</if>
<if test="step != null">#{step},</if>
@@ -148,9 +155,10 @@
<if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- <if test="companyName != null and companyName != ''">company_name = #{companyName},</if>
+ <if test="jobCategory != null and jobCategory != ''">job_category = #{jobCategory},</if>
<if test="projectAddress != null and projectAddress != ''">project_address = #{projectAddress},</if>
- <if test="deptUserName != null and deptUserName != ''">dept_user_name = #{deptUserName},</if>
+<!-- <if test="deptUserName != null and deptUserName != ''">dept_user_name = #{deptUserName},</if>-->
+ <if test="deptPostName != null and deptPostName != ''">dept_post_name = #{deptPostName},</if>
<if test="version != null">version = #{version},</if>
<if test="state != null">state = #{state},</if>
<if test="step != null">step = #{step},</if>
@@ -186,11 +194,12 @@
</update>
<select id="projectExpertCheckInfo" parameterType="Long" resultMap="ProjectManagementInfoResult">
- select a.id,a.step, a.project_name, a.dept_name, a.company_name, a.project_address, a.project_date_start, a.project_date_end, a.remark,a.project_check_time,a.state,
- b.id project_expert_id,b.expert_id expert_id_info,c.name,c.sex,c.id_card,c.domain,c.rating_level,b.selection_mode,b.team_leader
+ select a.id,a.step, a.project_name, a.dept_name, a.job_category, a.project_address, a.project_date_start, a.project_date_end, a.remark,a.project_check_time,a.state,
+ b.id project_expert_id,b.expert_id expert_id_info,c.name,c.sex,c.id_card,c.domain,c.rating_level,b.selection_mode,b.team_leader,
+ c.company_name,c.phone,a.create_time selection_time,c.remark expert_remark
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
+ left join sys_expert_info c on b.expert_id = c.id
where a.id = #{id}
order by b.team_leader asc , b.create_time desc
</select>
--
Gitblit v1.9.2