Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -150,6 +150,9 @@ CREATE TABLE `laws_weilai`.`params_collect_manifest_log`  (
 -- 参数清单-增加参考列配置id   2022-12-29  未同步生产环境
 ALTER TABLE `laws_weilai`.`params_manifest`
     ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`;
+-- 参数清单历史-增加参考列配置id   2022-12-29  未同步生产环境
+ALTER TABLE `laws_weilai`.`params_manifest_history`
+    ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`;
 -- 上报库备注列字段长度修改  2022-12-29 未同步生产环境
 ALTER TABLE `laws_weilai`.`params_report_detail`
     MODIFY COLUMN `remarks` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `title_default_value`;

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(), manifestEO.getProjectVersion()).getProjectName());
+			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).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

@@ -203,7 +203,8 @@
         select tmp_tb.* from(
         select
             plb.id as project_id,
-            concat(pni.project_name,'-',pyni.year_name,'-',target_market) as project_name
+            target_market as targetMarket,
+            concat(pni.project_name,'-',pyni.year_name) 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, String projectVersion);
+	ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut);
 
 	List<Map<String, String>> labelListForProjectDetails(String projectId);
 

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

@@ -1836,7 +1836,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				//日期
 				String deadline = new SimpleDateFormat("yyyy-MM-dd").format(paramsCollectManifestEO.getDeadline());
 				//项目名称
-				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId(), paramsManifestEO.getProjectVersion()); // 获取项目信息
+				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId(),
+						paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 				//url
 				String urlParamsStr = parseUrlParams(paramsManifestEO);
 				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
