认证-上报库-查看: 返回左上角页面名称

This commit is contained in:
liyawei
2022-09-19 14:23:10 +08:00
parent e112d0bb7b
commit 194eba9d07
7 changed files with 21 additions and 2 deletions
@@ -100,6 +100,7 @@
pm.id as id,
pm.version as version,
pm.title as title,
plb.target_market as target_market,
concat(pni.project_name,'-',pyni.year_name) as project_name
from params_manifest pm
left join project_library_base as plb on plb.id = pm.project_id
@@ -1,6 +1,5 @@
package com.jero.modules.cert.collect.vo;
import io.swagger.models.auth.In;
import lombok.Data;
/**
@@ -15,6 +14,7 @@ public class ParamsManifestVO {
private String title;
private Integer version;
private String projectName;
private String targetMarket;
private String projectId;
private String state;
private String paramsTemplateName;
@@ -69,6 +69,10 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
List<ParamsReportEO> rows = pageList.getRecords();
for (ParamsReportEO row : rows) {
row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
}
return Result.OK(pageList);
}
@@ -1,6 +1,7 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,4 +76,10 @@ public class ParamsReportEO implements Serializable {
@ApiModelProperty(value = "清单标题")
private String title;
@ApiModelProperty(value = "目标市场")
private String targetMarket;
@TableField(exist = false)
private String pageName; // 项目名称-国家-清单名称
}
@@ -15,6 +15,7 @@
<result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
<result column="project_name" property="projectName" />
<result column="title" property="title" />
<result column="target_market" property="targetMarket" />
</resultMap>
<sql id="BaseColumnList">
@@ -27,6 +28,7 @@
pr.update_by as update_by,
pr.update_time as update_time,
if (pm.title is not null, pm.title, pr.title) as title,
if (plb.target_market is not null, plb.target_market, pr.target_market) as target_market,
if (pni.project_name is not null, concat(pni.project_name,'-', pyni.year_name), pr.project_name) as project_name
</sql>
@@ -184,6 +184,7 @@ public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper,
updateEO.setId(paramsReportEO.getId());
updateEO.setTitle(paramsManifestVO.getTitle());
updateEO.setProjectName(paramsManifestVO.getProjectName());
updateEO.setTargetMarket(paramsManifestVO.getTargetMarket());
updateEOList.add(updateEO);
}