Merge remote-tracking branch 'origin/master'

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/lyservice/mapper/xml/LyServiceMapper.xml

@@ -47,12 +47,12 @@
 	</select>
 
 	<select id="getAllSum" resultType="Map">
-		SELECT count(id) allqy,COUNT(DISTINCT bz6) allper FROM ly_enterprise_info
+		SELECT count(id) allqy,COUNT(DISTINCT des13) allper FROM ly_enterprise_info
 		WHERE del_flag = 0 ;
 	</select>
 
 	<select id="getFinishSum" resultType="Map">
-		SELECT count(a.id) finishqy,COUNT(DISTINCT bz6) finishper
+		SELECT count(a.id) finishqy,COUNT(DISTINCT des13) finishper
 		FROM ly_enterprise_info a
 		LEFT JOIN ly_service b ON a.id = b.qy_id
 		WHERE a.del_flag = 0 AND qy_id IS NOT NULL
@@ -66,7 +66,7 @@
 	</select>
 
 	<select id="getPerson" resultType="Map">
-		SELECT des1, COUNT(DISTINCT des13) AS perNum FROM ly_enterprise_info WHERE del_flag = 0 AND bz5 IS NOT NULL GROUP BY des1;
+		SELECT des1, COUNT(DISTINCT des13) AS perNum FROM ly_enterprise_info WHERE del_flag = 0 AND des13 IS NOT NULL GROUP BY des1;
 	</select>
 
 	<select id="getAreaInfo" resultType="Map">
@@ -89,7 +89,7 @@
 			AND name LIKE CONCAT('%', #{name}, '%')
 		</if>
 		GROUP BY des13
-		ORDER BY des13;
+		ORDER BY sum DESC;
 	</select>
 
 </mapper>