From 09623849086343e9438afc71d5958eb0ee2e022b Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 25 Sep 2025 15:51:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?= =?UTF-8?q?=E9=87=87=E9=9B=86=E5=85=88=E4=BD=9C=E5=BA=9F=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/docus/server/mzsy/job/MzsyReportCollectJob.java | 5 +++++ src/main/resources/mapper/TBasicMapper.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java index f5ca7b7..c6d4231 100644 --- a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java +++ b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java @@ -5,6 +5,7 @@ import com.docus.core.util.Func; import com.docus.infrastructure.core.utils.TableJsonRead; import com.docus.infrastructure.web.api.CommonResult; import com.docus.infrastructure.web.api.ResultCode; +import com.docus.server.archive.mapper.TBasicMapper; import com.docus.server.mzsy.entity.MzsyMectReportView; import com.docus.server.mzsy.entity.MzsyReportDataView; import com.docus.server.mzsy.entity.MzsyShoumaReportDataView; @@ -38,6 +39,8 @@ public class MzsyReportCollectJob { private MzsyReportDataViewMapper reportDataViewMapper; @Autowired private MzsyShoumaReportDataViewMapper shoumaReportDataViewMapper; + @Autowired + private TBasicMapper tBasicMapper; @XxlJob("MzsyReportCollectJob") public void reportCollect() { @@ -79,6 +82,7 @@ public class MzsyReportCollectJob { reportDownDto.setIp(""); reportDownDto.setPatient(patient); int sort = 0; + tBasicMapper.cancelTask(downTwoDto.getPatientId(),collectorId); for (MzsyReportDataView mzsyReportDataView : mzsyReportDataViewList) { ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto(); reportDownScanFileDto.setDownurl(mzsyReportDataView.getFfilePath()); @@ -150,6 +154,7 @@ public class MzsyReportCollectJob { reportDownDto.setIp(""); reportDownDto.setPatient(patient); int sort = 0; + tBasicMapper.cancelTask(downTwoDto.getPatientId(),collectorId); for (MzsyShoumaReportDataView mzsyShouMaReportDataView : shoumaReportDataViewList) { ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto(); reportDownScanFileDto.setDownurl(mzsyShouMaReportDataView.getFilePath()); diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index e86e09b..4519eac 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -40,7 +40,7 @@