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

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

@@ -1110,4 +1110,8 @@ INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `c
 INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567711460491968513', '1539780399024934914', '法规意见-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryComments:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:08:34', NULL, NULL, 0, 0, '1', 0, 'Regulatory Comments - delete');
 
 -- 上报库删除按钮 2022-09-14已同步生产环境
-INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');
+
+-- 上报库 添加项目目标市场 2022-09-19
+ALTER TABLE `laws_weilai`.`params_report`
+    ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`;

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

@@ -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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java

@@ -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;

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

@@ -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);
 	}
 

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

@@ -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; // 项目名称-国家-清单名称
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml

@@ -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>
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java

@@ -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);
 				}