Merge branch 'fix_20240122_UAT' into 'master'

Fix 20240122 uat

See merge request laws-nio/laws-weilai!370

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java

@@ -18,4 +18,9 @@ public interface TodoCenterMapper {
     Integer countSdtDre(@Param("userName") String userName);
 
     Integer countState(@Param("manifestId") String manifestId);
+
+    int listForTodoCenter(@Param("state") String state,
+                              @Param("userId") String userId,
+                              @Param("userName") String userName,
+                              @Param("projectStatus") String projectStatus);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml

@@ -54,4 +54,40 @@
             select id from params_collect_manifest where params_manifest_id = #{manifestId} and state in('7','8')
             )
     </select>
+
+    <select id="listForTodoCenter" resultType="java.lang.Integer">
+        select count(*) from(
+        select
+        pm.id as id,
+        pm.title as title,
+        pm.state as state,
+        pm.project_version_id as project_id,
+        pm.create_time as create_time,
+        pm.version as version,
+        concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name,
+        plb.project_status
+        from params_manifest pm
+        left join project_library_base as plb on plb.id = pm.project_version_id
+        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
+        where plb.project_status !=#{projectStatus}
+        ) tmp_tb
+        where 1=1 and state = #{state}
+        and id in(
+        SELECT pm.id AS pm FROM params_manifest pm
+        JOIN ( SELECT id FROM
+        ( SELECT id,substring_index( substring_index( a.certification_engineer, ',', b.help_topic_id + 1 ), ',',- 1 ) user_id
+        FROM
+        project_library_base a
+        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
+        WHERE user_id = #{userId}) a ON pm.project_version_id = a.id
+
+        UNION
+        SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5')
+
+        UNION
+        SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE dre = #{userName} and state in('4','7')
+        )
+
+    </select>
 </mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java

@@ -1,18 +1,25 @@
 package com.jero.modules.system.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysPermission;
 import com.jero.modules.system.entity.SysPermissionDataRule;
-import com.jero.modules.system.mapper.*;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.mapper.SysDepartPermissionMapper;
+import com.jero.modules.system.mapper.SysDepartRolePermissionMapper;
+import com.jero.modules.system.mapper.SysPermissionMapper;
+import com.jero.modules.system.mapper.SysRolePermissionMapper;
+import com.jero.modules.system.mapper.TodoCenterMapper;
 import com.jero.modules.system.model.TreeModel;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysPermissionDataRuleService;
 import com.jero.modules.system.service.ISysPermissionService;
 import org.apache.shiro.SecurityUtils;
@@ -27,6 +34,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -41,7 +49,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 
 	@Resource
 	private SysPermissionMapper sysPermissionMapper;
-	
+
 	@Resource
 	private ISysPermissionDataRuleService permissionDataRuleService;
 
@@ -57,6 +65,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 	@Autowired
 	private TodoCenterMapper todoCenterMapper;
 
+	@Autowired
+	private ISysDictService sysDictService;
+
 	@Override
 	public List<TreeModel> queryListByParentId(String parentId) {
 		return sysPermissionMapper.queryListByParentId(parentId);
@@ -96,10 +107,10 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 		//删除部门角色授权
 		sysDepartRolePermissionMapper.deleteByMap(map);
 	}
-	
+
 	/**
 	 * 根据父id删除其关联的子节点数据
-	 * 
+	 *
 	 * @return
 	 */
 	public void removeChildrenBy(String parentId) {
@@ -134,7 +145,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 			}
 		}
 	}
-	
+
 	/**
 	  * 逻辑删除
 	 */
@@ -197,7 +208,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 			}
 			//----------------------------------------------------------------------
 			this.updateById(sysPermission);
-			
+
 			//如果当前菜单的父菜单变了，则需要修改新父菜单和老父菜单的，叶子节点状态
 			String pid = sysPermission.getParentId();
 			if((oConvertUtils.isNotEmpty(pid) && !pid.equals(p.getParentId())) || oConvertUtils.isEmpty(pid)&&oConvertUtils.isNotEmpty(p.getParentId())) {
@@ -210,10 +221,10 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 						this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
 					}
 				}
-				
+
 			}
 		}
-		
+
 	}
 
 	@Override
