From 377900a395f0238c98c5fbc945c2bea302b964f1 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 17 十二月 2025 17:28:39 +0800
Subject: [PATCH] 新增设备维修保养过程描述，上传对应附件

---
 src/main/java/com/ruoyi/device/service/DeviceRepairFileService.java               |   12 +
 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceFileServiceImpl.java |   24 +++
 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceFileMapper.java            |   16 ++
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml                      |    2 
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java                      |    2 
 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java                             |    3 
 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java                           |    2 
 src/main/java/com/ruoyi/device/service/DeviceMaintenanceFileService.java          |   12 +
 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java    |   71 ++++++++++
 src/main/java/com/ruoyi/device/controller/DeviceRepairFileController.java         |   69 +++++++++
 src/main/java/com/ruoyi/device/service/impl/DeviceRepairFileServiceImpl.java      |   25 +++
 src/main/resources/mapper/device/DeviceRepairFileMapper.xml                       |   17 ++
 src/main/java/com/ruoyi/device/mapper/DeviceRepairFileMapper.java                 |   16 ++
 src/main/resources/mapper/device/DeviceMaintenanceFileMapper.xml                  |   17 ++
 src/main/resources/mapper/device/DeviceRepairMapper.xml                           |    6 
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java                    |   59 ++++++++
 src/main/java/com/ruoyi/device/pojo/DeviceRepairFile.java                         |   59 ++++++++
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java                        |    2 
 18 files changed, 411 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
new file mode 100644
index 0000000..8778ca7
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
@@ -0,0 +1,71 @@
+package com.ruoyi.device.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.pojo.DeviceMaintenanceFile;
+import com.ruoyi.device.pojo.DeviceRepairFile;
+import com.ruoyi.device.service.DeviceMaintenanceFileService;
+import com.ruoyi.device.service.DeviceRepairFileService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 璁惧淇濆吇闄勪欢
+ */
+@RestController
+@RequestMapping("/device/deviceMaintenanceFile")
+@Api(tags = "璁惧淇濆吇闄勪欢")
+public class DeviceMaintenanceFileController {
+
+
+    @Resource
+    private DeviceMaintenanceFileService deviceMaintenanceFileService;
+
+
+    /**
+     * 鏂板
+     * @param deviceMaintenanceFile
+     * @return
+     */
+    @PostMapping("/add")
+    @ApiOperation("鏂板")
+    public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
+        return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
+    }
+
+    /**
+     * 鍒犻櫎
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎")
+    public AjaxResult delDeviceMaintenanceFile(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        //鍒犻櫎淇濆吇闄勪欢
+        return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
+    }
+
+    /**
+     *鍒嗛〉鏌ヨ
+     * @param page
+     * @param deviceMaintenanceFile
+     * @return
+     */
+    @GetMapping("/listPage")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public AjaxResult deviceMaintenanceFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
+        return AjaxResult.success(deviceMaintenanceFileService.deviceMaintenanceFileListPage(page, deviceMaintenanceFile));
+    }
+
+
+
+
+}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairFileController.java
new file mode 100644
index 0000000..7de5f80
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairFileController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.device.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.pojo.DeviceRepairFile;
+import com.ruoyi.device.service.DeviceRepairFileService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 璁惧鎶ヤ慨闄勪欢
+ */
+@RestController
+@RequestMapping("/device/deviceRepairFile")
+@Api(tags = "璁惧鎶ヤ慨闄勪欢")
+public class DeviceRepairFileController {
+
+
+    @Resource
+    private DeviceRepairFileService deviceRepairFileService;
+
+
+    /**
+     * 鏂板
+     * @param deviceRepairFile
+     * @return
+     */
+    @PostMapping("/add")
+    @ApiOperation("鏂板")
+    public AjaxResult add(@RequestBody DeviceRepairFile deviceRepairFile) {
+        return AjaxResult.success(deviceRepairFileService.save(deviceRepairFile));
+    }
+
+    /**
+     * 鍒犻櫎
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎")
+    public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        //鍒犻櫎妫�楠岄檮浠�
+        return AjaxResult.success(deviceRepairFileService.removeBatchByIds(ids));
+    }
+
+    /**
+     *鍒嗛〉鏌ヨ
+     * @param page
+     * @param deviceRepairFile
+     * @return
+     */
+    @GetMapping("/listPage")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public AjaxResult deviceRepairFileListPage(Page page, DeviceRepairFile deviceRepairFile) {
+        return AjaxResult.success(deviceRepairFileService.deviceRepairFileListPage(page, deviceRepairFile));
+    }
+
+
+
+
+}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index cae0715..2d91176 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -68,4 +68,6 @@
 
     @ApiModelProperty("鍒涘缓浜哄悕绉�")
     private String createUserName;
