From 6aa1e4e631844ae6f5d5445be352b88c83185270 Mon Sep 17 00:00:00 2001 From: hujl Date: Fri, 21 Jan 2022 15:27:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=9C=80=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=9A=E4=BA=A7=E7=94=9F=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=BF=87=E6=95=B0=E6=8D=AE=E5=A4=9A=E5=BE=88=E5=A4=9A?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=EF=BC=8C=E5=A4=9A=E5=8A=A0=E4=B8=AA-300?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E4=BA=86=E6=A0=B9=E6=9C=AC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/signListController.java | 5 +++- .../com/emr/dao/ArchiveOtherExtMapper.java | 2 +- .../emr/service/ArchiveOtherExtService.java | 4 +-- .../ipml/ArchiveOtherExtServiceImpl.java | 20 +++++++++---- .../mapper/ArchiveOtherExtMapper.xml | 30 +++++++++++-------- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index adf5d451..1775e237 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -688,7 +688,10 @@ public class signListController { Archive_Master archive_master = archiveMasterService.selectById(id); if (archive_master != null){ //查ext表有无任务 - List extList = archiveOtherExtService.selectExtTaskIsExistOrNot(id); + ArchiveOtherExt archiveOtherExtParm=new ArchiveOtherExt(); + archiveOtherExtParm.setMid(id); + archiveOtherExtParm.setSysflag(-300); + List extList = archiveOtherExtService.selectExtTaskIsExistOrNot(archiveOtherExtParm); if (!extList.isEmpty() && extList.size()==1){ //有任务，则ext表更新statusFlag=0，对应C3-C8置空，T1-T6置空，其他不变 //1.statusFlag=0 diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index 55129b9d..b3a769ba 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -11,7 +11,7 @@ public interface ArchiveOtherExtMapper { int insertSelective(ArchiveOtherExt record); - List selectByExample(ArchiveOtherExtExample example); + List selectByExample(ArchiveOtherExt example); ArchiveOtherExt selectByPrimaryKey(Long id); diff --git a/src/main/java/com/emr/service/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ArchiveOtherExtService.java index b6b30c74..e84d977e 100644 --- a/src/main/java/com/emr/service/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ArchiveOtherExtService.java @@ -7,10 +7,10 @@ import java.util.List; public interface ArchiveOtherExtService { /** * 查ext表有无采集任务 - * @param masterId + * @param archiveOtherExt * @return */ - List selectExtTaskIsExistOrNot(String masterId); + List selectExtTaskIsExistOrNot(ArchiveOtherExt archiveOtherExt); /** * 添加一条记录 diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java index 43851d99..69e4e81d 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtServiceImpl.java @@ -17,17 +17,25 @@ public class ArchiveOtherExtServiceImpl implements ArchiveOtherExtService { /** * 查ext表有无采集任务 - * @param masterId + * @param archiveOtherExt * @return - */ - public List selectExtTaskIsExistOrNot(String masterId){ - ArchiveOtherExtExample archiveOtherExtExample = new ArchiveOtherExtExample(); + *//* + public List selectExtTaskIsExistOrNot(String id){ + /* ArchiveOtherExtExample archiveOtherExtExample = new ArchiveOtherExtExample(); ArchiveOtherExtExample.Criteria criteria = archiveOtherExtExample.createCriteria(); if (!StringUtils.isEmpty(masterId)){ criteria.andMidEqualTo(masterId); } - - return archiveOtherExtMapper.selectByExample(archiveOtherExtExample); + return archiveOtherExtMapper.selectByExample(archiveOtherExt); + }*/ + /** + * 查ext表有无采集任务 + * @param archiveOtherExt + * @return + */ + @Override + public List selectExtTaskIsExistOrNot(ArchiveOtherExt archiveOtherExt) { + return archiveOtherExtMapper.selectByExample(archiveOtherExt); } /** diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 94ec75bf..25759bad 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -70,20 +70,26 @@ pResult, MID, DID, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, N1, N2, N3, T1, T2, T3, T4, T5, T6 - + select distinct 'false' as QUERYID, from archive_other_ext - - - - - order by ${orderByClause} - + + 1=1 + + and mid=#{mid,jdbcType=NVARCHAR} + + + and sysflag=#{sysflag,jdbcType=INTEGER} + + + +