From 4fbb8a2672f39a76661f64e707af11c046c8ce2f Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 11 Aug 2025 09:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E5=9C=A8=E7=94=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BB=B4=E4=BF=9D=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentToRepairController.java          | 13 +++++++++
 .../sgzb/material/domain/EquipmentTask.java   | 27 ++++++++++---------
 .../impl/EquipmentToRepairServiceImpl.java    |  1 +
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/EquipmentToRepairController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/EquipmentToRepairController.java
index cb31ce5..4516381 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/EquipmentToRepairController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/EquipmentToRepairController.java
@@ -133,4 +133,17 @@ public class EquipmentToRepairController extends BaseController {
         AjaxResult ajaxResult = service.deleteEquipmentNew(bean);
         return ajaxResult;
     }
+
+    /**
+     * 导出维保列表
+     */
+    @Log(title = "导出维保列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+//    @RequiresPermissions("repair:manage:export")
+    public void export(HttpServletResponse response, EquipmentTask bean)
+    {
+        List<EquipmentTask> list = service.getEquipmentList(bean);
+        ExcelUtil<EquipmentTask> util = new ExcelUtil<EquipmentTask>(EquipmentTask.class);
+        util.exportExcel(response, list, "维保列表");
+    }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentTask.java
index c08536d..9eef691 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentTask.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentTask.java
@@ -27,7 +27,7 @@ public class EquipmentTask {
     /**
      * 编码
      */
-    @ApiModelProperty(value = "编码")
+    @Excel(name = "机具编号",sort = 3)
     private String maCode;
 
     /**
@@ -47,12 +47,14 @@ public class EquipmentTask {
      * 维保时间
      */
     @ApiModelProperty(value = "维保时间")
+    @Excel(name = "维修时间",sort = 6)
     private String repairTime;
 
     /**
      * 维保状态
      */
     @ApiModelProperty(value = "维保状态")
+    @Excel(name = "维保状态",sort = 7,readConverterExp = "0=待提交,1=已提交")
     private Integer repairStatus;
     /**
      * 关键字
@@ -69,30 +71,31 @@ public class EquipmentTask {
     private Long companyId;
     private Long agreementId;
 
-    /**
-     * 维修机具类型
-     */
-    @ApiModelProperty(value = "维修规格型号")
-    @Excel(name = "维修规格型号",sort = 1)
-    private String typeModelName;
     /**
      * 规格型号
      */
-    @ApiModelProperty(value = "维修机具类型")
-    @Excel(name = "维修机具类型",sort = 2)
+    @ApiModelProperty(value = "规格型号")
+    @Excel(name = "规格型号",sort = 2)
+    private String typeModelName;
+    /**
+     * 机具名称
+     */
+    @ApiModelProperty(value = "机具名称")
+    @Excel(name = "机具名称",sort = 1)
     private String typeName;
 
     /**
      * 维修总量
      */
-    @ApiModelProperty(value = "维修总量")
-    @Excel(name = "维修总量",sort = 3)
+    @ApiModelProperty(value = "维修数量")
+    @Excel(name = "维修数量",sort = 4)
     private int repairNum;
 
     /**
      * 维修人员
      */
-    @ApiModelProperty(value = "维修人员")
+    @ApiModelProperty(value = "维修人")
+    @Excel(name = "维修人",sort = 5)
     private String repairer;
 
     //类型ID
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/EquipmentToRepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/EquipmentToRepairServiceImpl.java
index 960cfec..ebaf88a 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/EquipmentToRepairServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/EquipmentToRepairServiceImpl.java
@@ -280,6 +280,7 @@ public class EquipmentToRepairServiceImpl implements EquipmentToRepairService {
             //删除sys_file_info表
             mapper.deleteFileEquipmentList(record);
         }
+        //新增配件和文件数据
         LoginUser loginUser = SecurityUtils.getLoginUser();
         bean.setUpdateBy(loginUser.getUserid().toString());
         bean.setCreateBy(loginUser.getUserid());