yys 修改bug 1.“待审核”状态不能进行筛选 2.不能凭供应商名称/合同号进行筛选 3.不能凭供应商名称进行筛选

maven

2025-08-07 7b9c994a8678e0aaf86638d7426f183ad7a175a5

yys  修改bug
1.“待审核”状态不能进行筛选
2.不能凭供应商名称/合同号进行筛选
3.不能凭供应商名称进行筛选

 src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java

@@ -149,6 +149,9 @@
    @TableField(exist = false)
    private String issueDateEnd;

    @TableField(exist = false)
    private String supplierNameOrContractNo;

    @ApiModelProperty(value = "录入时间")
    private LocalDate enterDate;
}

 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java

@@ -329,9 +329,13 @@
    @Override
    public IPage<TicketRegistration> selectTicketRegistrationListPage(Page page, TicketRegistration ticketRegistration) {
        LambdaQueryWrapper<TicketRegistration> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotBlank(ticketRegistration.getPurchaseContractNumber())) {
            queryWrapper.like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getPurchaseContractNumber())
                    .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierName());
        if (StringUtils.isNotBlank(ticketRegistration.getSupplierNameOrContractNo())) {
            queryWrapper.and(wrapper -> wrapper
                    .like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getSupplierNameOrContractNo())
                    .or()
                    .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierNameOrContractNo())
                    .or()
                    .like(TicketRegistration::getSalesContractNo, ticketRegistration.getSupplierNameOrContractNo()));
        }
        if (!ObjectUtils.isEmpty(ticketRegistration.getIssueDateStart()) && !ObjectUtils.isEmpty(ticketRegistration.getIssueDateEnd())) {
            queryWrapper.between(TicketRegistration::getIssueDate, LocalDate.parse(ticketRegistration.getIssueDateStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd")), LocalDate.parse(ticketRegistration.getIssueDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -32,7 +32,7 @@
        <if test="req.approveId != null and req.approveId != ''">
            and approve_id like concat('%',#{req.approveId},'%')
        </if>
        <if test="req.approveStatus != null and req.approveStatus != ''">
        <if test="req.approveStatus != null or req.approveStatus == 0">
            and approve_status = #{req.approveStatus}
        </if>
    </select>