Merge remote-tracking branch 'origin/hckx' into hckx

maven

6 天以前 da5094f2b971076db2b09faf78ee6fc65e35f7c7

Merge remote-tracking branch 'origin/hckx' into hckx

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java

@@ -112,4 +112,8 @@
    @Excel(name = "不含税总价")
    private BigDecimal taxExclusiveTotalPrice;

    /**
     * 物品类型
     */
    private String itemType;
}

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

@@ -33,7 +33,7 @@
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
            <if test="deviceRepairDto.status != null">
                and dl.status = #{deviceRepairDto.status}
                and dr.status = #{deviceRepairDto.status}
            </if>
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')

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

@@ -145,7 +145,8 @@
        t2.tax_exclusive_total_price,
        t1.inbound_num,
        t1.create_time,
        t1.create_by
        t1.create_by,
        t2.item_type
        from  procurement_record_out t1
        left join custom_storage t2 on t2.id = t1.procurement_record_storage_id
        <where>

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -25,6 +25,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND  check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY check_time DESC
    </select>
    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT