From c7738ff5df85e5ba0dd7fd16ca2770b950cdd8f8 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 02 九月 2024 11:09:01 +0800 Subject: [PATCH] 报备导出优化 --- ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java | 3 --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 6 ++++-- ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java index af41d18..a233dea 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java @@ -29,7 +29,6 @@ /** 杩愮淮浜哄憳ID */ private Integer peopleId; - @Excel(name = "鎶ュ浜哄憳") private String peopleName; /** 璁惧缂栫爜 */ @@ -49,7 +48,6 @@ private String reportContent; /** 涓婃姤鏉愭枡 */ - @Excel(name = "涓婃姤鏉愭枡") private String reportMaterials; /** 鏁呴殰绫诲瀷 */ @@ -63,9 +61,13 @@ */ private Boolean result; + @Excel(name = "瀹℃牳鐘舵��") + private String resultStr; + /** * 瀹℃牳鎰忚 */ + @Excel(name = "瀹℃牳鎰忚") private String resultRemark; /** 瀹℃牳鏃堕棿 */ diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java index 9780552..fe2b0be 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java @@ -39,20 +39,17 @@ @PutMapping @ApiOperation(value = "淇敼", notes = "淇敼") - @PreAuthorize("@ss.hasPermi('dynamicColumn:edit')") public Result update(@RequestBody @NotEmpty(message = "鏁版嵁涓虹┖锛屾棤娉曚繚瀛�") List<DynamicColumnForm> columnList) { return dynamicColumnService.update(columnList); } @DeleteMapping("/{id}") @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") - @PreAuthorize("@ss.hasPermi('dynamicColumn:del')") public Result removeById(@PathVariable("id") String id) { return dynamicColumnService.removeById(id); } @GetMapping("/list") - @PreAuthorize("@ss.hasPermi('dynamicColumn:list')") @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") public Result list() { return dynamicColumnService.all(); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java index e315444..dfe6ed7 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java @@ -311,7 +311,33 @@ IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class); page.setSize(-1); baseMapper.page(page, query); + List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type"); + Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel)); page.getRecords().forEach(item -> { + if (StringUtils.hasText(item.getErrorType())) { + item.setErrorTypeList(List.of(item.getErrorType().split(","))); + StringBuilder sb = new StringBuilder(); + item.getErrorTypeList().stream().forEach(err -> { + String s = dictMap.get(err); + if (org.springframework.util.StringUtils.hasText(s)) { + sb.append(s).append("銆�"); + } + }); + item.setErrorType(sb.substring(0, sb.length() - 1)); + } + // 瀹℃牳缁撴灉 + List<ReportAuditingRecord> records = new LambdaQueryChainWrapper<>(reportAuditingRecordService.getBaseMapper()) + .eq(ReportAuditingRecord::getReportId, item.getId()) + .orderByDesc(ReportAuditingRecord::getCreateTime) + .last("limit 1") + .list(); + if (! CollectionUtils.isEmpty(records)) { + item.setResultStr(records.get(0).getResult() ? "閫氳繃" : "鏈�氳繃"); + item.setResultRemark(records.get(0).getResultRemark()); + item.setAuditingTime(records.get(0).getCreateTime()); + } else { + item.setResultStr("瀹℃牳涓�"); + } item.setReportContent(EscapeUtil.clean(item.getReportContent())); }); return page.getRecords(); -- Gitblit v1.8.0