diff --git a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java index 6f9e8fed..274e1dc4 100644 --- a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java +++ b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java @@ -18,6 +18,7 @@ public class PlmProjectInfoData extends PlmProjectInfo { private String customerName; private String finalCustomerName; private String priorityDesc; + private String industryDesc; private String type; private String userRoleName; private List projectManagerList; @@ -212,6 +213,14 @@ public class PlmProjectInfoData extends PlmProjectInfo { this.priorityDesc = priorityDesc; } + public String getIndustryDesc() { + return industryDesc; + } + + public void setIndustryDesc(String industryDesc) { + this.industryDesc = industryDesc; + } + public String getType() { return type; } 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 842696e5..f440a2a2 100644 --- a/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java +++ b/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java @@ -83,6 +83,11 @@ public class PlmProjectInfo extends QueryPage { */ private String priority; + /** + * 行业 + */ + private String industry; + /** * 工厂编码 */ @@ -216,6 +221,14 @@ public class PlmProjectInfo extends QueryPage { this.priority = priority; } + public String getIndustry() { + return industry; + } + + public void setIndustry(String industry) { + this.industry = industry; + } + public String getSite() { return site; } diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index fa5da128..80838e78 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -35,6 +35,8 @@ dbo.plm_get_dictDataLabel('project_info_source', a.project_source, a.site) projectSourceDesc, dbo.plm_get_customer_desc(a.site, a.customer_id) customerName, dbo.plm_get_dictDataLabel('project_info_priority', a.priority, a.site) priorityDesc, + a.industry, + dbo.plm_get_dictDataLabel('project_info_industry', a.industry, a.site) industryDesc, a.need_date, dbo.get_projectUserRoleName(a.site, a.project_id) userRoleName, a.parent_project_no, @@ -90,6 +92,8 @@ 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, + industry, + dbo.plm_get_dictDataLabel('project_info_industry', industry, site) industryDesc, need_date, dbo.get_projectUserRoleName(site, project_id) userRoleName, parent_project_no, @@ -167,6 +171,8 @@ 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, + industry, + dbo.plm_get_dictDataLabel('project_info_industry', industry, site) industryDesc, need_date, dbo.get_projectUserRoleName(site, project_id) userRoleName, parent_project_no, @@ -230,16 +236,16 @@ 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, + create_date, priority, industry, site, project_desc, customer_remark, remark, need_date, parent_project_no, final_customer_id, customer_Project_No, productSet, project_amount) values (#{projectId}, #{projectId}, #{projectTypeDb}, #{projectName}, #{status}, #{projectSource}, #{customerId}, #{createBy}, - GetDate(), #{priority}, #{site}, #{projectDesc}, #{customerRemark}, #{remark}, #{needDate}, #{parentProjectNo}, #{finalCustomerId}, + GetDate(), #{priority}, #{industry}, #{site}, #{projectDesc}, #{customerRemark}, #{remark}, #{needDate}, #{parentProjectNo}, #{finalCustomerId}, #{customerProjectNo}, #{productSet}, #{projectAmount}) 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}, + customer_id=#{customerId},priority=#{priority},industry=#{industry},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},productSet=#{productSet}, customer_Project_No=#{customerProjectNo},project_amount=#{projectAmount} where id=#{id} @@ -614,7 +620,7 @@ @@ -782,6 +788,8 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_ 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, + industry, + dbo.plm_get_dictDataLabel('project_info_industry', industry, site) industryDesc, need_date, dbo.get_projectUserRoleName(site, project_id) userRoleName, parent_project_no, @@ -849,6 +857,8 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_ 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, + industry, + dbo.plm_get_dictDataLabel ('project_info_industry', industry, site) industryDesc, need_date, dbo.get_projectUserRoleName (site, project_id) userRoleName, parent_project_no,