Commit 57c2bc6c authored by lu's avatar lu

排序

parent d0fe3155
...@@ -168,12 +168,10 @@ public class BReleaseValueServiceImpl implements BReleaseValueService { ...@@ -168,12 +168,10 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
if(StringUtils.isEmpty(dto.getStatus())&&StringUtils.isEmpty(dto.getTrainStatus())){ if(StringUtils.isEmpty(dto.getStatus())&&StringUtils.isEmpty(dto.getTrainStatus())){
dto.setTrainStatus(null); dto.setTrainStatus(null);
}else if((StringUtils.isEmpty(dto.getStatus()) || "2".equals(dto.getStatus()))&&StringUtils.isNotEmpty(dto.getTrainStatus())){ }else if(StringUtils.isNotEmpty(dto.getStatus()) && dto.getStatus().contains("2") && StringUtils.isNotEmpty(dto.getTrainStatus())){
dto.setTrainStatus("and ("+dto.getTrainStatus()+") and bl.release_state = 2 "); dto.setTrainStatus("and (bl.release_state in("+dto.getStatus().replace("2","8")+") or (("+dto.getTrainStatus()+") and bl.release_state = '2'))");
}else if(StringUtils.isNotEmpty(dto.getStatus()) && StringUtils.isEmpty(dto.getTrainStatus())){ }else if(StringUtils.isNotEmpty(dto.getStatus()) && StringUtils.isEmpty(dto.getTrainStatus())){
dto.setTrainStatus("and bl.release_state in("+dto.getStatus()+")"); dto.setTrainStatus("and bl.release_state in("+dto.getStatus()+")");
}else if(StringUtils.isNotEmpty(dto.getStatus()) && !"2".equals(dto.getStatus()) && StringUtils.isNotEmpty(dto.getTrainStatus())){
dto.setTrainStatus("and (bl.release_state in("+dto.getStatus()+") or ("+dto.getTrainStatus()+ "))");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment