From 54e6fa0c0942f8e4cb6f866d5886235a808314fe Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Thu, 11 May 2023 15:27:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=B8=8A=E4=BC=A0=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8A=BD=E5=8F=96&=E5=85=A8=E6=96=87?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IReportContentServiceImpl.java     |  1 +
 .../service/impl/ITtReportManageActServiceImpl.java | 13 +++++++++++++
 .../mybatis/mapper/mysql/ReportManageMapper.xml     | 10 ++++++----
 .../adc/da/wkflow/listener/SCBG/oneApplyAfter.java  |  3 +--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
index d0a545e..dac4d3f 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
@@ -73,6 +73,7 @@ public class IReportContentServiceImpl extends ServiceImpl<ReportContentDao, Rep
         ReportContentEntity reportContentEntity = new ReportContentEntity(UUID.randomUUID10(), reportId, content);
         save(reportContentEntity);
         //将文件删除
+        outputStream.close();
         FileUtil.deleteFile(path);
     }
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
index e110bd2..76c8d5f 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
@@ -5,6 +5,7 @@ import com.adc.da.report.dao.mysql.PowerApplyDao;
 import com.adc.da.report.dao.mysql.ReportDao;
 import com.adc.da.report.dao.mysql.TtReportManageActDao;
 import com.adc.da.report.eo.TtReportManageAct;
+import com.adc.da.report.service.IReportContentService;
 import com.adc.da.report.service.ITtReportManageActService;
 import com.adc.da.report.vo.DeleteParamRequestVO;
 import com.adc.da.report.vo.TtReportManageActPageVO;
@@ -17,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +39,9 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
     @Autowired
     PowerApplyDao powerApplyDao;
 
+    @Resource
+    private IReportContentService iReportContentService;
+
     /**
      * @param ttReportManageActPageVO
      * @return <com.adc.da.report.entity.TtReportManageAct>
@@ -120,6 +126,13 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
 
     @Override
     public void saveReport(TtReportManageAct ttReportManageAct) {
+        //插入报表内容表
+        try {
+            iReportContentService.insertReportContent(ttReportManageAct.getId(), ttReportManageAct.getFileId());
+            log.info("抽取报告内容");
+        } catch (IOException e) {
+            log.error("获取报告内容失败", e);
+        }
         //保存报告
         reportDao.saveReportAct(ttReportManageAct);
     }
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
index bbf0338..abd0d30 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -115,6 +115,7 @@
         AVG( trur.user_rating ) AS reportRating
         FROM
         TT_REPORT_MANAGE eo
+        LEFT JOIN ts_report_content rc ON eo.id = rc.report_id
         LEFT JOIN ts_user tu ON tu.USID = eo.createUserId
         LEFT JOIN tr_report_user ru ON eo.id = ru.reportId
         LEFT JOIN (SELECT report_id, COUNT(id) AS thumbUp FROM report_log_book WHERE type = 3 GROUP BY report_id) AS thumbUpCount ON eo.id = thumbUpCount.report_id
@@ -123,13 +124,14 @@
         LEFT JOIN ts_report_user_rating AS trur ON eo.id = trur.report_id
         WHERE
         eo.DEL_FLAG = 0
-
+        <!--全文模糊搜索-->
+        <if test="pageVO.keyContent !='' and pageVO.keyContent != null">
+            and rc.report_content like  CONCAT(CONCAT('%',#{pageVO.keyContent}),'%')
+        </if>
         <if test="pageVO.name !='' and pageVO.name != null">
             and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
         </if>
-        <if test="pageVO.keyContent !='' and pageVO.keyContent != null">
-            and keycontent like  CONCAT(CONCAT('%',#{pageVO.keyContent}),'%')
-        </if>
+
         <!--年份搜索-->
         <if test="pageVO.year != null and pageVO.year.size() > 0">
             and year in
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
index dd06590..3fec1fc 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
+++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
@@ -57,8 +57,7 @@ public class oneApplyAfter implements TaskListener {
         // 1: 同意 2：退回
         delegateTask.setVariable("flag",s);
         if ("1".equals(s)){
-//            ttReportManageActService.saveReport(ttReportManageAct);
-            reportDao.saveReportAct(ttReportManageAct);
+            ttReportManageActService.saveReport(ttReportManageAct);
         }
 
     }