diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 20c70db4..1b6e05c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -49,12 +49,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl queryAllPlans(EsRevisePlan esRevisePlan) { - Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan); - esRevisePlan.getPager().setRowCount(count); if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){ List list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList()); esRevisePlan.setPlanStatusList(list); } + Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan); + esRevisePlan.getPager().setRowCount(count); List esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); return esRevisePlans; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index fea29b3a..019d4437 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -86,8 +86,11 @@ and area = #{area} - - and plan_status = #{planStatus} + + and plan_status in + + #{item} + and revise_status = #{reviseStatus}