Merge remote-tracking branch 'origin/pim_yys'

maven

23 小时以前 5da5bf5cb70a889645e156eff869ff276c5a573b

Merge remote-tracking branch 'origin/pim_yys'

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

@@ -26,6 +26,9 @@
    private String deviceModel;

    @ApiModelProperty("计划保养日期")
    private String maintenancePlanTimeReq;

    @ApiModelProperty("计划保养日期")
    private LocalDateTime maintenancePlanTime;

    @ApiModelProperty("实际保养人")
@@ -34,6 +37,9 @@
    @ApiModelProperty("实际保养日期")
    private LocalDateTime maintenanceActuallyTime;

    @ApiModelProperty("实际保养日期")
    private String maintenanceActuallyTimeReq;

    @ApiModelProperty("保养结果 0 维修 1 完好")
    private Integer maintenanceResult;


 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java

@@ -14,6 +14,10 @@
@Data
public class PurchaseLedgerDto {


    private String entryDateStart;
    private String entryDateEnd;

    private Long id;

    /**

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

@@ -25,12 +25,22 @@
        left join device_ledger dl on dm.device_ledger_id = dl.id
        left join sys_user su on dm.create_user = su.user_id
        <where>
            1 = 1
            <if test="deviceMaintenanceDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
            </if>
            <if test="deviceMaintenanceDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
            </if>
            <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
                and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
            </if>
            <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
            </if>
            <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
                and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">

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

@@ -25,12 +25,19 @@
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
            1 = 1
            <if test="deviceRepairDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
            </if>
            <if test="deviceRepairDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
            </if>
            <if test="deviceRepairDto.maintenanceName != null">
                and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">

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

@@ -25,8 +25,24 @@
        from purchase_ledger pl
        left join product_record pr on pl.id = pr.purchase_ledger_id
        <where>
            1 = 1
            <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
                pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
               and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
            </if>
            <if test="c.supplierName != null and c.supplierName != ''">
                and pl.supplier_name like concat('%',#{c.supplierName},'%')
            </if>
            <if test="c.salesContractNo != null and c.salesContractNo != ''">
                and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
            </if>
            <if test="c.projectName != null and c.projectName != ''">
                and pl.project_name like concat('%',#{c.projectName},'%')
            </if>
            <if test="c.entryDateStart != null and c.entryDateStart != '' ">
                AND pl.entry_date &gt;= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
            </if>
            <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
                AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,