Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngiineeringPhotoMapper.xml

@@ -38,14 +38,15 @@
 
     <select id="getObjInfo" resultType="java.util.Map">
         SELECT
-            IF(ISNULL(gy.engin_name),IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name),gy.engin_name) AS engin_name,
-            IF(ISNULL(gy.engin_name),IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-','市政工程'),'危险工程'),'基建工程'),'顶管工程'),'工业工程') AS type
+            IF(ISNULL(gy.engin_name),IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),IF(ISNULL(toe.engin_name),'-',toe.engin_name),zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name),gy.engin_name) AS engin_name,
+            IF(ISNULL(gy.engin_name),IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),IF(ISNULL(toe.engin_name),'-','碰口工程'),'市政工程'),'危险工程'),'基建工程'),'顶管工程'),'工业工程') AS type
         FROM z_engineering_node ze
                  LEFT JOIN z_engineering_pipe_jacking zepj ON zepj.id = ze.civli_id
                  LEFT JOIN z_engineering_infrastructure zei ON zei.id = ze.civli_id
                  LEFT JOIN z_engineering_dangerous zed ON zed.id = ze.civli_id
                  LEFT JOIN z_engineering_industry zein ON zein.id = ze.civli_id
                  LEFT JOIN z_engineering_gy gy ON gy.id = ze.civli_id
+                 LEFT JOIN z_touch_operation_engineering toe ON toe.id = ze.civli_id
         WHERE ze.id = #{nodeId}
     </select>