龚焕茏
2024-04-03 145ef6ab95c5546b7979d8ac03c22244432a251c
报备时间
4个文件已修改
23 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
@@ -56,5 +56,12 @@
    @TableField("error_type")
    private String errorType;
    @ApiModelProperty("生效时间")
    @TableField("begin_create_time")
    private Date beginCreateTime;
    @ApiModelProperty("失效时间")
    @TableField("end_create_time")
    private Date endCreateTime;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
@@ -38,6 +38,12 @@
    @ApiModelProperty("审核时间")
    private Date auditingTime;
    @ApiModelProperty("生效时间")
    private Date beginCreateTime;
    @ApiModelProperty("失效时间")
    private Date endCreateTime;
    @ApiModelProperty("审核类型")
    private String reportType;
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.query;
import com.ycl.platform.base.AbsQuery;
import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
@@ -22,5 +24,9 @@
    private String reportType;
    private Date beginCreateTime;
    private Date endCreateTime;
}
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -52,6 +52,8 @@
     */
    @Override
    public Result add(ReportForm form) {
        form.setPeopleId(1);
        form.setUnitId(2);
        Report entity = ReportForm.getEntityByForm(form, null);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
@@ -114,6 +116,8 @@
        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
                .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));