Merge branch 'master' of http://42.192.7.176:3000/suojin/lab-ops-svr

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;
 
 	/**
 	 * 专业名称

src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java

@@ -169,6 +169,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);
 
             // 保存任务详情

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>