@@ -2055,7 +2056,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId,
+				paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2211,7 +2213,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2385,7 +2387,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -5261,7 +5263,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<ParamsManifestEO> manifestEOS = paramsManifestEOService.list(queryWrapper);
 		for (ParamsManifestEO manifestEO : manifestEOS) {
 			//项目名称
-			ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion());
+			ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),null);
 			if (ObjectUtils.isNotEmpty(projectInfo)) {
 				//url
 				String urlParamsStr = parseUrlParams(manifestEO);
@@ -5707,7 +5709,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		String[] paramsCollectManifestIdArr = paramsCollectManifestIds.split(",");

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

@@ -19,7 +19,11 @@ import com.jero.modules.cert.collect.enums.ManifestStateEnum;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
-import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
@@ -35,7 +39,9 @@ import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.mapper.SysDictMapper;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -45,7 +51,14 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -107,6 +120,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	@Autowired
 	private IProjectUserPermissionService projectUserPermissionService;
 
+	@Autowired
+	private ISysDictService sysDictService;
+
 	/**
 	 * 保存
 	 *
@@ -751,12 +767,45 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	}
 
 	@Override
-	public ParamsManifestVO getProjectById(String projectId, String projectVersion) {
+	public ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut) {
 		ParamsManifestVO paramsManifestVO = paramsManifestEOMapper.getProjectById(projectId);
-		paramsManifestVO.setProjectName(paramsManifestVO.getProjectName() + "-" + projectVersion); // 项目名称加上 相关项目版本
+		String targetMarket = paramsManifestVO.getTargetMarket();//目标市场
+		if(StringUtils.isNotEmpty(targetMarket)){
+			List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+			targetMarket = getTargetMarket(cut, regionList, targetMarket);
+		}
+		paramsManifestVO.setProjectName(paramsManifestVO.getProjectName()+"-"+ targetMarket + "-" + projectVersion); // 项目名称加上 相关项目版本
 		return paramsManifestVO;
 	}
 
+	private String getTargetMarket(String cut, List<DictModel> regionList, String targetMarket) {
+		//适用地区
+		List<DictModel> dictModelList = new ArrayList<>();
+		String region = "";
+		if(com.jero.modules.system.util.StringUtils.isNotBlank(targetMarket)){
+			for (String s : targetMarket.split(",")) {
+				List<DictModel> dictModelListTemp = regionList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
+
+			if(dictModelList.size() != 0){
+				StringBuilder sb = new StringBuilder();
+				for (DictModel dictModel : dictModelList) {
+					if(CutEnum.CN.getValue().equals(cut)){
+						sb.append(dictModel.getText()+",");
+					}else{
+						sb.append(dictModel.getTextEn()+",");
+					}
+				}
+				if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){
+					region = sb.substring(0,sb.length()-1);
+				}
+			}
+		}
+		return region;
+	}
+
 	@Override
 	public List<Map<String, String>> labelListForProjectDetails(String projectId) {
 		return paramsManifestEOMapper.labelListForProjectDetails(projectId);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -113,6 +113,8 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 					row.setProjectName(row.getProjectName()+"-" +market+ "-00");
 				}
 				row.setPageName(row.getProjectName());
+			}else{
+				row.setPageName("");
 			}
 		}
 		String orderBy = paramsReportEO.getOrderBy();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java

@@ -11,7 +11,7 @@ public enum LawsStateEnum {
     ABOLISH("废止","2"),
     THE_UPCOMING("即将实施","3"),
     DRAFT("草稿","4"),
-    BE_REPLACED("被代替","5");
+    BE_REPLACED("被替代","5");
 
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -466,7 +466,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			dummyInventoryInfoEOList = stateSort(orderBy, orderByField, dummyInventoryInfoEOList, list);
 
 			//认证级别（WVTA，Com.-VTA，Cert.-Market，Reg.-Market,NA）
-			dummyInventoryInfoEOList = attestationRankSort(orderBy, orderByField, dummyInventoryInfoEOList, list);
+			dummyInventoryInfoEOList = attestationRankSort(orderBy, orderByField, dummyInventoryInfoEOList);
 
 			//责任领域
 			if("dutyTerritory".equals(orderByField)){
@@ -484,7 +484,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		return dummyInventoryInfoEOList;
 	}
 
-	private List<DummyInventoryInfoEO> attestationRankSort(String orderBy, String orderByField, List<DummyInventoryInfoEO> dummyInventoryInfoEOList, List<DummyInventoryInfoEO> list) {
+	private List<DummyInventoryInfoEO> attestationRankSort(String orderBy, String orderByField, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
+		List<DummyInventoryInfoEO> list = new LinkedList<>();
 		if(ObjectUtils.isNotEmpty(orderByField) && "attestationRank".equals(orderByField)){
 			List<DummyInventoryInfoEO> wvta = dummyInventoryInfoEOList.stream()
 					.filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.WVTA.getValue())).collect(Collectors.toList());
@@ -496,10 +497,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					.filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.REGU.getValue())).collect(Collectors.toList());
 			List<DummyInventoryInfoEO> na = dummyInventoryInfoEOList.stream()
 					.filter(e -> e.getAttestationRankStr().startsWith(AttestationRankEnum.NA.getValue())).collect(Collectors.toList());
+			List<DummyInventoryInfoEO> valueNull = dummyInventoryInfoEOList.stream()
+					.filter(e -> StringUtils.isBlank(e.getAttestationRankStr())).collect(Collectors.toList());
 
 
 			if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
 				//正序
+				list.addAll(valueNull);
 				list.addAll(wvta);
 				list.addAll(vta);
 				list.addAll(market);
@@ -513,6 +517,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				list.addAll(market);
 				list.addAll(vta);
 				list.addAll(wvta);
+				list.addAll(valueNull);
 			}
 		}
 		if(ObjectUtils.isNotEmpty(list)){
@@ -580,6 +585,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(shi4Yong4Fan4Wei2)){
 					String shi4Yong4Fan4Wei2_dictText = this.disposeShowDictItemValue(sysDictItems, shi4Yong4Fan4Wei2,cut, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getValue());
 					data.setShi4Yong4Fan4Wei2_dictText(shi4Yong4Fan4Wei2_dictText);
+					data.setShi4Yong4Fan4Wei2Str(shi4Yong4Fan4Wei2_dictText);
+				}else{
+					data.setShi4Yong4Fan4Wei2Str("");
 				}
 
 				// 状态
@@ -587,6 +595,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(state)){
 					String state_dictText = this.disposeShowDictItemValue(sysDictItems, state,cut, DummyInventoryBaseFieldEnum.STATE.getValue());
 					data.setState_dictText(state_dictText);
+					data.setStateStr(state_dictText);
+				}else{
+					data.setStateStr("");
 				}
 
 				// 实施类别
@@ -608,6 +619,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(attestationRank)){
 					String attestationRank_dictText = this.disposeShowDictItemValue(sysDictItems, attestationRank,cut, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue());
 					data.setAttestationRank_dictText(attestationRank_dictText);
+					data.setAttestationRankStr(attestationRank_dictText);
+				}else{
+					data.setAttestationRankStr("");
 				}
 
 				// 责任领域
@@ -615,6 +629,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				if(StringUtils.isNotEmpty(dutyTerritory)){
 					String dutyTerritory_dictText = this.disposeShowDictItemValue(sysDictItems, dutyTerritory,cut, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getValue());
 					data.setDutyTerritory_dictText(dutyTerritory_dictText);
+					data.setDutyTerritoryStr(dutyTerritory_dictText);
+				}else{
+					data.setDutyTerritoryStr("");
 				}
 
 				// 设计符合性-发起人
@@ -1191,42 +1208,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			List<SysCategory> categoryList = sysCategoryService.list();
 
 			for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
-				String shi4Yong4Fan4Wei2 = record.getShi4Yong4Fan4Wei2();
-				String state = record.getState();
-				String attestationRank = record.getAttestationRank();
-				String dutyTerritory = record.getDutyTerritory();
 				if(StringUtils.isBlank(record.getWvtaId())){
 					record.setWvtaId("");
 				}
-
-				//适用范围 apply_scope
-				if(StringUtils.isNotBlank(shi4Yong4Fan4Wei2)){
-					String applyScope = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, shi4Yong4Fan4Wei2, "apply_scope");
-					record.setShi4Yong4Fan4Wei2Str(applyScope);
-				}else{
-					record.setShi4Yong4Fan4Wei2Str("");
-				}
-				//状态  state
-				if(StringUtils.isNotBlank(state)){
-					String stateTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, state, "state");
-					record.setStateStr(stateTemp);
-				}else{
-					record.setStateStr("");
-				}
-				//认证级别 attestation_rank
-				if(StringUtils.isNotBlank(attestationRank)){
-					String attestationRankTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, attestationRank, "attestation_rank");
-					record.setAttestationRankStr(attestationRankTemp);
-				}else{
-					record.setAttestationRankStr("");
-				}
-				//责任领域  duty_territory
-				if(StringUtils.isNotBlank(dutyTerritory)){
-					String dutyTerritoryTemp = getItemText(dummyInventoryInfoEO.getCut(), sysDictItems, dutyTerritory, "duty_territory");
-					record.setDutyTerritoryStr(dutyTerritoryTemp);
-				}else{
-					record.setDutyTerritoryStr("");
-				}
 				//技术领域
 				if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
 					List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java

@@ -1605,10 +1605,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())){
 					List<SysDictItem> collect = dictItemList.stream()
 							.filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getDutyTerritory())).collect(Collectors.toList());
-					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					if(CollectionUtils.isNotEmpty(collect)){
-						projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText());
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-					}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getItemText());
-						projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName());
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							projectTaskInventoryEO.setDutyTerritoryName(collect.get(0).getEnName());
+						}
 					}
 				}else{
 					projectTaskInventoryEO.setDutyTerritoryName("");
@@ -1617,10 +1619,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 				if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){
 					List<SysDictItem> collect = certificationProgress.stream()
 							.filter(dict -> StringUtils.equals(dict.getItemValue(), projectTaskInventoryEO.getCertificationProgress())).collect(Collectors.toList());
-					if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+					if(CollectionUtils.isNotEmpty(collect)){
-						projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText());
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-					}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getItemText());
-						projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName());
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							projectTaskInventoryEO.setCertificationProgressName(collect.get(0).getEnName());
+						}
 					}
 				}else{
 					projectTaskInventoryEO.setCertificationProgressName("");