From c123a7c8a632dc080cd805097046947dc77c0493 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Fri, 5 Jan 2024 16:58:18 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-5=20=E9=A1=B9=E7=9B=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/PlmProjectInfo.java        | 26 ++++++------
 .../service/impl/ProjectServiceImpl.java      | 13 +++++-
 .../customer/ProjectInformationMapper.xml     |  7 ++--
 .../resources/mapper/project/ProjectDao.xml   | 40 +++++++++----------
 4 files changed, 49 insertions(+), 37 deletions(-)

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 852a9a9b..600bdef6 100644
--- a/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java
+++ b/src/main/java/com/spring/modules/project/entity/PlmProjectInfo.java
@@ -20,11 +20,6 @@ public class PlmProjectInfo extends QueryPage {
      */
     private String oriProjectId;
 
-    /**
-     * 项目层级
-     */
-    private Integer projectLevel;
-
     /**
      * 项目类型编码
      */
@@ -110,6 +105,12 @@ public class PlmProjectInfo extends QueryPage {
      */
     private String remark;
 
+    /**
+     * 上级项目编号
+     * @return
+     */
+    private String parentProjectNo;
+
     public String getProjectId() {
         return projectId;
     }
@@ -126,13 +127,6 @@ public class PlmProjectInfo extends QueryPage {
         this.oriProjectId = oriProjectId;
     }
 
-    public Integer getProjectLevel() {
-        return projectLevel;
-    }
-
-    public void setProjectLevel(Integer projectLevel) {
-        this.projectLevel = projectLevel;
-    }
 
     public String getProjectTypeDb() {
         return projectTypeDb;
@@ -269,5 +263,13 @@ public class PlmProjectInfo extends QueryPage {
     public void setBuNo(String buNo) {
         this.buNo = buNo;
     }
+
+    public String getParentProjectNo() {
+        return parentProjectNo;
+    }
+
+    public void setParentProjectNo(String parentProjectNo) {
+        this.parentProjectNo = parentProjectNo;
+    }
 }
 
diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
index 1e3d0138..b013b357 100644
--- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
@@ -13,6 +13,8 @@ import com.spring.modules.project.entity.PlmProjectInfo;
 import com.spring.modules.project.entity.PlmProjectTeam;
 import com.spring.modules.project.entity.PlmUserRole;
 import com.spring.modules.project.service.ProjectService;
+import com.spring.modules.quotation.entity.SeqRule;
+import com.spring.modules.quotation.service.SeqRuleService;
 import com.spring.modules.sampleManagement.entity.BiAddress;
 import com.spring.modules.sys.entity.SysUserEntity;
 import org.apache.shiro.SecurityUtils;
@@ -30,6 +32,8 @@ public class ProjectServiceImpl implements ProjectService {
     private TransNoControlService transNoControlService;
     @Autowired
     private ProjectDao projectDao;
+    @Autowired
+    private SeqRuleService seqRuleService;
 
     @Override
     public PageUtils projectInfoSearch(PlmProjectInfoData inData){
@@ -109,11 +113,18 @@ public class ProjectServiceImpl implements ProjectService {
         List<PlmProjectTeam> plmProjectTeams=new ArrayList<>();
         List<PlmUserRoleData> userRoleList=new ArrayList<>();
         if(inData.getId()==0){
-            String projectId=transNoControlService.transNo("1","project_info");
+            String projectId= null;
+            if (StringUtils.hasText(inData.getProjectId())){
+                projectId = seqRuleService.getSeqNo(inData.getSite(),"XM",inData.getProjectId());
+                inData.setParentProjectNo(inData.getProjectId());
+            }else {
+                projectId = transNoControlService.transNo("1","project_info");
+            }
             inData.setProjectId(projectId);
             inData.setCreateBy(sysUserEntity.getUsername());
             inData.setStatus("未发布");
             projectDao.saveProjectInfo(inData);
+            seqRuleService.save(new SeqRule(inData.getSite(),"XM","项目",projectId,2));
         }else {
             PlmProjectInfoData checkPlmProjectInfoData=projectDao.checkPlmProjectInfoData(inData);
             if(!checkPlmProjectInfoData.getCustomerId().equals(inData.getCustomerId())){
diff --git a/src/main/resources/mapper/customer/ProjectInformationMapper.xml b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
index 058867c1..a081f071 100644
--- a/src/main/resources/mapper/customer/ProjectInformationMapper.xml
+++ b/src/main/resources/mapper/customer/ProjectInformationMapper.xml
@@ -9,7 +9,6 @@
             site,
             project_id,
             ori_project_id,
-            project_level,
             project_type_db,
             project_name,
             status,
@@ -26,11 +25,11 @@
             need_date,
             dbo.get_projectTeamName(site,project_id,'owner') projectOwnerName,
             dbo.get_projectTeamName(site,project_id,'manager') ProjectManagerName,
-            dbo.plm_get_projectBaseDesc(project_type_db,'project_type') projectType,
+            dbo.plm_get_dictDataLabel('project_info_type_db',project_type_db,site) projectType,
             dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,
-            dbo.plm_get_projectBaseDesc(project_source,'project_source') projectSourceDesc,
+            dbo.plm_get_dictDataLabel('project_info_source',project_source,site) projectSourceDesc,
             dbo.plm_get_customer_desc(site,customer_id) customerName,
-            dbo.plm_get_projectBaseDesc(priority,'project_priority') priorityDesc,
+            dbo.plm_get_dictDataLabel('project_info_priority',priority,site) priorityDesc,
             dbo.get_projectUserRoleName(site,project_id) userRoleName
         FROM plm_project_info
         WHERE site = #{site} and customer_id = #{customerId}
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index a0cd655c..a90de81d 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -4,12 +4,12 @@
 <mapper namespace="com.spring.modules.project.dao.ProjectDao">
 
 <select id="projectInfoSearch"  parameterType="PlmProjectInfoData" resultType="PlmProjectInfoData">
-        SELECT project_id,ori_project_id,project_level,project_type_db,project_name,status,project_source,customer_id,create_by,
+        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_projectBaseDesc(project_type_db,'project_type') projectType,
-        dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_projectBaseDesc(project_source,'project_source') projectSourceDesc,
-        dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_projectBaseDesc(priority,'project_priority') priorityDesc,need_date,
-        dbo.get_projectUserRoleName(site,project_id) userRoleName,bu_no,dbo.plm_get_bu_desc(site,bu_no) buDesc
+        ,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,bu_no,dbo.plm_get_bu_desc(site,bu_no) buDesc,parent_project_no
         FROM plm_project_info
         <where>
              <if test="query.id != null">
@@ -29,19 +29,19 @@
             </if>
             <if test="query.userName != null and query.userName != '' and query.userName != 'admin'">
                 AND project_id in ( select project_id from AccessProject where site=#{query.site} and username=#{query.userName} and searchFlag='Y' )
-                AND bu_no in ( select bu_no from AccessBu where site=#{query.site} and username=#{query.userName}  )
+                AND bu_no in ( select bu_no from AccessBu where site=#{query.site} and username=#{query.userName})
             </if>
         </where>
-    order by create_date desc
+    order by LEFT(project_id, CHARINDEX('-', project_id + '-') - 1) desc
 </select>
 <select id="checkPlmProjectInfoData" resultType="PlmProjectInfoData">
-      SELECT project_id,ori_project_id,project_level,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_projectBaseDesc(project_type_db,'project_type') projectType,
-        dbo.plm_get_projectBaseDesc(status,'project_status') projectStatusDesc,dbo.plm_get_projectBaseDesc(project_source,'project_source') projectSourceDesc,
-        dbo.plm_get_customer_desc(site,customer_id) customerName,dbo.plm_get_projectBaseDesc(priority,'project_priority') priorityDesc,need_date,
-        dbo.get_projectUserRoleName(site,project_id) userRoleName,bu_no,dbo.plm_get_bu_desc(site,bu_no) buDesc
-        FROM plm_project_info where id=#{id}
+    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,bu_no,dbo.plm_get_bu_desc(site,bu_no) buDesc,parent_project_no
+    FROM plm_project_info where id=#{id}
 </select>
 
 <select id="searchOperatorWithSite" resultType="com.spring.modules.project.data.PlmOperatorData">
@@ -78,16 +78,16 @@
 
 <insert id="saveProjectInfo">
     insert into plm_project_info
-    (project_id,ori_project_id,project_level,project_type_db,project_name,status,project_source,customer_id,create_by,
-    create_date,priority,site,project_desc,customer_remark,remark,need_date,bu_no) values
-    (#{projectId},#{projectId},#{projectLevel},#{projectTypeDb},#{projectName},#{status},#{projectSource},#{customerId},
-    #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{buNo})
+    (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,bu_no,parent_project_no) values
+    (#{projectId},#{projectId},#{projectTypeDb},#{projectName},#{status},#{projectSource},#{customerId},
+    #{createBy},GetDate(),#{priority},#{site},#{projectDesc},#{customerRemark},#{remark},#{needDate},#{buNo},#{parentProjectNo})
 
 </insert>
 <update id="updateProjectInfo">
-    update plm_project_info set project_level=#{projectLevel}, project_type_db=#{projectTypeDb},project_name=#{projectName},project_source=#{projectSource},status=#{status},
+    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(),bu_no=#{buNo}
+    update_by=#{updateBy},update_date=GetDate(),bu_no=#{buNo},parent_project_no = #{parentProjectNo}
     where id=#{id}
 </update>
 <delete id="deletePlmProjectTeam">