|
|
@@ -358,36 +358,36 @@
|
|
|
</if>
|
|
|
|
|
|
</if>
|
|
|
- <if test="role == 1 and name != null">
|
|
|
+ <if test="role == 1 and name != null">
|
|
|
and un.name like concat('%', #{name},'%')
|
|
|
</if>
|
|
|
- <if test="aid != null and aid !=''">
|
|
|
- and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
- <if test="departmentId != null and departmentId !=''">
|
|
|
- and d.department_id=#{departmentId,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
- <if test="startDate != null and startDate != ''">
|
|
|
- and a.transfer_time > #{startDate}
|
|
|
- </if>
|
|
|
- <if test="endDate != null and endDate != ''">
|
|
|
- and a.transfer_time < #{endDate}
|
|
|
- </if>
|
|
|
- <if test="province != null">
|
|
|
- and b.location_province = #{province,jdbcType=INTEGER}
|
|
|
- </if>
|
|
|
- <if test="city != null">
|
|
|
- and b.location_city = #{city,jdbcType=INTEGER}
|
|
|
- </if>
|
|
|
- <if test="area != null">
|
|
|
- and b.location_area = #{area,jdbcType=INTEGER}
|
|
|
- </if>
|
|
|
- <if test="orgCode != null">
|
|
|
- and b.org_code = #{orgCode}
|
|
|
- </if>
|
|
|
- <if test="page_sql != null">
|
|
|
- ${page_sql}
|
|
|
- </if>
|
|
|
+ <if test="aid != null and aid !=''">
|
|
|
+ and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="departmentId != null and departmentId !=''">
|
|
|
+ and d.department_id=#{departmentId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="startDate != null and startDate != ''">
|
|
|
+ and a.transfer_time > #{startDate}
|
|
|
+ </if>
|
|
|
+ <if test="endDate != null and endDate != ''">
|
|
|
+ and a.transfer_time < #{endDate}
|
|
|
+ </if>
|
|
|
+ <if test="province != null">
|
|
|
+ and b.location_province = #{province,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
+ <if test="city != null">
|
|
|
+ and b.location_city = #{city,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
+ <if test="area != null">
|
|
|
+ and b.location_area = #{area,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
+ <if test="orgCode != null">
|
|
|
+ and b.org_code = #{orgCode}
|
|
|
+ </if>
|
|
|
+ <if test="page_sql != null">
|
|
|
+ ${page_sql}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<!--因为查询到所有曾用名,所以在统计时需要用客户编号来归并-->
|
|
|
<select id="selectOrganizationCustomerCount" resultType="java.lang.Integer">
|