From 91921823fb85dbd1ee236020c7b81f6bdf6d7edb Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 24 三月 2025 13:51:16 +0800
Subject: [PATCH] 调整业务逻辑
---
expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
index 3b8cf54..8b98a56 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="ProjectManagement" id="ProjectManagementResult">
<result property="id" column="id" />
<result property="projectName" column="project_name" />
+ <result property="projectCode" column="project_code" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="jobCategory" column="job_category" />
@@ -37,12 +38,14 @@
<resultMap type="com.gkhy.system.domain.vo.response.ProjectExpertManagementInfoRes" id="ProjectManagementInfoResult">
<result property="id" column="id" />
<result property="projectName" column="project_name" />
+ <result property="projectCode" column="project_code" />
<result property="deptName" column="dept_name" />
<result property="remark" column="remark" />
<result property="state" column="state" />
<result property="step" column="step" />
<result property="jobCategory" column="job_category" />
<result property="projectAddress" column="project_address" />
+ <result property="expertNum" column="expert_num" />
<!-- <result property="deptUserName" column="dept_user_name" />-->
<result property="projectDateStart" column="project_date_start" />
<result property="projectDateEnd" column="project_date_end" />
@@ -69,7 +72,7 @@
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
+ expert_name,project_end_time,`desc`,step,project_code
from project_management
</sql>
@@ -78,6 +81,7 @@
<where>
and del_flag = 0
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+ <if test="projectCode != null and projectCode != ''"> and project_code like concat('%', #{projectCode}, '%')</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="jobCategory != null and jobCategory != ''"> and job_category like concat('%', #{jobCategory}, '%')</if>
@@ -104,6 +108,7 @@
insert into project_management
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="projectName != null and projectName != ''">project_name,</if>
+ <if test="projectCode != null and projectCode != ''">project_code,</if>
<if test="deptId != null">dept_id,</if>
<if test="deptName != null and deptName != ''">dept_name,</if>
<if test="jobCategory != null and jobCategory != ''">job_category,</if>
@@ -127,6 +132,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectName != null and projectName != ''">#{projectName},</if>
+ <if test="projectCode != null and projectCode != ''">#{projectCode},</if>
<if test="deptId != null">#{deptId},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
<if test="jobCategory != null and jobCategory != ''">#{jobCategory},</if>
@@ -171,7 +177,7 @@
<if test="evaluationState != null">evaluation_state = #{evaluationState},</if>
<if test="expertNum != null">expert_num = #{expertNum},</if>
<if test="expertId != null">expert_id = #{expertId},</if>
- <if test="expertName != null and expertName != ''">expert_name = #{expertName},</if>
+ <if test="expertName != null">expert_name = #{expertName},</if>
<if test="projectEndTime != null">project_end_time = #{projectEndTime},</if>
<if test="desc != null and desc != ''">`desc` = #{desc},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -197,12 +203,12 @@
<select id="projectExpertCheckInfo" parameterType="Long" resultMap="ProjectManagementInfoResult">
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
+ c.company_name,c.phone,a.create_time selection_time,c.remark expert_remark,a.project_code,a.expert_num
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
where a.id = #{id}
- order by b.team_leader asc , b.create_time desc
+ order by b.team_leader desc , b.create_time desc
</select>
<select id="getProjectExpertSate" parameterType="com.gkhy.system.domain.vo.request.ProjectExpertStateReq" resultType="com.gkhy.system.domain.vo.response.ProjectExpertStateResp">
select a.id, a.project_name, a.evaluation_state, a.project_check_time, a.project_end_time, a.dept_name, a.expert_num
--
Gitblit v1.9.2