+     @ApiModelProperty("淇濆吇杩涘害鎻忚堪")
+    private String maintenanceProcessDesc;
 }
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 92cfe8c..7bc459c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -34,6 +34,8 @@
 
     @ApiModelProperty("鎶ヤ慨鍐呭")
     private String remark;
+    @ApiModelProperty("淇濆吇杩涘害鎻忚堪")
+    private String maintenanceProcessDesc;
 
     @ApiModelProperty("缁翠慨浜�")
     private String maintenanceName;
diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceFileMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceFileMapper.java
new file mode 100644
index 0000000..5b24a99
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceFileMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.device.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.pojo.DeviceMaintenanceFile;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DeviceMaintenanceFileMapper extends BaseMapper<DeviceMaintenanceFile> {
+
+
+
+    IPage<DeviceMaintenanceFile> deviceMaintenanceFileListPage(Page page, @Param("deviceMaintenanceFile") DeviceMaintenanceFile deviceMaintenanceFile);
+}
diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceRepairFileMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceRepairFileMapper.java
new file mode 100644
index 0000000..3152059
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/mapper/DeviceRepairFileMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.device.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.pojo.DeviceRepairFile;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DeviceRepairFileMapper extends BaseMapper<DeviceRepairFile> {
+
+
+
+    IPage<DeviceRepairFile> deviceRepairFileListPage(Page page, @Param("deviceRepairFile") DeviceRepairFile deviceRepairFile);
+}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index f5d5463..f17be72 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -69,4 +69,6 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+    @ApiModelProperty("淇濆吇杩涘害鎻忚堪")
+    private String maintenanceProcessDesc;
 }
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
new file mode 100644
index 0000000..6071b5c
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
@@ -0,0 +1,59 @@
+package com.ruoyi.device.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 璁惧淇濆吇闄勪欢
+ * device_maintenance_file
+ */
+@TableName(value = "device_maintenance_file")
+@Data
+public class DeviceMaintenanceFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搴忓彿
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+    private String name;
+
+    @ApiModelProperty(value = "鏂囦欢璺緞")
+    private String url;
+
+    @ApiModelProperty(value = "鏂囦欢澶у皬")
+    private int fileSize;
+
+    @ApiModelProperty(value = "璁惧淇濆吇ID")
+    @NotBlank(message = "璁惧淇濆吇id涓嶈兘涓虹┖!")
+    private Long deviceMaintenanceId;
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @ApiModelProperty(value = "绉熸埛ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
+
+
+}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 5804519..c2acf7c 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -37,7 +37,8 @@
 
     @ApiModelProperty("鎶ヤ慨鍐呭")
     private String remark;
