案例刷新

This commit is contained in:
lims1@hunktimes.com
2023-08-03 21:41:48 +08:00
parent a111489955
commit b09f9a1e0c
2 changed files with 12 additions and 4 deletions

View File

@@ -150,6 +150,11 @@ public class CasesApi extends ApiBaseController {
} }
} }
} else {
views = new PageList();
views.setList(Collections.emptyList());
views.setPageSize(req.getPageSize());
views.setCount(0);
} }
return success(views); return success(views);
} }

View File

@@ -285,10 +285,13 @@ public class CasesServiceImpl implements ICasesService {
} else { } else {
order = OrderCondition.desc("sysCreateTime"); order = OrderCondition.desc("sysCreateTime");
} }
String type = caseVo.getType();
if (StrUtil.equals(type,"excellent")) {
query.addOrder(OrderCondition.rand());
} else {
query.addOrder(order);
}
query.addFilters(filters); query.addFilters(filters);
query.addOrder(order);
query.addOrder(OrderCondition.rand());
query.setPageIndex(caseVo.getPageIndex()); query.setPageIndex(caseVo.getPageIndex());
query.setPageSize(caseVo.getPageSize()); query.setPageSize(caseVo.getPageSize());
page = casesDao.findPage(query.builder()); page = casesDao.findPage(query.builder());
@@ -845,7 +848,7 @@ public class CasesServiceImpl implements ICasesService {
@Override @Override
public List<DictItem> majorTypes() { public List<DictItem> majorTypes() {
List<DictItem> major_type = sysDictionaryDao.findByKey("major_type"); List<DictItem> major_type = sysDictionaryDao.findByKey("major_type");
String hql = "select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId"; String hql = "select cm.majorId,count(cm.id) from CasesMajorType cm,Cases c where cm.caseId=c.id and cm.majorId=c.majorType and c.deleted=false and (c.filePath is not null or c.filePath!='') group by cm.majorId";
List<Object[]> listByHql = casesDao.findListByHql(hql); List<Object[]> listByHql = casesDao.findListByHql(hql);
List<DictItem> dictItems = new ArrayList<>(); List<DictItem> dictItems = new ArrayList<>();
for (DictItem d : major_type) { for (DictItem d : major_type) {