Skip to content

Y
yn-health-science
Commit e00caea3 authored by wangxl's avatar wangxl
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 888a648b 675ecc51
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java
View file @ e00caea3
...@@ -81,6 +81,9 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD ...@@ -81,6 +81,9 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
if (Objects.nonNull(vo.getProjType())) { if (Objects.nonNull(vo.getProjType())) {
criteria.eq("proj_type", vo.getProjType()); criteria.eq("proj_type", vo.getProjType());
} }
if (Objects.nonNull(vo.getProjClass())) {
criteria.eq("proj_class", vo.getProjClass());
}
if (Objects.nonNull(vo.getAppUnitName())) { if (Objects.nonNull(vo.getAppUnitName())) {
criteria.like("d.unit_name", vo.getAppUnitName()); criteria.like("d.unit_name", vo.getAppUnitName());
} }
...@@ -123,6 +126,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD ...@@ -123,6 +126,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
} }
} }
@Override @Override
public Pagination<ComProjectAuditDTO> getListByPage(ComProjectAuditQueryVO vo) { public Pagination<ComProjectAuditDTO> getListByPage(ComProjectAuditQueryVO vo) {
QueryWrapper criteria = new QueryWrapper(); QueryWrapper criteria = new QueryWrapper();
......
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