From a34d0f908ef10b2aa04b950fd9cd676e1844ccf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 22 Mar 2023 09:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=BA=93?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E9=87=8D=E5=A4=8D=E5=90=8E=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    |  2 +-
 .../impl/ProjectLibraryBaseServiceImpl.java   | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 2a9e6a82e..d635e1228 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -9719,7 +9719,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String dueDate = null;
 
 			QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();
-			queryProjectTaskInventoryWrapper.isNotNull("design_p_id");
+			queryProjectTaskInventoryWrapper.isNotNull("design_p_id").or().isNotNull("verify_p_id");
 			queryProjectTaskInventoryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryId);
 			List<ProjectTaskInventoryEO> list = projectTaskInventoryEOService.list(queryProjectTaskInventoryWrapper);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 4e2cfb5af..166d8d121 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -221,6 +221,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	}
 
+
+
 	/**
 	 * 项目扩展(添加子项目--子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
 	 * @param projectLibraryBase
@@ -239,8 +241,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		projectLibraryBaseTemp.setExplanation(projectLibraryBase.getExplanation());
 		this.save(projectLibraryBaseTemp);
 
-		Date now = new Date();
+		//处理版本号排序问题，如果版本号插入到中间，后面版本数字顺眼
+		checkVersionOrder(id,projectLibraryBase.getProjectVersion(),projectId);
 
+		Date now = new Date();
 		//相关人员名单中添加数据
 		List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelMapper.queryPageList(id,
 				DictCodeEnum.DUTY_TERRITORY.getValue(),
@@ -339,6 +343,33 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		}
 	}
 
+	/**
+	 * 如果创建的子项目版本号重复，处理排序
+	 * @param id
+	 * @param version
+	 * @param projectId
+	 */
+	private void checkVersionOrder(String id,String version,String projectId) {
+		LambdaQueryWrapper<ProjectLibraryBase> wrapperVer = new LambdaQueryWrapper<>();
+		//查找其他统计子版本项目
+		wrapperVer.eq(ProjectLibraryBase::getParentId, id);
+		wrapperVer.orderByAsc(ProjectLibraryBase::getProjectVersion);
+		List<ProjectLibraryBase> clist = this.list(wrapperVer);
+		int tmpInt = Integer.parseInt(version);
+		for (ProjectLibraryBase plb : clist) {
+			int ver = Integer.parseInt(plb.getProjectVersion());
+			if(!plb.getId().equals(projectId) && ver == tmpInt){
+				tmpInt++;
+				String verStr = String.valueOf(tmpInt);
+				if(verStr.length() <= 1){
+					verStr= "0" + verStr;
+				}
+				plb.setProjectVersion(verStr);
+				this.updateById(plb);
+			}
+		}
+	}
+
 
 	/**检查车型名称id,年款号,目标市场,版本同时存在,报错*/
 	public void checkExitData(ProjectLibraryBase projectLibraryBase){
@@ -379,6 +410,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		checkExitData(projectLibraryBase);
 		saveOrUpdate(projectLibraryBase);
+		checkVersionOrder(projectLibraryBase.getParentId(),projectLibraryBase.getProjectVersion(),projectLibraryBase.getId());
 
 		// 删除当前项目的studio与项目库 角色关系
 		QueryWrapper<ProjectLibraryRoleRelEO> deleteLibraryRoleRelWrapper = new QueryWrapper<>();