diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 743fe88f..9fb2b8e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -115,5 +115,8 @@ public class EsRevisePlan extends BasePage { @TableField("buss_sort") private String bussSort; + @TableField(exist = false) + private List planStatusList; + } 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 2ed4273a..20c70db4 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 @@ -10,10 +10,14 @@ import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -47,6 +51,10 @@ 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); + } 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 74725ac4..a938f6d8 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 @@ -226,8 +226,11 @@ and area = #{area} - - and plan_status = #{planStatus} + + and plan_status in + + #{item} + and revise_status = #{reviseStatus}