上报查询中去除新员工

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -38,7 +38,7 @@
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
-        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}
+        INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} and suu.unit_id > 7000
         left join ms_report msr on msr.house_id = suh.house_id and
         <if test="date!=null and date!=''">
             msr.report_date = #{date}
@@ -57,7 +57,8 @@
             </if>
             <if test="queryProperties != null and queryProperties != ''">
                 and (suho.linkman like concat('%',#{queryProperties},'%')
-                or suho.phone like concat('%',#{queryProperties},'%'))
+                or suho.phone like concat('%',#{queryProperties},'%')
+                or suh.doorplate like concat('%',#{queryProperties},'%'))
             </if>
             <if test="departmentId != null and departmentId != ''">
                 and suh.department_id = #{departmentId}
@@ -163,7 +164,7 @@
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId,suh.house_id as houseId
         from sys_uptown_house suh
         left join sys_uptown_home suho on suho.house_id=suh.house_id
-        left JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id
+        left JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.unit_id > 7000
         left join ms_report msr on msr.house_id = suh.house_id
         <if test="date!=null and date!=''">
             and msr.report_date = #{date}