气瓶模块新旧位置更改代码优化

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpBottleStorageMapper.xml

@@ -122,16 +122,7 @@
                t.air_bottle_config_id,
                (select nick_name from sys_user u where u.user_id = t.storage_userid)   storageUser,
                (select phonenumber from sys_user u where u.user_id = t.storage_userid) storageUserPhone,
-               (select l.room room
-                from lab_subject s,
-                     lab_subject_layout l
-                where s.layout_id = l.id
-                  and s.id = (select ta.location_id
-                              from qp_bottle_storage bs,
-                                   qp_task ta
-                              where bs.task_id = ta.id
-                                and bs.task_detail_id = t.task_detail_id
-                                                                                       LIMIT 1))                                                        room,
+               (select  fl.room_num from  qp_task ta,lab_build_floor_layout fl where ta.id=t.task_id and ta.location_id = fl.sub_id) room,
                (
         select location
         from qp_task ta
@@ -300,13 +291,13 @@
     <select id="calcLocationStorage" resultType="com.zd.airbottle.domain.vo.report.AirAmount"
             parameterType="java.lang.String">
         select * from (SELECT
-        ls.room `name`,
+        fl.room_num `name`,
         COUNT( 1 ) in_num
         FROM
         qp_bottle_storage qs
         INNER JOIN qp_task qt ON qt.id=qs.task_id
         INNER JOIN lab_subject su on su.id = qt.location_id
-        INNER JOIN lab_subject_layout ls on ls.id=su.layout_id
+        INNER JOIN lab_build_floor_layout fl on fl.sub_id = qt.location_id
         WHERE
         DATE_FORMAT( qs.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ), '%Y-%m' )
         AND qs.air_status=0
@@ -314,7 +305,7 @@
             AND qs.air_bottle_name LIKE concat('%', #{airName}, '%')
         </if>
         GROUP BY
-        ls.id
+        fl.id
         ) t ORDER BY t.in_num desc
     </select>
 

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpQualificationApplyMapper.xml

@@ -75,7 +75,7 @@
                t.center_audit_status, t.center_audit_userid,t.center_audit_username,
                t.center_audit_time, t.center_audit_cause,
                t.create_time,
-               (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=t.subject_id) room,
+               (select fl.room_num from lab_build_floor_layout fl where fl.sub_id=t.subject_id) room,
                ( select sum(d.bottle_number) from qp_qualification_apply_detail d where d.qualificate_apply_id = t.id) bottle_number,
                ( select admin_id from lab_subject  su where  su.id=t.subject_id ) admin_id
         from qp_qualification_apply as t
@@ -242,7 +242,7 @@
     <select id="selectQpApplyList" parameterType="com.zd.airbottle.domain.QpQualificationApply" resultMap="QpQualificationApplyResultVO">
         select * from (
         select qa.id,qa.location,qa.apply_user,qa.create_time,qa.lead_audit_status,qa.center_audit_status,'zg' remark,
-        (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=qa.subject_id) room
+        (select fl.room_num  from lab_build_floor_layout fl where fl.sub_id = qa.subject_id) room
         from qp_qualification_apply qa where 1=1
         <if test="auditStatus == 0"> and qa.lead_audit_status=0 or center_audit_status=0</if> /**待审核 **/
         <if test="auditStatus == 1"> and qa.center_audit_status=1</if> /** 通过 **/
@@ -250,7 +250,7 @@
         <if test="auditStatus == 3"> and (qa.lead_audit_status!=0 or  qa.center_audit_status!=0) </if> /** 已审核 **/
         UNION ALL
         select ua.id,ua.location,ua.apply_user,ua.create_time,ua.lead_audit_staus,ua.center_audit_status,'yq' remark,
-        (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=ua.subject_id) room
+        (select fl.room_num  from lab_build_floor_layout fl where fl.sub_id = ua.subject_id) room
         from qp_usegas_apply ua where 1=1
         <if test="auditStatus == 0"> and ua.lead_audit_staus=0 or ua.center_audit_status=0</if>/**待审核 **/
         <if test="auditStatus == 1"> and ua.center_audit_status=1 </if> /** 通过 **/
@@ -263,7 +263,7 @@
     <select id="selectQpApplyListManageApp" parameterType="com.zd.airbottle.domain.QpQualificationApply" resultMap="QpQualificationApplyResultVO">
         select * from (
                           select qa.id,qa.location,qa.apply_user,qa.create_time,qa.lead_audit_status,qa.center_audit_status,'zg' remark,
-                          (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=qa.subject_id) room
+                          (select fl.room_num from lab_build_floor_layout fl  where fl.sub_id = qa.subject_id) room
                           from qp_qualification_apply qa where 1=1
                             <if test="ids == null">
                                 <if test="zgBoolean == false">
@@ -291,7 +291,7 @@
 
                           UNION ALL
                           select ua.id,ua.location,ua.apply_user,ua.create_time,ua.lead_audit_staus,ua.center_audit_status,'yq' remark,
-                           (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=ua.subject_id) room
+                           (select fl.room_num from lab_build_floor_layout fl  where fl.sub_id = ua.subject_id) room
                           from qp_usegas_apply ua where 1=1
                             <if test="ids == null">
                                 <if test="yqBoolean == false">

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTaskMapper.xml

@@ -315,7 +315,7 @@
     <select id="selectUseRecord" parameterType="com.zd.airbottle.domain.vo.QpTaskVO" resultMap="QpTaskResult">
         select
         ta.location,ta.location_id,
-        (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and s.id=ta.location_id)
+        (select  l.room_num from lab_build_floor_layout l where l.sub_id=ta.location_id)
         room
         from qp_bottle_storage bs
         left JOIN qp_task ta on ta.id = bs.task_id

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpUsegasApplyMapper.xml

@@ -48,7 +48,7 @@
                t.lead_audit_userid, t.lead_audit_username, t.lead_audit_time, t.lead_audit_cause,
                t.center_audit_status, t.center_audit_userid, t.center_audit_username, t.center_audit_time,
                t.center_audit_cause, t.create_time,
-               (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=t.subject_id) room,
+               (select fl.room_num from lab_build_floor_layout fl where fl.sub_id = t.subject_id) room,
                ( select admin_id from lab_subject  su where  su.id=t.subject_id ) admin_id
         from qp_usegas_apply as t
                  LEFT JOIN   sys_dept d on   t.dept_id=d.dept_id