WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数项收集清单--设置参考列

Browse Source
This commit is contained in:
zhn
2024-01-17 16:10:31 +08:00
parent 2851d76cf2
commit 42379645b9
5 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+12 -1
View File
@@ -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 {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+1 -1
View File
@@ -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
+20
View File
@@ -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,24 @@ 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()+"-"+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
+6
View File
@@ -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-web/src/views/projectManagement/dialog/parametercolumn.vue
+1 -1
View File
@@ -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,
}
//新增