From 5d9c442cc2c5b3bf5154ebb07283fe8823a33ff1 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 25 May 2023 10:15:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=A4=9A=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=E4=B8=8A=E4=BC=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/dao/mysql/ReportFileDao.java | 4 +++- .../java/com/adc/da/report/eo/ReportFile.java | 4 ---- .../service/impl/IReportServiceImpl.java | 1 + .../impl/ITtReportManageActServiceImpl.java | 19 ++----------------- .../mybatis/mapper/mysql/ReportFileMapper.xml | 11 ++++++----- .../service/ActivitDefineService.java | 3 --- 6 files changed, 12 insertions(+), 30 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportFileDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportFileDao.java index 709a416..571b189 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportFileDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportFileDao.java @@ -8,5 +8,7 @@ public interface ReportFileDao extends BaseMapper { void delByReportId(@Param("pageVO") ReportFile reportFile); - void actEndDelReport(@Param("pageVO")ReportFile reportFile1); + void actEndDelReport(@Param("reportId")String reportId); + + void updateState(@Param("reportId")String dataId); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportFile.java b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportFile.java index 9472755..b2d049c 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportFile.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportFile.java @@ -1,6 +1,5 @@ package com.adc.da.report.eo; -import com.adc.da.login.util.UserUtils; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -28,8 +27,6 @@ public class ReportFile { @TableField("state") private Integer state; - @TableField("user_id") - private String userId; @@ -47,7 +44,6 @@ public class ReportFile { public ReportFile(String reportId,Integer state){ this.reportId = reportId; this.state = state; - this.userId = UserUtils.getUserId(); } public ReportFile(){ diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 08ad463..ee0a49c 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -177,6 +177,7 @@ public class IReportServiceImpl extends ServiceImpl } //插入报表内容表 try { + //TODO FILE iReportContentService.insertReportContent(reportId, reportEntity.getFileId()); log.info("抽取报告内容"); } catch (IOException e) { 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 b11fc47..9790b9b 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 @@ -9,7 +9,6 @@ import com.adc.da.report.dao.mysql.ReportFileDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.LogEntity; import com.adc.da.report.eo.ReportEntity; -import com.adc.da.report.eo.ReportFile; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.ILogService; import com.adc.da.report.service.IReportContentService; @@ -32,7 +31,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.UUID; /** * @author bu @@ -162,21 +160,8 @@ public class ITtReportManageActServiceImpl extends ServiceImpl reportFiles = new ArrayList<>(); - for (ReportFile reportFile : ttReportManageAct.getFileList()) { - reportFile.setId(UUID.randomUUID().toString().replace("-","")); - reportFile.setReportId(ttReportManageAct.getDataId()); -// reportFile.setFileId(s); - reportFile.setState(2); - reportFile.setUserId(UserUtils.getUserId()); - reportFiles.add(reportFile); - } - iReportFileService.saveBatch(reportFiles); - + reportFileDao.actEndDelReport(ttReportManageAct.getDataId()); + reportFileDao.updateState(ttReportManageAct.getDataId()); try { iReportContentService.insertReportContent(ttReportManageAct.getDataId(), ttReportManageAct.getFileId()); log.info("抽取报告内容"); diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportFileMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportFileMapper.xml index 19241a8..7632b59 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportFileMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportFileMapper.xml @@ -1,11 +1,15 @@ + + update ts_report_file set state = 2 + where report_id = #{reportId} + delete from ts_report_file - report_id = #{pageVO.reportId} - and ( state = 2 or (state = 1 AND user_id = #{pageVO.userId} ) ) + report_id = #{reportId} + and state = 2 @@ -16,9 +20,6 @@ AND report_id = #{pageVO.reportId} - - AND user_id = #{pageVO.userId} - AND state = #{pageVO.state} 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 82f785d..0b5fe46 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 @@ -1,6 +1,5 @@ package com.adc.da.wkflow.business_activiti.service; -import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; import com.adc.da.report.dao.mysql.ReportFileDao; import com.adc.da.report.dao.mysql.ReportLabelDao; @@ -134,7 +133,6 @@ public class ActivitDefineService { reportFile.setReportId(ttReportManageAct.getDataId()); // reportFile.setFileId(s); reportFile.setState(1); - reportFile.setUserId(UserUtils.getUserId()); reportFiles.add(reportFile); } iReportFileService.saveBatch(reportFiles); @@ -169,7 +167,6 @@ public class ActivitDefineService { reportFile.setReportId(ttReportManageAct.getDataId()); // reportFile.setFileId(s); reportFile.setState(1); - reportFile.setUserId(UserUtils.getUserId()); reportFiles.add(reportFile); } iReportFileService.saveBatch(reportFiles);