@@ -230,7 +241,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 		query.eq(SysPermissionDataRule::getPermissionId, id);
 		int countValue = this.permissionDataRuleService.count(query);
 		if(countValue > 0) {
-			this.permissionDataRuleService.remove(query);	
+			this.permissionDataRuleService.remove(query);
 		}
 	}
 
@@ -268,21 +279,30 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 	@Override
 	public boolean judgeToDo() {
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
-		int count = todoCenterMapper.countSdtDre(loginUser.getUsername());
-		if (count > 0) {
+//		int count = todoCenterMapper.countSdtDre(loginUser.getUsername());
+//		if (count > 0) {
+//			return true;
+//		}
+//
+//		List<String> manifestIdList = todoCenterMapper.listInfoHomo(loginUser.getId(),"收集中");
+//		if(CollectionUtil.isNotEmpty(manifestIdList)) {
+//			for (int i = 0; i < manifestIdList.size(); i++) {
+//				int coutState = todoCenterMapper.countState(manifestIdList.get(i));
+//				if (coutState > 0) {
+//					return true;
+//				}
+//			}
+//		}
+
+		List<DictModel> projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode());
+		projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList());
+		String state = "收集中";
+		String userId = loginUser.getId();
+		String userName = loginUser.getUsername();
+		int count = todoCenterMapper.listForTodoCenter(state, userId, userName, projectStatus.get(0).getValue());
+		if(count > 0){
 			return true;
 		}
-
-		List<String> manifestIdList = todoCenterMapper.listInfoHomo(loginUser.getId(),"收集中");
-		if(CollectionUtil.isNotEmpty(manifestIdList)) {
-			for (int i = 0; i < manifestIdList.size(); i++) {
-				int coutState = todoCenterMapper.countState(manifestIdList.get(i));
-				if (coutState > 0) {
-					return true;
-				}
-			}
-		}
-
 		return false;
 	}
 

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

@@ -164,8 +164,8 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	}
 
     @ApiOperation(value = "参数清单-更新模板", notes = "参数清单-更新模板更新参数")
-    @PostMapping(value = "/updateModel")
-    public Result<?> updateModel(String mid, String version,String cid) {
+    @GetMapping(value = "/updateModel")
+    public Result<?> updateModel(@RequestParam(name="mid",required=true) String mid, @RequestParam(name="version",required=true) String version,@RequestParam(name="cid",required=true) String cid) {
         boolean isSuccess = paramsManifestEOService.updateModel(mid,version, cid);
         if (isSuccess) {
             return Result.OK("更新成功！");

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

@@ -166,13 +166,13 @@
         pm.id as id,
         pm.title as title,
         pm.state as state,
-        pm.project_id as project_id,
+        pm.project_version_id as project_id,
         pm.create_time as create_time,
         pm.version as version,
         concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name,
         plb.project_status
         from params_manifest pm
-        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_library_base as plb on plb.id = pm.project_version_id
         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
         ) tmp_tb
@@ -184,7 +184,7 @@
                     FROM
                     project_library_base a
                     JOIN mysql.help_topic b ON b.help_topic_id < ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                    WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                    WHERE user_id = #{userId}) a ON pm.project_version_id = a.id
 
                 UNION
                 SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5')

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

@@ -1937,6 +1937,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             fieldList.addAll(onlCgformFieldList);
         }
         ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
+//        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.queryById(paramsManifestEO.getProjectId(), cut);
+//        if(ObjectUtils.isNotEmpty(projectLibraryBaseList)){
+//            if(StringUtils.isBlank(projectLibraryBaseList.get(0).getProjectVersion())){
+//                projectName = projectLibraryBaseList.get(0).getProjectName()+"-00";
+//            }else{
+//                projectName = projectLibraryBaseList.get(0).getProjectName()+"-"+projectLibraryBaseList.get(0).getProjectVersion();
+//            }
+//        }
+
+
         List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
         List<Map<String, Object>> listConfig = new LinkedList<>();
         for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
@@ -2006,7 +2016,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         String[] references = projectName.split("-");
                         // map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
 //                        map.put("db_field_txt", paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
-                        map.put("db_field_txt", onlCgformField.getDbFieldTxt()+projectName+" "+paramsManifestEO.getReferencesColName());//字段中文名
+                        map.put("db_field_txt", onlCgformField.getDbFieldTxt()+" "+paramsManifestEO.getReferencesColName());//字段中文名
+//                        map.put("db_field_txt", onlCgformField.getDbFieldTxt()+projectName+" "+paramsManifestEO.getReferencesColName());//字段中文名
                         map.put("db_field_id", paramsManifestEO.getReferencesColId());
                         map.put("references_col", true);
                     } else {
@@ -4838,6 +4849,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
         String projectId = paramsCollectManifestVO.getProjectId();
         String cut = paramsCollectManifestVO.getCut();
+        String sdt = paramsCollectManifestVO.getSdt();
         LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
         // 查询参数清单
@@ -4860,23 +4872,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
                 updateEO.setId(paramsCollectManifestEO.getId());
                 updateEO.setDutyTerritory(dutyTerritory);
-
-                // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
-                ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), dutyTerritory);
-                if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
-                    String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
-                    if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
-                        SysUser sysUser = sysUserService.getById(sdtId);
-                        if (ObjectUtil.isNotEmpty(sysUser)) {
-                            updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+                if(StringUtils.isNotBlank(sdt)){
+                    SysUser sysUser = sysUserService.getById(sdt);
+                    updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+                }else{
+                    // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+                    ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectVersionId(), dutyTerritory);
+                    if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+                        String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+                        if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+                            SysUser sysUser = sysUserService.getById(sdtId);
+                            if (ObjectUtil.isNotEmpty(sysUser)) {
+                                updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+                            } else {
+                                updateEO.setSdt(""); // 设置工程接口人
+                            }
                         } else {
                             updateEO.setSdt(""); // 设置工程接口人
                         }
                     } else {
                         updateEO.setSdt(""); // 设置工程接口人
                     }
