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} + + + +