Commit ce42e72b zshaohui

一键导入修改

1 个父辈 27846854
...@@ -96,12 +96,12 @@ public class DataLogManagerImpl implements IDataLogManager { ...@@ -96,12 +96,12 @@ public class DataLogManagerImpl implements IDataLogManager {
public List<DataLog> getDatalogs(String orderNo, String line, Pageable pageable) { public List<DataLog> getDatalogs(String orderNo, String line, Pageable pageable) {
Criteria c = new Criteria(); Criteria c = new Criteria();
if (StringUtils.isNotBlank(orderNo)) { if (StringUtils.isNotBlank(orderNo)) {
c.and("orderNo").is(orderNo); c.and("sourceName").is(orderNo);
} }
if (StringUtils.isNotBlank(line)) { /*if (StringUtils.isNotBlank(line)) {
Pattern p = Pattern.compile(QueryHelp.escapeExprSpecialWord(line), Pattern.CASE_INSENSITIVE); Pattern p = Pattern.compile(QueryHelp.escapeExprSpecialWord(line), Pattern.CASE_INSENSITIVE);
c.and("line").regex(p); c.and("line").regex(p);
} }*/
c.and("status").is(OP_STATUS.FINISHED.name()); c.and("status").is(OP_STATUS.FINISHED.name());
PageData<DataLog> data = findByPage(new Query(c), pageable); PageData<DataLog> data = findByPage(new Query(c), pageable);
//log.info("orderNo:"+orderNo+",line:"+line+",数量为:"+data.getTotalElements()); //log.info("orderNo:"+orderNo+",line:"+line+",数量为:"+data.getTotalElements());
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!