提交

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderVo.java

@@ -36,6 +36,7 @@ public class GOrderVo {
      */
 	@ApiModelProperty("主键id")
 	private Long id;
+	private Long anjianId;
 
     /**
      * 订单号

ruoyi-gas/src/main/resources/mapper/GOrderMapper.xml

@@ -26,7 +26,19 @@
     </resultMap>
 
     <select id="getListAll" resultType="com.ruoyi.gas.domain.vo.GOrderVo">
-        select a.id as id,
+        select
+        if(CONCAT(
+        f.dict_label,
+        '-',
+        e.NAME,
+        '-',
+        d.NAME,
+        '-',
+        c.NAME,
+        '-',
+        b.NAME
+        ) is null,null,(select go.id from g_order go where go.house_id = a.house_id and go.del_flag='0' and go.service_type='004' LIMIT 1)) as anjianId,
+        a.id as id,
         a.service_type as serviceType,
         u.name as userName,
         a.pipe_type as pipeType,