-
+    @ApiModelProperty("淇濆吇杩涘害鎻忚堪")
+    private String maintenanceProcessDesc;
     @ApiModelProperty("缁翠慨浜�")
     private String maintenanceName;
 
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepairFile.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepairFile.java
new file mode 100644
index 0000000..c8fdacc
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepairFile.java
@@ -0,0 +1,59 @@
+package com.ruoyi.device.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 璁惧鎶ヤ慨闄勪欢
+ * device_repair_file
+ */
+@TableName(value = "device_repair_file")
+@Data
+public class DeviceRepairFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搴忓彿
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "鏂囦欢鍚嶇О")
+    private String name;
+
+    @ApiModelProperty(value = "鏂囦欢璺緞")
+    private String url;
+
+    @ApiModelProperty(value = "鏂囦欢澶у皬")
+    private int fileSize;
+
+    @ApiModelProperty(value = "璁惧鎶ヤ慨ID")
+    @NotBlank(message = "璁惧鎶ヤ慨id涓嶈兘涓虹┖!")
+    private Long deviceRepairId;
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @ApiModelProperty(value = "绉熸埛ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
+
+
+}
diff --git a/src/main/java/com/ruoyi/device/service/DeviceMaintenanceFileService.java b/src/main/java/com/ruoyi/device/service/DeviceMaintenanceFileService.java
new file mode 100644
index 0000000..7ac6e09
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/service/DeviceMaintenanceFileService.java
@@ -0,0 +1,12 @@
+package com.ruoyi.device.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.device.pojo.DeviceMaintenanceFile;
+
+
+public interface DeviceMaintenanceFileService extends IService<DeviceMaintenanceFile> {
+
+    IPage<DeviceMaintenanceFile> deviceMaintenanceFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile);
+}
diff --git a/src/main/java/com/ruoyi/device/service/DeviceRepairFileService.java b/src/main/java/com/ruoyi/device/service/DeviceRepairFileService.java
new file mode 100644
index 0000000..83546ba
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/service/DeviceRepairFileService.java
@@ -0,0 +1,12 @@
+package com.ruoyi.device.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.device.pojo.DeviceRepairFile;
+
+
+public interface DeviceRepairFileService extends IService<DeviceRepairFile> {
+
+    IPage<DeviceRepairFile> deviceRepairFileListPage(Page page, DeviceRepairFile deviceRepairFile);
+}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceFileServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceFileServiceImpl.java
new file mode 100644
index 0000000..75a5a73
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceFileServiceImpl.java
@@ -0,0 +1,24 @@
+package com.ruoyi.device.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.device.mapper.DeviceMaintenanceFileMapper;
+import com.ruoyi.device.pojo.DeviceMaintenanceFile;
+import com.ruoyi.device.service.DeviceMaintenanceFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@AllArgsConstructor
+@Service
+public class DeviceMaintenanceFileServiceImpl extends ServiceImpl<DeviceMaintenanceFileMapper, DeviceMaintenanceFile> implements DeviceMaintenanceFileService {
+
+    private DeviceMaintenanceFileMapper deviceMaintenanceFileMapper;
+
+
+    @Override
+    public IPage<DeviceMaintenanceFile> deviceMaintenanceFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
+        return deviceMaintenanceFileMapper.deviceMaintenanceFileListPage(page,deviceMaintenanceFile);
+    }
+}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairFileServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairFileServiceImpl.java
new file mode 100644
index 0000000..10fa49c
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairFileServiceImpl.java
@@ -0,0 +1,25 @@
+package com.ruoyi.device.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.ruoyi.device.mapper.DeviceRepairFileMapper;
+import com.ruoyi.device.pojo.DeviceRepairFile;
+import com.ruoyi.device.service.DeviceRepairFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@AllArgsConstructor
+@Service
+public class DeviceRepairFileServiceImpl extends ServiceImpl<DeviceRepairFileMapper, DeviceRepairFile> implements DeviceRepairFileService {
+
+    private DeviceRepairFileMapper deviceRepairFileMapper;
+
+
+    @Override
+    public IPage<DeviceRepairFile> deviceRepairFileListPage(Page page, DeviceRepairFile deviceRepairFile) {
+        return deviceRepairFileMapper.deviceRepairFileListPage(page,deviceRepairFile);
+    }
+}
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceFileMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceFileMapper.xml
new file mode 100644
index 0000000..8fb2078
--- /dev/null
+++ b/src/main/resources/mapper/device/DeviceMaintenanceFileMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceFileMapper">
+    <select id="deviceMaintenanceFileListPage" resultType="com.ruoyi.device.pojo.DeviceMaintenanceFile">
+        SELECT
+        *
+        FROM device_maintenance_file
+        where
+        1=1
+        <if test="deviceMaintenanceFile.deviceMaintenanceId != null and deviceMaintenanceFile.deviceMaintenanceId != ''">
+            AND device_maintenance_id = #{deviceMaintenanceFile.deviceMaintenanceId}
+        </if>
+        <if test="deviceMaintenanceFile.name != null and deviceMaintenanceFile.name != '' ">
+            AND name = #{deviceMaintenanceFile.name}
+        </if>
+    </select>
+</mapper>
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9917ce2..baf3435 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -18,6 +18,7 @@
         dm.update_user,
         dm.tenant_id,
         dm.maintenance_actually_name,
+        dm.maintenance_process_desc,
         dl.device_name,
         dl.device_model,
         su.user_name as create_user_name
@@ -56,6 +57,7 @@
                dm.update_user,
                dm.tenant_id,
                dm.maintenance_actually_name,
+               dm.maintenance_process_desc,
                dl.device_name,
                dl.device_model,
                su.user_name as create_user_name
diff --git a/src/main/resources/mapper/device/DeviceRepairFileMapper.xml b/src/main/resources/mapper/device/DeviceRepairFileMapper.xml
new file mode 100644
index 0000000..659d1f6
--- /dev/null
+++ b/src/main/resources/mapper/device/DeviceRepairFileMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.device.mapper.DeviceRepairFileMapper">
+    <select id="deviceRepairFileListPage" resultType="com.ruoyi.device.pojo.DeviceRepairFile">
+        SELECT
+        *
+        FROM device_repair_file
+        where
+        1=1
+        <if test="deviceRepairFile.deviceRepairId != null and deviceRepairFile.deviceRepairId != ''">
+            AND device_repair_id = #{deviceRepairFile.deviceRepairId}
+        </if>
+        <if test="deviceRepairFile.name != null and deviceRepairFile.name != '' ">
+            AND name = #{deviceRepairFile.name}
+        </if>
+    </select>
+</mapper>
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index e8565d6..ca76180 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,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>
@@ -63,7 +64,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}

--
Gitblit v1.9.3