-                } else {
-                    updateEO.setSdt(""); // 设置工程接口人
                 }
 
                 updateEOList.add(updateEO);

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

@@ -1173,7 +1173,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
         return paramsManifestVO;
     }
 
-    private String getTargetMarket(String cut, List<DictModel> regionList, String targetMarket) {
+    public String getTargetMarket(String cut, List<DictModel> regionList, String targetMarket) {
         //适用地区
         List<DictModel> dictModelList = new ArrayList<>();
         String region = "";

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

@@ -10,6 +10,7 @@ import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
 import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService;
+import com.jero.modules.cert.collect.service.impl.ParamsManifestEOServiceImpl;
 import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
@@ -86,6 +87,8 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 	private IParamsConfigDataHistoryEOService paramsConfigDataHistoryEOService;
 	@Autowired
 	private ISysUserService sysUserService;
+	@Autowired
+	private ParamsManifestEOServiceImpl paramsManifestEOService;
 
 
 
@@ -213,7 +216,25 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		 IPage page = new Page(pageNo, pageSize);
 		 IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
 		 List<ParamsReportEO> rows = pageList.getRecords();
+//		 List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		 for (ParamsReportEO row : rows) {
+		 	//
+//			 String targetMarket = "";
+//			 if(CutEnum.CN.getValue().equals(paramsReportEO.getCut())){
+//				 targetMarket = paramsManifestEOService.getTargetMarket(CutEnum.CN.getValue(), regionList, row.getTargetMarket());
+//			 }else{
+//				 targetMarket = paramsManifestEOService.getTargetMarket(CutEnum.EN.getValue(), regionList, row.getTargetMarket());
+//			 }
+//			 row.setTargetMarketName(targetMarket);
+			 String version = "";
+			 if(StringUtils.isBlank(row.getProjectVersion())){
+				 version = "00";
+			 }else{
+				 version = row.getProjectVersion();
+			 }
+			 row.setProjectNameAll(row.getProjectName() + "-" +row.getTargetMarket());
+//			 row.setProjectNameAll(row.getProjectName() + "-" +row.getTargetMarket()+"-"+version);
+
 			 // 项目名称-国家-清单名称
 			 row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
 			 // 设置配置

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java

@@ -75,12 +75,18 @@ public class ParamsReportEO implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String projectName;
 
+    private String projectNameAll;
+
     @ApiModelProperty(value = "清单标题")
     private String title;
 
     @ApiModelProperty(value = "目标市场")
     private String targetMarket;
 
+    @ApiModelProperty(value = "目标市场中英文转换")
+    @TableField(exist = false)
+    private String targetMarketName;
+
     @ApiModelProperty(value = "相关项目版本")
     private String projectVersion;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -2307,23 +2307,53 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 //                    else {
 //                        toBeMatched++;
 //                    }
-                    if (StringUtils.isBlank(oma.getAttestationSchedule()) || oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())) {
+//                    if (StringUtils.isBlank(oma.getAttestationSchedule()) || oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())) {
+                    if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         notStart++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.IN_PROGRESS.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.IN_PROGRESS.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                               || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         inProgress++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_PASSED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_PASSED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         testPassed++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_FAILED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_FAILED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         testFailed++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                               || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         notSubmitted++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         submitted++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         stored++;
-                    } else {
-                        notStart++;
                     }
+//                    else {
+//                        notStart++;
+//                    }
                 }
 
                 Map<String, Object> statisticalMap = new HashMap<>();

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -72,6 +72,8 @@
                   <a-select
                     mode="multiple"
                     class="box-input"
