gaodd 1 рік тому
батько
коміт
7328468e3f

+ 2 - 2
src/main/java/com/chinaitop/agile/mapper/CrkRecordMapper.xml

@@ -324,10 +324,10 @@
324
 	order by crkRecord.rq DESC
324
 	order by crkRecord.rq DESC
325
   </select>
325
   </select>
326
   <select id="queryJyxxNew" resultType="java.util.Map" parameterType="java.util.Map">
326
   <select id="queryJyxxNew" resultType="java.util.Map" parameterType="java.util.Map">
327
-  	select b.zbxmc zbxmc,c.enumitemname enumname,b.jyz jyz,b.jykl jykl,b.jykj jykj,c.parentid parentid
327
+  	select b.zbxmc zbxmc,c.enumname enumname,b.jyz jyz,b.jykl jykl,b.jykj jykj,c.parentid parentid
328
 	from data_crkyw_jyxx_default a
328
 	from data_crkyw_jyxx_default a
329
 	left join data_crkyw_jyxx_flt_001 b on b.maindataid=a.dataid
329
 	left join data_crkyw_jyxx_flt_001 b on b.maindataid=a.dataid
330
-	left join enumitem c on c.enumitemid=b.zbxmc and c.enumid='1046'
330
+	left join basic_enum c on c.enumId=b.zbxmc and c.enumid='1046'
331
 	where 1=1 and a.bizno=#{bizNo}
331
 	where 1=1 and a.bizno=#{bizNo}
332
   </select>
332
   </select>
333
   <select id="queryDataLspz" resultType="java.util.Map" parameterType="java.util.Map">
333
   <select id="queryDataLspz" resultType="java.util.Map" parameterType="java.util.Map">