|
@@ -95,13 +95,13 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getAreaInfo" resultType="Map">
|
|
<select id="getAreaInfo" resultType="Map">
|
|
- SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 AND des13 IS NOT NULL GROUP BY des1;
|
|
|
|
|
|
+ SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '') GROUP BY des1;
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getPersonInfo" resultType="Map">
|
|
<select id="getPersonInfo" resultType="Map">
|
|
SELECT COUNT(DISTINCT b.id) sum,des13,des14 as bz5,des1 FROM ly_enterprise_info a
|
|
SELECT COUNT(DISTINCT b.id) sum,des13,des14 as bz5,des1 FROM ly_enterprise_info a
|
|
LEFT JOIN
|
|
LEFT JOIN
|
|
- (SELECT * FROM ly_service WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
|
|
|
|
|
|
+ (SELECT * FROM ly_service WHERE del_flag = 0
|
|
<if test="beginTime != ''">
|
|
<if test="beginTime != ''">
|
|
AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') <= #{endTime}
|
|
AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') <= #{endTime}
|
|
</if>
|
|
</if>
|