Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/resources/mapper/TaBuildingMapper.xml

@@ -451,8 +451,10 @@
                 u.be_uv AS building_id
             FROM
                 ta_uv u
-            WHERE
+            LEFT JOIN ta_person p ON u.person_id = p.person_id
+        WHERE
                 u.tagert_type = 'project'
+                AND p.org_id = #{orgId}
             <if test="startDate != null">
                 and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
             </if>
@@ -631,21 +633,23 @@
         LEFT JOIN (
             SELECT
                 count( * ) AS uv_num,
-                be_uv AS building_id,
-                DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+                u.be_uv AS building_id,
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
             FROM
-                ta_uv
+                ta_uv u
+                LEFT JOIN ta_person p ON u.person_id = p.person_id
             WHERE
                 tagert_type = 'project'
-                AND be_uv = #{buildingId}
+                AND p.org_id = #{orgId}
+                AND u.be_uv = #{buildingId}
                 <if test="startDate != null">
-                    and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+                    and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
                 </if>
                 <if test="endDate != null">
-                    and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+                    and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
                 </if>
             GROUP BY
-                DATE_FORMAT( create_date, '%Y-%m-%d' )
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
         ORDER BY create_date
     </select>
@@ -714,27 +718,29 @@
         LEFT JOIN (
         SELECT
         count( * ) AS uv_num,
-        be_uv AS building_id,
-        DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+        u.be_uv AS building_id,
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
         FROM
-        ta_uv
+        ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
         WHERE
-        tagert_type = 'project'
-        AND be_uv = #{buildingId}
+        u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
+        AND u.be_uv = #{buildingId}
         <if test="startDate != null">
-            and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+            and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
         </if>
         <if test="endDate != null">
-            and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+            and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
         </if>
         GROUP BY
-        DATE_FORMAT( create_date, '%Y-%m-%d' )
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
         ORDER BY
         <if test="sortField != null and sortField != ''">
              ${sortField} ${orderType},
         </if>
-        create_date
+        create_date desc
     </select>
 
 </mapper>