diff --git a/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java b/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java index a2e78cd1..a1a05954 100644 --- a/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java +++ b/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java @@ -25,7 +25,7 @@ public class PlmProjectInfo extends QueryPage { * 项目类型编码 */ private String projectTypeDb; - + private String customerProjectNo; /** * 项目名称 */ @@ -281,5 +281,13 @@ public class PlmProjectInfo extends QueryPage { public void setFinalCustomerId(String finalCustomerId) { this.finalCustomerId = finalCustomerId; } + + public String getCustomerProjectNo() { + return customerProjectNo; + } + + public void setCustomerProjectNo(String customerProjectNo) { + this.customerProjectNo = customerProjectNo; + } } diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml index 6d2a7847..e2aa12df 100644 --- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml +++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml @@ -31,7 +31,7 @@ dbo.get_projectUserRoleName(site, project_id) userRoleName, parent_project_no, final_customer_id, - dbo.plm_get_customer_desc(site, final_customer_id) finalCustomerName + dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName FROM plm_project_info diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index 3e5a0a7f..e6024201 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -10,7 +10,7 @@ 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_customer_desc(site,final_customer_id) finalCustomerName + final_customer_id,dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName FROM plm_project_info @@ -35,12 +35,15 @@ ,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_customer_desc(site,final_customer_id) finalCustomerName + 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 FROM plm_project_info AND id = #{query.id} + + + AND customer_project_no like #{query.customerProjectNo} AND site = #{query.site} @@ -123,17 +126,18 @@ insert into plm_project_info (project_id,ori_project_id,project_type_db,project_name,status,project_source,customer_id,create_by, - create_date,priority,site,project_desc,customer_remark,remark,need_date,parent_project_no,final_customer_id) values + create_date,priority,site,project_desc,customer_remark,remark,need_date,parent_project_no,final_customer_id, + customer_Project_No) values (#{projectId},#{projectId},#{projectTypeDb},#{projectName},#{status},#{projectSource},#{customerId}, #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{parentProjectNo} - ,#{finalCustomerId}) + ,#{finalCustomerId},#{customerProjectNo}) update plm_project_info set project_type_db=#{projectTypeDb},project_name=#{projectName},project_source=#{projectSource},status=#{status}, customer_id=#{customerId},priority=#{priority},project_desc=#{projectDesc},customer_remark=#{customerRemark},remark=#{remark},need_date=#{needDate}, update_by=#{updateBy},update_date=GetDate(),parent_project_no = #{parentProjectNo},final_customer_id=#{finalCustomerId} - where id=#{id} + ,customer_Project_No=#{customerProjectNo} where id=#{id} delete from plm_project_team where site=#{site} and project_id=#{projectId} @@ -549,7 +553,7 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_ select project_id, project_name, final_customer_id, - dbo.plm_get_customer_desc(site, final_customer_id) finalCustomerName + dbo.plm_get_dictDataLabel('finalCustomer',final_customer_id,site) finalCustomerName from plm_project_info where site = #{site} and project_id = #{projectId} diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index afa1d16f..74b90bbe 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -216,7 +216,7 @@ b.customer_id, b.final_customer_id, dbo.plm_get_customer_desc(a.site,b.customer_id) CustomerDesc, - dbo.plm_get_customer_desc(a.site,b.final_customer_id) finalCustomerDesc, + dbo.plm_get_dictDataLabel('finalCustomer',b.final_customer_id,a.site) finalCustomerDesc, b.project_name,d.bu_no from plm_proofing_information a left join plm_project_info b on a.site = b.site and a.project_id = b.project_id @@ -250,7 +250,7 @@