From c1017936b0e42a0e426367444200324902833bd9 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 25 Mar 2025 17:26:35 +0800
Subject: [PATCH] 2025-03-25

---
 .../resources/mapper/project/ProjectDao.xml   | 111 ++++++++++++++----
 1 file changed, 90 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 089fde7b..97b8a334 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -4,13 +4,36 @@
 <mapper namespace="com.spring.modules.project.dao.ProjectDao">
 
     <select id="selectProjectInfoList" resultType="PlmProjectInfoData">
-        SELECT project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by,
-        create_date,update_by,update_date,priority,site,id,project_desc,customer_remark,remark,dbo.get_projectTeamName(site,project_id,'owner') projectOwnerName
-        ,dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
-        dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
-        dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
-        dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,
-        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName,productSet
+        SELECT project_id,
+               ori_project_id,
+               project_type_db,
+               project_name,
+               status,
+               project_source,
+               customer_id,
+               create_by,
+               create_date,
+               update_by,
+               update_date,
+               priority,
+               site,
+               id,
+               project_desc,
+               customer_remark,
+               remark,
+               dbo.get_projectTeamName(site, project_id, 'owner')                       projectOwnerName,
+               dbo.get_projectTeamName(site, project_id, 'manager')                     ProjectManagerName,
+               dbo.plm_get_dictDataLabel('project_info_type_db', project_type_db, site) projectType,
+               dbo.plm_get_projectBaseDesc(status, 'project_status')                    projectStatusDesc,
+               dbo.plm_get_dictDataLabel('project_info_source', project_source, site)   projectSourceDesc,
+               dbo.plm_get_customer_desc(site, customer_id)                             customerName,
+               dbo.plm_get_dictDataLabel('project_info_priority', priority, site)       priorityDesc,
+               need_date,
+               dbo.get_projectUserRoleName(site, project_id)                            userRoleName,
+               parent_project_no,
+               final_customer_id,
+               dbo.plm_get_dictDataLabel('finalCustomer', final_customer_id, site)      finalCustomerName,
+               productSet
         FROM plm_project_info
         <where>
             <if test="site != null and site != ''">
@@ -30,14 +53,38 @@
     </select>
 
 <select id="projectInfoSearch"  parameterType="PlmProjectInfoData" resultType="PlmProjectInfoData">
-        SELECT project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by,
-        create_date,update_by,update_date,priority,site,id,project_desc,customer_remark,remark,dbo.get_projectTeamName(site,project_id,'owner') projectOwnerName
-        ,dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
-        dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
-        dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
-        dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,customer_project_no,
-        final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName,productSet
-        FROM plm_project_info
+    SELECT project_id,
+           ori_project_id,
+           project_type_db,
+           project_name,
+           status,
+           project_source,
+           customer_id,
+           create_by,
+           create_date,
+           update_by,
+           update_date,
+           priority,
+           site,
+           id,
+           project_desc,
+           customer_remark,
+           remark,
+           dbo.get_projectTeamName(site, project_id, 'owner')                       projectOwnerName,
+           dbo.get_projectTeamName(site, project_id, 'manager')                     ProjectManagerName,
+           dbo.plm_get_dictDataLabel('project_info_type_db', project_type_db, site) projectType,
+           dbo.plm_get_projectBaseDesc(status, 'project_status')                    projectStatusDesc,
+           dbo.plm_get_dictDataLabel('project_info_source', project_source, site)   projectSourceDesc,
+           dbo.plm_get_customer_desc(site, customer_id)                             customerName,
+           dbo.plm_get_dictDataLabel('project_info_priority', priority, site)       priorityDesc,
+           need_date,
+           dbo.get_projectUserRoleName(site, project_id)                            userRoleName,
+           parent_project_no,
+           customer_project_no,
+           final_customer_id,
+           dbo.plm_get_dictDataLabel('finalCustomer', final_customer_id, site)      finalCustomerName,
+           productSet
+    FROM plm_project_info
         <where>
              <if test="query.id != null">
                 AND id = #{query.id}
@@ -74,12 +121,34 @@
 </select>
 
 <select id="checkPlmProjectInfoData" resultType="PlmProjectInfoData">
-    SELECT project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by,
-    create_date,update_by,update_date,priority,site,id,project_desc,customer_remark,remark,dbo.get_projectTeamName(site,project_id,'owner') projectOwnerName
-    ,dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
-    dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
-    dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,need_date,
-    dbo.get_projectUserRoleName(site,project_id) userRoleName,parent_project_no,productSet
+    SELECT project_id,
+           ori_project_id,
+           project_type_db,
+           project_name,
+           status,
+           project_source,
+           customer_id,
+           create_by,
+           create_date,
+           update_by,
+           update_date,
+           priority,
+           site,
+           id,
+           project_desc,
+           customer_remark,
+           remark,
+           dbo.get_projectTeamName(site, project_id, 'owner')                       projectOwnerName,
+           dbo.get_projectTeamName(site, project_id, 'manager')                     ProjectManagerName,
+           dbo.plm_get_dictDataLabel('project_info_type_db', project_type_db, site) projectType,
+           dbo.plm_get_projectBaseDesc(status, 'project_status')                    projectStatusDesc,
+           dbo.plm_get_dictDataLabel('project_info_source', project_source, site)   projectSourceDesc,
+           dbo.plm_get_customer_desc(site, customer_id)                             customerName,
+           dbo.plm_get_dictDataLabel('project_info_priority', priority, site)       priorityDesc,
+           need_date,
+           dbo.get_projectUserRoleName(site, project_id)                            userRoleName,
+           parent_project_no,
+           productSet
     FROM plm_project_info where id=#{id}
 </select>