Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/resources/mapper/TaskMapper.xml

@@ -323,13 +323,18 @@
             t.task_list AS inspectionItem,
             DATE_FORMAT(t.create_time, '%Y-%m-%d') AS productionDate,
             GROUP_CONCAT(distinct s.trademark) AS brandImage,
-            GROUP_CONCAT(distinct s.sample_photos) AS samplePhotos
+            GROUP_CONCAT(distinct s.sample_photos) AS samplePhotos,
+            d.address AS inspectionCenterAddress,
+            d.phone AS inspectionCenterTelephone,
+            d.postcode AS inspectionCenterPostcode
         from
             t_task t
             left join t_task_sample_relation tsr on t.id = tsr.task_id
             left join t_sample s on tsr.sample_id = s.id
             left join t_automobile_enterprise ae on  s.manufacturing_enterprise_id = ae.id
             left join t_standard st on t.standard_id = st.id
+            left join sys_user u on t.task_initiator_id = u.user_id
+            left join sys_dept d on u.dept_id = d.dept_id
         where t.id = #{taskId}
         group by t.id
     </select>