认证-参数清单-子项目引发的变更

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/query/QueryGenerator.java

@@ -486,8 +486,8 @@ public class QueryGenerator {
 		}
 		name = oConvertUtils.camelToUnderline(name);
 		log.info("--查询规则-->"+name+" "+rule.getValue()+" "+value);
-		if(" is null ".equals(value)){
+		if("is null".equals(value)){
-			queryWrapper.isNull(name);
+			queryWrapper.isNull(name).or().eq(name, "");
 		}else{
 			switch (rule) {
 				case GT:

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java

@@ -83,7 +83,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 		// 处理 状态 中英文
 		Map<String, String> stateMap = ManifestStateEnum.toMap(cut);
 		rows.forEach(manifestEO -> {
-			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId()).getProjectName());
+			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion()).getProjectName());
 			manifestEO.setState(stateMap.get(manifestEO.getState()));
 		});
 		return Result.OK(cut, pageList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -164,7 +164,7 @@
         select tmp_tb.* from(
         select
             plb.id as project_id,
-            concat(pni.project_name,'-',pyni.year_name,'-',target_market,'-',project_version) as project_name
+            concat(pni.project_name,'-',pyni.year_name,'-',target_market) as project_name
         from project_library_base plb
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id = pyni.id

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java

@@ -89,7 +89,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 
 	ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId);
 
-	ParamsManifestVO getProjectById(String projectId);
+	ParamsManifestVO getProjectById(String projectId, String projectVersion);
 
 	List<Map<String, String>> labelListForProjectDetails(String projectId);
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1301,7 +1301,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				//日期
 				String deadline = new SimpleDateFormat("yyyy-MM-dd").format(paramsCollectManifestEO.getDeadline());
 				//项目名称
-				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId()); // 获取项目信息
+				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId(), paramsManifestEO.getProjectVersion()); // 获取项目信息
 				//url
 				String urlParamsStr = parseUrlParams(paramsManifestEO);
 				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
@@ -1507,8 +1507,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1619,8 +1619,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		Date deadline = paramsCollectManifestVO.getDeadline();
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1751,8 +1751,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		Date deadline = paramsCollectManifestVO.getDeadline();
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -4446,7 +4446,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<ParamsManifestEO> manifestEOS = paramsManifestEOService.list(queryWrapper);
 		for (ParamsManifestEO manifestEO : manifestEOS) {
 			//项目名称
-			ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId());
+			ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion());
 			if (ObjectUtils.isNotEmpty(projectInfo)) {
 				//url
 				String urlParamsStr = parseUrlParams(manifestEO);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -669,8 +669,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	}
 
 	@Override
-	public ParamsManifestVO getProjectById(String projectId) {
+	public ParamsManifestVO getProjectById(String projectId, String projectVersion) {
-		return paramsManifestEOMapper.getProjectById(projectId);
+		ParamsManifestVO paramsManifestVO = paramsManifestEOMapper.getProjectById(projectId);
+		paramsManifestVO.setProjectName(paramsManifestVO.getProjectName() + "-" + projectVersion); // 项目名称加上 相关项目版本
+		return paramsManifestVO;
 	}
 
 	@Override