src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -6,7 +6,6 @@
import lombok.Data;

import java.time.LocalDateTime;
import java.util.Date;

@Data
public class DeviceMaintenanceDto {
@@ -68,4 +67,7 @@

    @ApiModelProperty("创建人名称")
    private String createUserName;

    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;
}

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -69,6 +69,8 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;

}


 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -1,15 +1,15 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;
import java.util.Date;

@Data
@TableName("device_maintenance")
@@ -69,4 +69,7 @@
    @ApiModelProperty("租户id")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;
}

 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -4,14 +4,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import nonapi.io.github.classgraph.json.Id;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;

@@ -76,5 +72,7 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;

}

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -58,6 +58,7 @@
               dm.create_user,
               dm.update_user,
               dm.tenant_id,
               dm.maintenance_process_desc,
               dm.maintenance_actually_name,
               dl.device_name,
               dl.device_model,

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -66,7 +66,8 @@
               dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
               dl.device_model,
               dr.maintenance_process_desc
        from device_repair dr
                 left join device_ledger dl on dr.device_ledger_id = dl.id
        where dr.id = #{id}

 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml

@@ -250,6 +250,9 @@
            <if test="req.customerName != null and req.customerName != ''">
                and t3.customer_name like  concat('%',#{req.customerName},'%')
            </if>
            <if test="req.productCategory != null and req.productCategory != ''">
                and t2.product_category like  concat('%',#{req.productCategory},'%')
            </if>
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like  concat('%',#{req.timeStr},'%')
            </if>
@@ -305,6 +308,9 @@
            <if test="req.endDate != null">
                and t1.create_time &lt;= #{req.endDate}
            </if>
            <if test="req.productCategory != null and req.productCategory != ''">
                and t2.product_category like  concat('%',#{req.productCategory},'%')
            </if>
        </where>
        group by t3.customer_name,t2.product_category,t2.specification_model
    </select>

 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml

@@ -118,6 +118,9 @@
            <if test="req.customerName != null and req.customerName != ''">
                and t3.customer_name like  concat('%',#{req.customerName},'%')
            </if>
            <if test="req.productCategory != null and req.productCategory != ''">
                and t2.product_category like  concat('%',#{req.productCategory},'%')
            </if>
            <if test="req.timeStr != null and req.timeStr != ''">
                and t1.create_time like  concat('%',#{req.timeStr},'%')
            </if>

 src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml

@@ -49,6 +49,9 @@
            <if test="c.customerName != null and c.customerName != ''">
                AND A.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
            </if>
            <if test="c.projectName != null and c.projectName != ''">
                AND A.project_name LIKE CONCAT('%', #{c.projectName}, '%')
            </if>
        </where>
    </select>
    <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">