代码合并

zd-modules/zd-modules-laboratory/src/main/resources/bootstrap.yml

@@ -20,7 +20,3 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
 
-##日志
-logging:
-  level:
-    root: info

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabWhiteJoinSublistMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.id, t.white_user_id, t.subject_id, t.create_by, t.create_time, t.update_by, t.update_time, t.remark from lab_white_join_sublist as t
     </sql>
     <select id="selectLabWhiteJoinSublistList" parameterType="com.zd.laboratory.domain.LabWhiteJoinSublist" resultType="com.zd.laboratory.domain.vo.LabSubjectVO">
-        select
+    select
         t.white_user_id,
         t.subject_id,
         t.create_by,
@@ -31,19 +31,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t.update_time,
         t.remark,
         s.`name`,
-        dt.`dept_name` building,
+        (select f.`name`
+        from lab_build_floor f
+        where f.type = 2
+        and f.id =
+        (select bfl.build_id
+        from lab_build_floor_layout bfl
+        where bfl.sub_id = t.subject_id)) building,
         dpt.`dept_name`,
         ur.`nick_name` adminName,
         cfd.`classified_name` levelName,
-        bg.name buildName
+        (select f.`name`
+        from lab_build_floor f
+        where f.type = 3
+        and f.id =bfl.floor_id) buildName
         from
         lab_white_join_sublist as t
         LEFT join lab_subject s on t.subject_id = s.`id`
-        LEFT join sys_dept dt on s.`build_id` = dt.`dept_id`
         LEFT join sys_dept dpt on s.`dept_id` = dpt.`dept_id`
         LEFT join sys_user ur on s.`admin_id` = ur.`user_id`
         LEFT join lab_safe_classified cfd on s.level = cfd.`id`
-        LEFT JOIN lab_building bg ON bg.id = s.floor_id
+        LEFT JOIN lab_build_floor_layout bfl ON bfl.sub_id = t.subject_id
         <where>
             <if test="whiteUserId != null ">and t.white_user_id = #{whiteUserId}</if>
             <if test="subjectId != null ">and t.subject_id = #{subjectId}</if>