优化首页企业数

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

@@ -48,19 +48,19 @@
 
 	<select id="getAllSum" resultType="Map">
 		SELECT count(id) allqy,COUNT(DISTINCT des13) allper FROM ly_enterprise_info
-		WHERE del_flag = 0 ;
+		WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '') ;
 	</select>
 
 	<select id="getAllSum2" resultType="Map">
 		SELECT count(id) allqy,COUNT(DISTINCT des13) allper FROM ly_enterprise_info
-		WHERE del_flag = 0 AND des13 = #{loginName} ;
+		WHERE del_flag = 0 AND des13 = #{loginName} AND (des13 IS NOT NULL OR des13 != '') ;
 	</select>
 
 	<select id="getFinishSum" resultType="Map">
 		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
+		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL OR des13 != '')
 		AND DATE_FORMAT(b.create_date, '%Y-%m-%d') >= #{start} AND DATE_FORMAT(b.create_date, '%Y-%m-%d') &lt;= #{end};
 	</select>
 
@@ -68,7 +68,7 @@
 		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
+		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL OR des13 != '')
 		AND des13 = #{loginName}
 		AND DATE_FORMAT(b.create_date, '%Y-%m-%d') >= #{start} AND DATE_FORMAT(b.create_date, '%Y-%m-%d') &lt;= #{end};
 	</select>
@@ -91,17 +91,17 @@
 	</select>
 
 	<select id="getPerson" resultType="Map">
-		SELECT des1, COUNT(DISTINCT des13) AS perNum FROM ly_enterprise_info WHERE del_flag = 0 AND des13 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 OR des13 != '') GROUP BY des1;
 	</select>
 
 	<select id="getAreaInfo" resultType="Map">
-		SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 GROUP BY des1;
+		SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 AND des13 IS NOT NULL GROUP BY des1;
 	</select>
 
 	<select id="getPersonInfo" resultType="Map">
 		SELECT COUNT(DISTINCT b.id) sum,des13,des14 as bz5,des1 FROM ly_enterprise_info a
 		LEFT JOIN
-		(SELECT * FROM ly_service WHERE del_flag = 0
+		(SELECT * FROM ly_service WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
 		<if test="beginTime != ''">
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{endTime}
 		</if>
@@ -126,7 +126,7 @@
 	<select id="getCompanyInfo" resultType="Map">
 		SELECT b.id AS sum,des13,des14,des1,name FROM ly_enterprise_info a
 		LEFT JOIN
-		(SELECT * FROM ly_service WHERE del_flag = 0
+		(SELECT * FROM ly_service WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
 		<if test="beginTime != ''">
 			AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{endTime}
 		</if>