From 62c81d8fa08813d81f9c0d4c808958d8c73ac10e Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 26 Nov 2024 16:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/common/biz/enums/LeaseInfoEnum.java | 24 ++++++++++++++++++
 .../common/biz/enums/LeaseTaskStatusEnum.java | 25 -------------------
 .../material/device/BmFileInfoMapper.xml      |  8 +++---
 3 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java
 delete mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java
new file mode 100644
index 0000000..bb3cf7e
--- /dev/null
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseInfoEnum.java
@@ -0,0 +1,24 @@
+package com.bonus.common.biz.enums;
+
+import lombok.Getter;
+
+/**
+ * @author ma_sh
+ * @version : 1.0
+ * 租赁需求大厅状态枚举
+ */
+@Getter
+public enum LeaseInfoEnum {
+
+    LEASE_PENDING_ORDER(0, "待接单"),
+    LEASE_ORDER_RECEIVED(1, "已接单"),
+    LEASE_PAST_DUE(2, "已到期");
+
+    private final Integer status;
+    private final String statusName;
+
+    LeaseInfoEnum(Integer status, String statusName) {
+        this.status = status;
+        this.statusName = statusName;
+    }
+}
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
deleted file mode 100644
index 5b7b8c6..0000000
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.bonus.common.biz.enums;
-
-import lombok.Getter;
-
-/**
- * @author : 阮世耀
- * @version : 1.0
- * 领料任务状态枚举
- */
-@Getter
-public enum LeaseTaskStatusEnum {
-
-    LEASE_TASK_TO_PUBLISHED(1, "待发布"),
-    LEASE_TASK_TO_AUDIT(2, "待审核"),
-    LEASE_TASK_IN_PROGRESS(3, "出库进行中"),
-    LEASE_TASK_FINISHED(4, "出库已完成");
-
-    private final Integer status;
-    private final String statusName;
-
-    LeaseTaskStatusEnum(Integer status, String statusName) {
-        this.status = status;
-        this.statusName = statusName;
-    }
-}
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
index adf345d..d86ee17 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/BmFileInfoMapper.xml
@@ -58,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskType != null">#{taskType},</if>
             <if test="taskId != null">#{taskId},</if>
             <if test="modelId != null">#{modelId},</if>
-            <if test="fileName != null">#{name},</if>
-            <if test="fileUrl != null">#{url},</if>
+            <if test="fileName != null">#{fileName},</if>
+            <if test="fileUrl != null">#{fileUrl},</if>
             <if test="fileType != null">#{fileType},</if>
             <if test="createBy != null">#{createBy},</if>
             now()
@@ -89,8 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskType != null">task_type = #{taskType},</if>
             <if test="taskId != null">task_id = #{taskId},</if>
             <if test="modelId != null">model_id = #{modelId},</if>
-            <if test="fileName != null">name = #{name},</if>
-            <if test="fileUrl != null">url = #{url},</if>
+            <if test="fileName != null">name = #{fileName},</if>
+            <if test="fileUrl != null">url = #{fileUrl},</if>
             <if test="fileType != null">file_type = #{fileType},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             update_time = now()