diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java index a6b9fe3c..57b1d4f3 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -11,6 +11,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String partTypeDesc; private String statusDesc; private List excludeStatusList; + private String excludeStatusClause; private String partName; private String partDesc; private String finalPartNo; @@ -462,6 +463,14 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio this.excludeStatusList = excludeStatusList; } + public String getExcludeStatusClause() { + return excludeStatusClause; + } + + public void setExcludeStatusClause(String excludeStatusClause) { + this.excludeStatusClause = excludeStatusClause; + } + public String getPartName() { return partName; } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index e774d2b6..401f4efc 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -117,6 +117,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification public PageUtils technicalSpecificationListSearch(PlmTechnicalSpecificationSheetData inData){ // IPage resultList = this.technicalSpecificationMapper.technicalSpecificationListSearch( // new Page(inData.getPage(), inData.getLimit()), inData); + if (inData.getExcludeStatusList() != null && !inData.getExcludeStatusList().isEmpty()) { + inData.setExcludeStatusClause(buildStatusExcludeClause(inData.getExcludeStatusList())); + } else { + inData.setExcludeStatusClause(null); + } // 获取总条数 String countSql = SqlParamReplacer.getReplacedSql(sqlSession, TechnicalSpecificationMapper.class, "queryTechnicalSpecificationCount", inData).replace("\n", "").replaceAll("\\s+"," "); Long count = this.technicalSpecificationMapper.TechnicalSpecificationCount(countSql); diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 4197c111..5603fdb5 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -2599,13 +2599,10 @@ AND ( dbo.plm_get_customer_desc(c.site, c.customer_id) like #{customerDesc}) - - and a.status not in - - #{statusItem} - + + and ${excludeStatusClause} - + and a.status != 'death' @@ -2677,13 +2674,10 @@ dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) like #{customerDesc} ) - - and a.status not in - - #{statusItem} - + + and ${excludeStatusClause} - + and a.status != 'death'