报备导出优化

xiangpei

2024-09-02 c7738ff5df85e5ba0dd7fd16ca2770b950cdd8f8

报备导出优化

 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;

    /** 审核时间 */

 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();

 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();