From 41f3aec37e26427795bae3045a6aee4bbb2dc504 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Wed, 17 May 2023 10:57:38 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=B0=E8=8D=89=E7=A8=BF=20=E5=9B=A0dataId=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E5=81=B6=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/report/eo/TtReportManageAct.java  |  6 ++++++
 .../mybatis/mapper/mysql/TtReportManageActMapper.xml  | 11 ++++++++---
 .../service/ActivitDefineService.java                 |  7 +++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
index cf7a689..e6fa1af 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
@@ -40,6 +40,12 @@ public class TtReportManageAct  {
     @TableField("data_id")
     private String dataId;
 
+    /**
+     * 报告id
+     */
+    @TableField("report_id")
+    private String reportId;
+
     /**
      * 报告名
      */
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
index 7df639f..3047e60 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
@@ -8,6 +8,7 @@
         <result column="task_id" property="taskId" />
         <result column="prc_id" property="prcId" />
         <result column="data_id" property="dataId" />
+        <result column="report_id" property="reportId" />
         <result column="name" property="name" />
         <result column="keycontent" property="keyContent" />
         <result column="maincontent" property="mainContent" />
@@ -33,7 +34,8 @@
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
         id,
-        task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+        task_id, prc_id, data_id,report_id ,name, keycontent, maincontent, department, year, fileId, confidentialLevel,
+        privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
     </sql>
 
@@ -51,6 +53,9 @@
                 <if test="pageVO.dataId !=null and pageVO.dataId !=''">
                     AND data_id LIKE CONCAT(CONCAT('%',#{pageVO.dataId}),'%')
                 </if>
+                <if test="pageVO.reportId !=null and pageVO.reportId !=''">
+                    AND report_id LIKE CONCAT(CONCAT('%',#{pageVO.reportId}),'%')
+                </if>
                 <if test="pageVO.name !=null and pageVO.name !=''">
                     AND name LIKE CONCAT(CONCAT('%',#{pageVO.name}),'%')
                 </if>
@@ -128,7 +133,7 @@
     <select id="selectByDataId" resultMap="BaseResultMap">
         SELECT
         a.id,
-        task_id, prc_id, data_id, name, keycontent, maincontent, department,
+        task_id, prc_id, data_id,report_id, name, keycontent, maincontent, department,
         org.LONG_NAME as departmentName,
                year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
@@ -141,7 +146,7 @@
     <select id="selectByPrcId"  resultMap="BaseResultMap">
         SELECT
         a.id,
-        task_id, prc_id, data_id, name, keycontent, maincontent, department,
+        task_id, prc_id, data_id,report_id, name, keycontent, maincontent, department,
         org.LONG_NAME as departmentName,
         year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java
index 375a2cb..dacca21 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java
+++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java
@@ -51,6 +51,13 @@ public class ActivitDefineService {
         if (StringUtils.isBlank(reportId)){
             reportId = UUID.randomUUID().toString().replace("-","");
         }
+        /**
+         *  prcId为空时,是指保存到草稿 ，dataJson是有reportId的,
+         *  此时 给reportId一个唯一值，是为了付给 dataId
+         */
+        if (StringUtils.isBlank(prcId)){
+            reportId = UUID.randomUUID().toString().replace("-","");
+        }
         if ("".equals(prcType)){
             // 保存到草稿 ，没有选择 要申请的权限
             PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class);