feat: 报销,发票问题修复

new
chenqp 1 year ago
parent ff16dc695c
commit 133f0f6993

@ -23,7 +23,7 @@ public class PageParam implements Serializable {
@Schema(description = "每页条数,最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @Schema(description = "每页条数,最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "每页条数不能为空") @NotNull(message = "每页条数不能为空")
@Min(value = 1, message = "每页条数最小值为 1") @Min(value = 1, message = "每页条数最小值为 1")
@Max(value = 100, message = "每页条数最大值为 100") @Max(value = 1000, message = "每页条数最大值为 1000")
private Integer pageSize = PAGE_SIZE; private Integer pageSize = PAGE_SIZE;
} }

@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -67,4 +68,7 @@ public class InvoicePageReqVO extends PageParam {
@Schema(description = "备注", example = "随便") @Schema(description = "备注", example = "随便")
private String remark; private String remark;
private Set<Long> inIds;
private Set<Long> notInIds;
} }

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bs.dal.mysql.invoice; package cn.iocoder.yudao.module.bs.dal.mysql.invoice;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@ -19,8 +20,8 @@ import java.util.List;
public interface InvoiceMapper extends BaseMapperX<InvoiceDO> { public interface InvoiceMapper extends BaseMapperX<InvoiceDO> {
default PageResult<InvoiceDO> selectPage(InvoicePageReqVO reqVO) { default PageResult<InvoiceDO> selectPage(InvoicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InvoiceDO>() LambdaQueryWrapperX<InvoiceDO> queryWrapper = new LambdaQueryWrapperX<InvoiceDO>()
.eqIfPresent(InvoiceDO::getFiles, reqVO.getFiles()) .inIfPresent(InvoiceDO::getId, reqVO.getInIds())
.betweenIfPresent(InvoiceDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(InvoiceDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(InvoiceDO::getInvoiceType, reqVO.getInvoiceType()) .eqIfPresent(InvoiceDO::getInvoiceType, reqVO.getInvoiceType())
.eqIfPresent(InvoiceDO::getInvoiceCode, reqVO.getInvoiceCode()) .eqIfPresent(InvoiceDO::getInvoiceCode, reqVO.getInvoiceCode())
@ -33,7 +34,11 @@ public interface InvoiceMapper extends BaseMapperX<InvoiceDO> {
.eqIfPresent(InvoiceDO::getDeptId, reqVO.getDeptId()) .eqIfPresent(InvoiceDO::getDeptId, reqVO.getDeptId())
.likeIfPresent(InvoiceDO::getDeptName, reqVO.getDeptName()) .likeIfPresent(InvoiceDO::getDeptName, reqVO.getDeptName())
.eqIfPresent(InvoiceDO::getRemark, reqVO.getRemark()) .eqIfPresent(InvoiceDO::getRemark, reqVO.getRemark())
.orderByDesc(InvoiceDO::getId)); .orderByDesc(InvoiceDO::getId);
if (CollUtil.isNotEmpty(reqVO.getNotInIds())) {
queryWrapper.notIn(InvoiceDO::getId, reqVO.getNotInIds());
}
return selectPage(reqVO, queryWrapper);
} }
default List<InvoiceDO> selectList(InvoiceExportReqVO reqVO) { default List<InvoiceDO> selectList(InvoiceExportReqVO reqVO) {

Loading…
Cancel
Save