diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 0c7a468f..20e8a180 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -15,6 +15,8 @@ import com.xboe.module.boecase.vo.CaseExportVo; import com.xboe.module.dict.entity.DictItem; import com.xboe.module.excel.ExportsExcelSenderUtil; +import com.xboe.system.user.dao.UserDao; +import com.xboe.system.user.entity.User; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -58,6 +60,8 @@ public class CasesApi extends ApiBaseController { @Resource private CasesMajorTypeDao casesMajorTypeDao; + @Resource + private UserDao userDao; /** * 用于后台管理 @@ -252,13 +256,27 @@ public class CasesApi extends ApiBaseController { try { outputStream = response.getOutputStream(); LinkedHashMap map = new LinkedHashMap<>(); +// 标题,摘要,案主姓名,案主工号,案主所在组织全路径,同步时间,查看次数。 map.put("标题","title"); + map.put("摘要","summary"); + map.put("案主姓名","authorName"); + map.put("案主工号","userNo"); + map.put("案主所在组织全路径","department"); + map.put("同步时间","exportDate"); + map.put("查看次数","views"); List list = casesService.managerCaseTitleList(caseVo); List exportVos = new ArrayList<>(); LocalDateTime now = LocalDateTime.now(); for (Cases c:list){ CaseExportVo caseExportVo = new CaseExportVo(); caseExportVo.setTitle(c.getTitle()); + caseExportVo.setSummary(c.getSummary()); + caseExportVo.setAuthorName(c.getAuthorName()); + User user = userDao.findOne(FieldFilters.eq("id", c.getAuthorId())); + caseExportVo.setUserNo(user.getUserNo()); + caseExportVo.setDepartment(c.getDepartment()); + caseExportVo.setExportDate(now); + caseExportVo.setViews(c.getViews()); exportVos.add(caseExportVo); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 6ce16399..b49b3178 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -288,12 +288,7 @@ public class CasesServiceImpl implements ICasesService { } else { order = OrderCondition.desc("sysCreateTime"); } - String type = caseVo.getType(); - if (StrUtil.equals(type,"excellent")) { - query.addOrder(OrderCondition.rand()); - } else { - query.addOrder(order); - } + query.addOrder(order); query.addFilters(filters); query.setPageIndex(caseVo.getPageIndex()); query.setPageSize(caseVo.getPageSize()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java index 01ff691e..6ae48f79 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java @@ -36,4 +36,8 @@ public class CaseExportVo { private LocalDateTime endTime; private String confidentialityLevel; + + private String summary; + private String userNo; + private String department; }