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

liyong

5 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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

# Conflicts:
#	src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

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

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

import java.time.LocalDateTime;
import java.util.List;

@Data
public class DeviceMaintenanceDto {
@@ -73,4 +74,7 @@


    private String sparePartsNames;

    @ApiModelProperty("鍥剧墖URL鏁扮粍")
    private List<UploadImageDTO> imagesFile;
}

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

对比新文件
@@ -0,0 +1,10 @@
package com.ruoyi.device.dto;

import lombok.Data;

@Data
public class UploadImageDTO {
    private String name;
    private String type;
    private String url;
}

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

@@ -3,13 +3,16 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.device.dto.UploadImageDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;
import java.util.List;

@Data
@TableName("device_maintenance")
@@ -87,4 +90,10 @@

    @ApiModelProperty("棰嗙敤澶囦欢ids")
    private String sparePartsIds;

    /**
     * 鍥剧墖URL鏁扮粍
     */
    @TableField(value = "images_file", typeHandler = JacksonTypeHandler.class)
    private List<UploadImageDTO> imagesFile;
}

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

@@ -5,8 +5,28 @@

<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
        select dm.id,
    <resultMap id="deviceMaintenanceResultMap" type="com.ruoyi.device.dto.DeviceMaintenanceDto">
        <id property="id" column="id"/>
        <result property="deviceLedgerId" column="device_ledger_id"/>
        <result property="maintenancePlanTime" column="maintenance_plan_time"/>
        <result property="maintenanceActuallyTime" column="maintenance_actually_time"/>
        <result property="status" column="status"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="createUser" column="create_user"/>
        <result property="updateUser" column="update_user"/>
        <result property="tenantId" column="tenant_id"/>
        <result property="maintenanceActuallyName" column="maintenance_actually_name"/>
        <result property="deviceName" column="device_name"/>
        <result property="deviceModel" column="device_model"/>
        <result property="createUserName" column="create_user_name"/>
        <result property="imagesFile" column="images_file"
                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
    </resultMap>

    <select id="queryPage" resultMap="deviceMaintenanceResultMap">
        select
        dm.id,
        dm.device_ledger_id,
        dm.maintenance_plan_time,
        dm.maintenance_actually_time,
@@ -22,30 +42,26 @@
        dl.device_model,
        su.nick_name as create_user_name,
        dm.spare_parts_ids
        su.nick_name as create_user_name,
        dm.images_file
        from device_maintenance dm
        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">
            <if test="deviceMaintenanceDto.deviceName != null and deviceMaintenanceDto.deviceName != ''">
                and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
            </if>
            <if test="deviceMaintenanceDto.deviceModel != null">
            <if test="deviceMaintenanceDto.deviceModel != null and deviceMaintenanceDto.deviceModel != ''">
                and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
            </if>
            <if test="deviceMaintenanceDto.status != null">
                and dm.status = #{deviceMaintenanceDto.status}
            </if>
            <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
            <if test="deviceMaintenanceDto.maintenanceActuallyName != null and deviceMaintenanceDto.maintenanceActuallyName != ''">
                and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
            </if>
            <if test="deviceMaintenanceDto.maintenancePlanTime != null">
                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
            </if>
            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
                and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTime},'%')
            </if>
            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null and deviceMaintenanceDto.maintenanceActuallyTime != ''">
                and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
                and dm.maintenance_actually_time &lt; date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day)
            </if>