+                    optionFilterProp="children"
+                    :filter-option="filterOption"
                     :value="evaluatorIds"
                     @change='evaluatorIdsChange'
                     :placeholder="$t('PleaseSelect')+$t('Assessor')"
@@ -137,6 +139,7 @@
       </div>
     </div>
     <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <JLoading :loading="searchJLoading">{{this.$t('loading')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
@@ -277,6 +280,7 @@
           }
         ],
         evaluatorIdsNameOptions: [],
+        searchJLoading:false,
       }
     },
     mounted() {
@@ -304,12 +308,19 @@
           return this.evaluatorIdsNameOptions = []
         }
         const query = { documentId: this.selectedRowKeysRecord[0].id }
+        this.searchJLoading = true
         getAction(this.url.getEvaluatorList, query).then((res) => {
           if (res.success) {
             this.evaluatorIdsNameOptions = res.result
           }
+          this.searchJLoading = false
         })
       },
+      filterOption(input, option) {
+        return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        );
+      },
       disabledDate(current) {
         return current && current < moment().subtract(1, 'day')
       },

jero-web/src/views/parameter/ParameterTemplate/components/syncToList.vue

@@ -175,7 +175,7 @@
               version:this.dataQuery.version,
             }
             this.confirmLoading = true
-            postAction('/params/manifest/updateModel', query).then((res) => {
+            getAction('/params/manifest/updateModel', query).then((res) => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.visible = false

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -73,6 +73,8 @@
                       <a-select
                         class="box-input"
                         mode="multiple"
+                        optionFilterProp="children"
+                        :filterOption="filterOption"
                         v-model="formInline.dutyTerritory"
                         :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')">
                         <a-select-option
@@ -2237,6 +2239,9 @@
         this.selectedValue = this.checkedList
         this.indeterminate = false
       },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
       getcustomizeList(item) {
         let params = {
           paramsManifestId: this.$route.query.id,

jero-web/src/views/projectManagement/dialog/parametercolumn.vue

@@ -312,7 +312,7 @@
               let postDate = {
                 paramsReportId: this.selectedRowKeys[0],
                 paramsReportConfigId: this.selectedRowKeysDate[0].configure,
-                paramsReportConfigName:this.paramsReportConfigName,
+                paramsReportConfigName:this.selectedRowKeysDate[0].projectNameAll + ' ' + this.paramsReportConfigName,
                 paramsManifestId:this.$route.query.id,
               }
                 //新增

jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue

@@ -106,11 +106,12 @@
 
       RelatedItemsClick(item) {
         if(this.platform == 'YES'){
+          //+'-'+item.projectVersion
           let newUrl = this.$router.resolve({
             path: '/platformItemLibraryDetails',
             query: {
               id: item.id,
-              projectName: item.projectName+'-'+item.projectVersion,
+              projectName: item.projectName,
               projectNameId: item.projectName,
               targetMarket: item.targetMarket,
               studioEngineer: item.studioEngineer
@@ -118,11 +119,12 @@
           })
           window.open(newUrl.href, '_blank')
         }else{
+          //+'-'+item.projectVersion
           let newUrl = this.$router.resolve({
             path: '/ProjectDetails',
             query: {
               id: item.projectLibraryId,
-              projectName: item.projectName+'-'+item.projectVersion,
+              projectName: item.projectName,
               projectNameId: item.projectNameId,
               targetMarket: item.targetMarket,
               studioEngineer: item.studioEngineer