From 2454ced832a1e3d898f3bc9d6bed391d86206e31 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Mon, 25 Nov 2024 14:14:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/MaintenancePlanDetail.java    | 19 +++++++++++++++++--
 .../impl/MaintenancePlanServiceImpl.java      |  1 +
 .../modules/system/mapper/DeptMapper.xml      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java
index 2ca1440..040a6f3 100644
--- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java
+++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java
@@ -23,15 +23,30 @@ public class MaintenancePlanDetail extends BaseEntity {
 
 	private Long planId;
 
+	/**
+	 * 设备id
+	 */
+	private Long deviceId;
+	/**
+	 * 设备名称
+	 */
+	private String deviceName;
+	/**
+	 * 楼层id
+	 */
+	private Long floorId;
 	/**
 	 * 楼层
 	 */
 	private String floorName;
-
 	/**
-	 * 房间
+	 * 房间id
 	 */
 	private Long deptId;
+	/**
+	 * 房间名称
+	 */
+	private String deptName;
 
 	/**
 	 * 专业名称
diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
index 28f4017..2a7e90e 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
@@ -172,6 +172,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
             maintenanceTask.setAddress(maintenancePlan.getAddress());
             maintenanceTask.setServicemanId(maintenancePlan.getServicemanId());
             maintenanceTask.setTaskContent(maintenancePlan.getPlanContent());
+            maintenanceTask.setStartTime(new Date());
             taskService.save(maintenanceTask);
 
             // 保存任务详情
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index aa82be1..9d031da 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -75,7 +75,7 @@
     </select>
 
     <select id="limsTree" resultMap="treeNodeResultMap">
-        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5,6)
+        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5,6,7)
         <if test="_parameter!=null and _parameter!=''">
             and tenant_id = #{_parameter}
         </if>