浏览代码

报表分享增加显示报表名称

isqianming 11 月之前
父节点
当前提交
aac01e50ea

+ 2 - 0
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/dto/ReportShareDto.java

@@ -38,6 +38,8 @@ public class ReportShareDto extends GaeaBaseDTO implements Serializable {
     /** 报表编码 */
     @NotEmpty(message = "6002")
     private String reportCode;
+    /** 报表名称 */
+    private String reportName;
 
     /** 0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG */
     private Integer enableFlag;

+ 4 - 0
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/param/ReportShareParam.java

@@ -23,6 +23,10 @@ public class ReportShareParam extends PageParam implements Serializable {
     @Query(value = QueryEnum.LIKE)
     private String reportCode;
 
+    /** 报表名称 */
+    @Query(value = QueryEnum.LIKE)
+    private String reportName;
+
     /** 分享有效期类型 */
     @Query(value = QueryEnum.EQ)
     private String shareValidType;

+ 2 - 0
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/dao/entity/ReportShare.java

@@ -32,6 +32,8 @@ public class ReportShare extends GaeaBaseEntity {
 
     /** 报表编码 */
     private String reportCode;
+    /** 报表编码 */
+    private String reportName;
 
     /** 0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG */
     private Integer enableFlag;

+ 7 - 0
report-core/src/main/resources/db/migration/V1.4.3__update.sql

@@ -0,0 +1,7 @@
+-- 分享表增加report_name
+ALTER TABLE `aj_report`.`gaea_report_share` ADD `report_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '名称' AFTER `report_code`;
+
+-- 更新report_name
+UPDATE `aj_report`.`gaea_report_share` t1
+    INNER JOIN `aj_report`.`gaea_report` t2 on t1.report_code=t2.report_code
+    SET t1.report_name=t2.report_name;

+ 2 - 0
report-ui/src/views/bigscreenDesigner/share/shareConfig.vue

@@ -139,6 +139,7 @@ export default {
       dialogForm: {
         shareValidType: 0,
         reportCode: "",
+        reportName: "",
         reportType: "",
         shareUrl: "",
         shareCode: "",
@@ -182,6 +183,7 @@ export default {
     async createShare() {
       this.dialogForm.reportType = this.reportType;
       this.dialogForm.reportCode = this.reportCode;
+      this.dialogForm.reportName = this.reportName;
       this.dialogForm.shareUrl = window.location.href;
       const { code, data } = await reportShareAdd(this.dialogForm);
       if (code != "200") return;

+ 3 - 1
report-ui/src/views/excelreport/share/shareConfig.vue

@@ -1,5 +1,5 @@
 <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: Devli
  * @Date: 2021-7-18 18:23:24
  * @Last Modified by:   qianlishi
@@ -138,6 +138,7 @@ export default {
       dialogForm: {
         shareValidType: 0,
         reportCode: "",
+        reportName: "",
         reportType: "",
         shareUrl: "",
         shareCode: "",
@@ -181,6 +182,7 @@ export default {
     async createShare() {
       this.dialogForm.reportType = this.reportType;
       this.dialogForm.reportCode = this.reportCode;
+      this.dialogForm.reportName = this.reportName;
       this.dialogForm.shareUrl = window.location.href;
       const { code, data } = await excelShareAdd(this.dialogForm);
       if (code != "200") return;

+ 16 - 0
report-ui/src/views/shareManage/index.vue

@@ -43,6 +43,11 @@ export default {
             label: "报表编码",
             field: "reportCode"
           },
+          {
+            inputType: "input",
+            label: "报表名称",
+            field: "reportName"
+          },
           {
             inputType: "anji-select",
             anjiSelectOption: {
@@ -132,6 +137,17 @@ export default {
             ],
             disabled: false,
           },
+          {
+            label: '报表名称',
+            placeholder: '',
+            field: 'reportName',
+            editField: 'reportName',
+            inputType: 'input',
+            rules: [
+              { min: 1, max: 50, message: '不超过50个字符', trigger: 'blur' }
+            ],
+            disabled: false,
+          },
           {
             label: '分享编码',//分享编码,系统生成,默认UUID
             placeholder: '',