获取已分配实验室接口

src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -87,4 +87,16 @@ public interface CommonConstant {
 	Integer TRUE_INT = 1;
 	Integer FALSE_INT = 0;
 
+	/**
+	 * 实验室：2附件、3图纸
+	 */
+	Integer LIMS_ATTACHES = 2;
+	Integer LIMS_DRAWS = 3;
+
+	/**
+	 * 巡检周期 1:月， 2：季， 3：半年
+	 */
+	Integer ERIOD_MONTH = 1;
+	Integer ERIOD_QUARTER = 2;
+	Integer ERIOD_HALF_YEAR = 3;
 }

src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -189,7 +189,7 @@ public class DeptController extends BladeController {
     }
 
     /**
-     * 实验室下拉
+     * 获取未绑定实验室下拉
      */
     @GetMapping("/limsTree")
     public R<List<DeptVO>> limsTree(String tenantId) {
@@ -197,4 +197,13 @@ public class DeptController extends BladeController {
         return R.data(tree);
     }
 
+    /**
+     * 获取已绑定实验室下拉
+     */
+    @GetMapping("/assLimsTree")
+    public R<List<DeptVO>> assLimsTree(String tenantId) {
+        List<DeptVO> tree = deptService.assLimsTree(Func.toStrWithEmpty(tenantId, "000000"));
+        return R.data(tree);
+    }
+
 }

src/main/java/org/springblade/modules/system/mapper/DeptMapper.java

@@ -26,6 +26,7 @@
 package org.springblade.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springblade.modules.system.pojo.entity.Dept;
 import org.springblade.modules.system.pojo.vo.DeptVO;
 
@@ -56,7 +57,21 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	 * @return
 	 */
 	List<DeptVO> tree(String tenantId);
-	List<DeptVO> limsTree(String tenantId);
+
+	/**
+	 * 获取未绑定绑定实验室列表
+	 * @param tenantId
+	 * @return
+	 */
+	List<DeptVO> noAssLimsTree(String tenantId);
+
+	/**
+	 * 获取已绑定绑定实验室列表
+	 *
+	 * @param tenantId
+	 * @return
+	 */
+	List<DeptVO> assLimsTree(@Param("tenantId")String tenantId, @Param("createUser") Long createUser);
 
 	/**
 	 * 懒加载获取树形节点

src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -74,8 +74,8 @@
         ORDER BY sort
     </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)
+    <select id="noAssLimsTree" 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 = 5
         and id not in (SELECT dept_id FROM lab_maintenance_plan WHERE is_deleted = 0)
         <if test="_parameter!=null and _parameter!=''">
             and tenant_id = #{_parameter}
@@ -120,5 +120,26 @@
         </foreach>
         and is_deleted = 0
     </select>
+    <select id="assLimsTree" resultType="org.springblade.modules.system.pojo.vo.DeptVO">
+        SELECT
+            id,
+            parent_id,
+            dept_name AS title,
+            id AS "value",
+            id AS "key"
+        FROM
+            blade_dept
+        WHERE
+            is_deleted = 0 AND dept_category = 5 AND id IN (
+            SELECT
+                dept_id
+            FROM
+                lab_maintenance_plan
+            WHERE
+                is_deleted = 0
+                <if test = "tenantId!=null and tenantId!=''" >AND create_user = #{createUser}</if>)
+        <if test = "tenantId!=null and tenantId!=''" >AND tenant_id = #{tenantId}</if>
+        ORDER BY sort
+    </select>
 
 </mapper>

src/main/java/org/springblade/modules/system/service/IDeptService.java

@@ -133,5 +133,17 @@ public interface IDeptService extends IService<Dept> {
 	 */
 	List<DeptVO> search(String deptName, Long parentId);
 
+	/**
+	 * 获取未绑定实验室
+	 * @param tenantId
+	 * @return
+	 */
 	List<DeptVO> limsTree(String tenantId);
+
+	/**
+	 * 获取已绑定实验室
+	 * @param tenantId
+	 * @return
+	 */
+	List<DeptVO> assLimsTree(String tenantId);
 }

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -185,7 +185,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 	@Override
 	public List<DeptVO> limsTree(String tenantId) {
-		return baseMapper.limsTree(tenantId);
+		return baseMapper.noAssLimsTree(tenantId);
+	}
+
+	@Override
+	public List<DeptVO> assLimsTree(String tenantId) {
+		return baseMapper.assLimsTree(tenantId, AuthUtil.getUserId());
 	}
 
 }