修改导出查询排序

陈威
1 parent 82b295ba
Showing 1 changed file with 3 additions and 8 deletions Show diff stats
backend/chkpower/src/main/resources/mapper/WCurrentMapper.xml
@@ -117,14 +117,9 @@
     </select>
  
     <select id="getCurrentOrgTypeList" resultType="java.lang.String">
-        SELECT orgParams.VALUE_ AS orgType
-        FROM uc_org  org
-        JOIN uc_org_params orgParams  on orgParams.ORG_ID_= org.ID_
-        WHERE 1=1
-        AND orgParams.VALUE_ !=''
-        AND orgParams.VALUE_ IS NOT NULL
-        GROUP BY  orgParams.VALUE_
-        ORDER BY MAX(org.ORDER_NO_) ASC
+        SELECT DISTINCT a.NAME_ FROM uc_org a
+        WHERE a.NAME_  IN (SELECT VALUE_  FROM  uc_org_params  WHERE VALUE_ !='' AND VALUE_ IS NOT NULL)
+        ORDER BY a.ORDER_NO_ ASC
     </select>
  
     <select id="listByOrgTypeAndDate" resultType="java.util.HashMap">
...	...	@@ -117,14 +117,9 @@
117	117	</select>
118	118
119	119	<select id="getCurrentOrgTypeList" resultType="java.lang.String">
120		- SELECT orgParams.VALUE_ AS orgType
121		- FROM uc_org org
122		- JOIN uc_org_params orgParams on orgParams.ORG_ID_= org.ID_
123		- WHERE 1=1
124		- AND orgParams.VALUE_ !=''
125		- AND orgParams.VALUE_ IS NOT NULL
126		- GROUP BY orgParams.VALUE_
127		- ORDER BY MAX(org.ORDER_NO_) ASC
	120	+ SELECT DISTINCT a.NAME_ FROM uc_org a
	121	+ WHERE a.NAME_ IN (SELECT VALUE_ FROM uc_org_params WHERE VALUE_ !='' AND VALUE_ IS NOT NULL)
	122	+ ORDER BY a.ORDER_NO_ ASC
128	123	</select>
129	124
130	125	<select id="listByOrgTypeAndDate" resultType="java.util.HashMap">
...	...