报备功能优化

xiangpei

2024-09-01 7e39aba8980b95fac3b347689aac66da41079d18

报备功能优化

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportAuditingForm.java

@@ -14,6 +14,7 @@
import org.springframework.lang.NonNull;

import java.util.Date;
import java.util.List;

/**
 * 报备表单
@@ -29,6 +30,9 @@
    @NotNull(message = "请选择要审核的报备")
    private Integer id;

    @ApiModelProperty("同批次号报备")
    private List<Integer> togetherList;

    @ApiModelProperty("审核意见")
    private String auditOpinion;


 ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java

@@ -39,12 +39,14 @@
    private MultipartFile importPointId;

    @ApiModelProperty("生效时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date beginCreateTime;
    private String beginCreateTimeStr;

    @ApiModelProperty("失效时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endCreateTime;
    private String endCreateTimeStr;

    @ApiModelProperty("报备类型")
    private String reportType;

 ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java

@@ -49,6 +49,12 @@
        return reportService.importData(form);
    }

    @GetMapping("/getTogether/{pid}")
    @ApiOperation(value = "获取同一批次的报备", notes = "获取同一批次的报备")
    public Result getTogether(@PathVariable("pid") String pid) {
        return reportService.getTogether(pid);
    }

    @PostMapping("/importTemplate")
    @ApiOperation(value = "导入模板", notes = "导入模板")
    @PreAuthorize("@ss.hasPermi('system:report:add')")

 ycl-server/src/main/java/com/ycl/platform/mapper/ReportMapper.java

@@ -41,4 +41,12 @@
     * @return
     */
    Report checkPointReported(@Param("serialNumber") String serialNumber);

    /**
     * 获取同一批次号的报备
     *
     * @param pid
     * @return
     */
    List<Report> getTogether(@Param("pid") String pid);
}

 ycl-server/src/main/java/com/ycl/platform/service/ReportService.java

@@ -101,4 +101,12 @@
     * @return
     */
    Result auditing(ReportAuditingForm form);

    /**
     * 获取同一批次的报备
     *
     * @param pid 批次号
     * @return
     */
    Result getTogether(String pid);
}

 ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java

@@ -35,11 +35,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -122,6 +120,8 @@
        YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
        form.setPeopleId(people.getId());
        form.setUnitId(people.getBelongUnit());
        form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
        form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTime()));
        // 读取excel数据
        ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
        List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
@@ -137,7 +137,7 @@
                }
            }
            YwPoint point = new LambdaQueryChainWrapper<>(ywpointMapper)
                    .eq(YwPoint::getSerialNumber, form.getPointId())
                    .eq(YwPoint::getSerialNumber, item.getSerialNumber())
                    .one();
            if (Objects.isNull(point)) {
                continue;
@@ -163,6 +163,12 @@
            success++;
        }
        return Result.ok("报备点位数：" + list.size() + "，导入成功数：" + success);
    }

    @Override
    public Result getTogether(String pid) {
        List<Report> list = baseMapper.getTogether(pid);
        return Result.ok().data(list);
    }

    /**
@@ -321,27 +327,33 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result auditing(ReportAuditingForm form) {
        Report report = baseMapper.selectById(form.getId());
        if (Objects.isNull(report)) {
            throw new RuntimeException("审核的报备不存在");
        if (CollectionUtils.isEmpty(form.getTogetherList())) {
            form.setTogetherList(new ArrayList<>(2));
        }
        if (form.getAuditingResult()) {
            report.setStatus(1);
        } else {
            report.setStatus(2);
        }
        Date now = new Date();
        report.setUpdateTime(now);
        baseMapper.updateById(report);
        form.getTogetherList().add(form.getId());
        for (Integer id : form.getTogetherList()) {
            Report report = baseMapper.selectById(id);
            if (Objects.isNull(report)) {
                continue;
            }
            if (form.getAuditingResult()) {
                report.setStatus(1);
            } else {
                report.setStatus(2);
            }
            Date now = new Date();
            report.setUpdateTime(now);
            baseMapper.updateById(report);

        // 添加一条审核记录
        ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
        reportAuditingRecord.setReportId(form.getId());
        reportAuditingRecord.setDeleted(0);
        reportAuditingRecord.setCreateTime(now);
        reportAuditingRecord.setResultRemark(form.getAuditOpinion());
        reportAuditingRecord.setResult(form.getAuditingResult());
        reportAuditingRecordService.save(reportAuditingRecord);
            // 添加一条审核记录
            ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
            reportAuditingRecord.setReportId(form.getId());
            reportAuditingRecord.setDeleted(0);
            reportAuditingRecord.setCreateTime(now);
            reportAuditingRecord.setResultRemark(form.getAuditOpinion());
            reportAuditingRecord.setResult(form.getAuditingResult());
            reportAuditingRecordService.save(reportAuditingRecord);
        }
        return Result.ok("操作成功");
    }
}

 ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml

@@ -23,6 +23,7 @@
            r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number as pointId,
               r.begin_create_time,
               r.end_create_time,
               r.import_batch_number,
               u.unit_name,
               p.yw_person_name as peopleName,
               pt.point_name,
@@ -50,6 +51,7 @@
            r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number,
            r.begin_create_time,
            r.end_create_time,
            r.import_batch_number,
            u.unit_name,
            p.yw_person_name,
            pt.point_name
@@ -89,6 +91,17 @@
        LIMIT 1
    </select>

    <select id="getTogether" resultType="com.ycl.platform.domain.vo.ReportVO">
        SELECT
               r.id,
               p.point_name
        FROM
             t_report t
                 INNER JOIN t_yw_point p ON t.serial_number = p.serial_number
        WHERE
            t.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
    </select>