[修改] 标签回显

adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java

@@ -18,6 +18,7 @@ import com.adc.da.report.vo.ReportVo;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.adc.da.util.utils.FileUtil;
+import com.adc.da.util.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -469,13 +470,15 @@ public class ReportManageConroller {
         } catch (Exception ex) {
             log.info(ex.getMessage(),ex);
         }
-        ReportLogBook reportLog = new ReportLogBook();
-        reportLog.setId(UUID.randomUUID().toString().replaceAll("-",""));
-        reportLog.setReportId(repostId);
-        reportLog.setType(2);
-        reportLog.setUpdateTime(new Date());
-        reportLog.setUserId(UserUtils.getUserId());
-        reportLogBookDao.insert(reportLog);
+        if (StringUtils.isNotEmpty(repostId)){
+            ReportLogBook reportLog = new ReportLogBook();
+            reportLog.setId(UUID.randomUUID().toString().replaceAll("-",""));
+            reportLog.setReportId(repostId);
+            reportLog.setType(2);
+            reportLog.setUpdateTime(new Date());
+            reportLog.setUserId(UserUtils.getUserId());
+            reportLogBookDao.insert(reportLog);
+        }
     }
 
 

adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java

@@ -3,6 +3,8 @@ package com.adc.da.report.dao.mysql;
 import com.adc.da.report.eo.TreeLabelEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
 * @author ThinkBook
 * @description 针对表【ts_tree_label】的数据库操作Mapper
@@ -17,6 +19,8 @@ public interface TreeLabelDao extends BaseMapper<TreeLabelEntity> {
      * @return
      */
     double getMaxNum(String parentId);
+
+    List<String> selectIdByReport(String reportId);
 }
 
 

adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java

@@ -125,6 +125,4 @@ public class TtReportManageAct  {
     @TableField(exist = false)
     private List<String> labelList;
 
-    @TableField(exist = false)
-    private List<LabelEntity> labelEOList;
 }

adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java

@@ -93,4 +93,5 @@ public class TtReportManageActPageVO extends BasePageVO {
     private Integer delFlag;
 
     private List<PowerApplyActPageVO> powerList;
+
 }

adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -19,10 +19,10 @@
     <insert id="saveReportAct">
         insert into TT_REPORT_MANAGE (<include refid="BaseColumnList"/>)
         value (
-        #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.dataId},#{Vo.name},#{Vo.keyContent},#{Vo.mainContent},#{Vo.department},#{Vo.year},#{Vo.fileId},
         #{Vo.confidentialLevel},#{Vo.privacyLevel},
         #{Vo.createUserId},
-        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag},
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.delFlag},
         #{Vo.secrecyLast})
     </insert>
 

adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml

@@ -18,4 +18,9 @@
         from ts_tree_label t
         where t.parent_id = #{parentId}
     </select>
+    <select id="selectIdByReport" resultType="java.lang.String">
+        select lab.id from ts_tree_label lab
+        LEFT JOIN ts_report_label rl on lab.id = rl.label_id
+        where rl.report_id = #{reportId}
+    </select>
 </mapper>

adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml

@@ -22,10 +22,6 @@
         <result column="del_flag" property="delFlag" />
         <result column="secrecy_last" property="secrecyLast" />
         <result column="file_name" property="fileName" />
-        <collection property="labelEOList" ofType="com.adc.da.report.eo.LabelEntity">
-            <id column="lableId" property="id"/>
-            <result column="lableName" property="name"/>
-        </collection>
     </resultMap>
 
     <!--表名信息-->
@@ -129,10 +125,7 @@
         a.id,
         task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
-        ,label.label as lableName,label.id as labelId
         FROM <include refid="TableName"/> a
-             LEFT JOIN ts_report_label rl on rl.report_id = a.data_id
-             LEFT JOIN ts_tree_label label  on rl.label_id = label.id
         <where>
             data_id = #{dataId}
         </where>
@@ -142,10 +135,7 @@
         a.id,
         task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
-        ,label.label as lableName,label.id as labelId
         FROM <include refid="TableName"/> a
-        LEFT JOIN ts_report_label rl on rl.report_id = a.data_id
-        LEFT JOIN ts_tree_label label  on rl.label_id = label.id
         <where>
             prc_id = #{prcId}
         </where>

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -19,10 +19,10 @@
     <insert id="saveReportAct">
         insert into TT_REPORT_MANAGE (<include refid="BaseColumnList"/>)
         value (
-        #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.dataId},#{Vo.name},#{Vo.keyContent},#{Vo.mainContent},#{Vo.department},#{Vo.year},#{Vo.fileId},
         #{Vo.confidentialLevel},#{Vo.privacyLevel},
         #{Vo.createUserId},
-        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag},
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.delFlag},
         #{Vo.secrecyLast})
     </insert>
 
@@ -229,4 +229,22 @@
     </select>
 
 
+    <select id="reportDetail" resultType="com.adc.da.report.vo.ReportDetailVo">
+        SELECT
+            rm.id AS id,
+            rm.name AS `name`,
+            rm.createUserId AS createUserId,
+            u.USNAME AS uploaderName,
+            rm.keycontent AS keycontent,
+            rm.maincontent AS maincontent,
+            rm.department AS departmentName,
+            rm.`year` AS `year`,
+            rm.fileId AS fileId,
+            rm.confidentialLevel AS confidentialLevel,
+            rm.privacyLevel AS privacyLevel
+        FROM `tt_report_manage` AS rm
+            INNER JOIN ts_user AS u ON u.USID = rm.createUserId
+            WHERE rm.id = #{reportId}
+            AND rm.del_flag = 0
+    </select>
 </mapper>

adc-da-report/target/classes/mybatis/mapper/mysql/TreeLabelDao.xml

@@ -18,4 +18,9 @@
         from ts_tree_label t
         where t.parent_id = #{parentId}
     </select>
+    <select id="selectIdByReport" resultType="java.lang.String">
+        select lab.id from ts_tree_label lab
+        LEFT JOIN ts_report_label rl on lab.id = rl.label_id
+        where rl.report_id = #{reportId}
+    </select>
 </mapper>

adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml

@@ -22,10 +22,6 @@
         <result column="del_flag" property="delFlag" />
         <result column="secrecy_last" property="secrecyLast" />
         <result column="file_name" property="fileName" />
-        <collection property="labelEOList" ofType="com.adc.da.report.eo.LabelEntity">
-            <id column="lableId" property="id"/>
-            <result column="lableName" property="name"/>
-        </collection>
     </resultMap>
 
     <!--表名信息-->
@@ -129,10 +125,7 @@
         a.id,
         task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
-        ,label.label as lableName,label.id as labelId
         FROM <include refid="TableName"/> a
-             LEFT JOIN ts_report_label rl on rl.report_id = a.data_id
-             LEFT JOIN ts_tree_label label  on rl.label_id = label.id
         <where>
             data_id = #{dataId}
         </where>
@@ -142,10 +135,7 @@
         a.id,
         task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
-        ,label.label as lableName,label.id as labelId
         FROM <include refid="TableName"/> a
-        LEFT JOIN ts_report_label rl on rl.report_id = a.data_id
-        LEFT JOIN ts_tree_label label  on rl.label_id = label.id
         <where>
             prc_id = #{prcId}
         </where>