|
@@ -66,7 +66,7 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getPerson" resultType="Map">
|
|
<select id="getPerson" resultType="Map">
|
|
- SELECT des1, COUNT(DISTINCT bz5) 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 bz5 IS NOT NULL GROUP BY des1;
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getAreaInfo" resultType="Map">
|
|
<select id="getAreaInfo" resultType="Map">
|
|
@@ -74,22 +74,22 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getPersonInfo" resultType="Map">
|
|
<select id="getPersonInfo" resultType="Map">
|
|
- SELECT COUNT(DISTINCT b.id) sum,bz5 FROM ly_enterprise_info a
|
|
|
|
|
|
+ SELECT COUNT(DISTINCT b.id) sum,des13,des14 as bz5 FROM ly_enterprise_info a
|
|
LEFT JOIN
|
|
LEFT JOIN
|
|
(SELECT * FROM ly_service WHERE del_flag = 0
|
|
(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>
|
|
) b ON a.id = b.qy_id
|
|
) b ON a.id = b.qy_id
|
|
- WHERE a.del_flag = 0 AND bz5 IS NOT NULL
|
|
|
|
|
|
+ WHERE a.del_flag = 0 AND des13 IS NOT NULL
|
|
<if test="des1 != ''">
|
|
<if test="des1 != ''">
|
|
AND des1 = #{des1}
|
|
AND des1 = #{des1}
|
|
</if>
|
|
</if>
|
|
<if test="name != ''">
|
|
<if test="name != ''">
|
|
AND name LIKE CONCAT('%', #{name}, '%')
|
|
AND name LIKE CONCAT('%', #{name}, '%')
|
|
</if>
|
|
</if>
|
|
- GROUP BY bz5
|
|
|
|
- ORDER BY bz5;
|
|
|
|
|
|
+ GROUP BY des13
|
|
|
|
+ ORDER BY des13;
|
|
</select>
|
|
</select>
|
|
|
|
|
|
</mapper>
|
|
</mapper>
|