新需求

src/main/java/com/huiju/estateagents/controller/StatisticalController.java

@@ -207,7 +207,9 @@ public class StatisticalController extends BaseController {
                                                 @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                                 @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
                                                 @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "sortField", required = false) String sortField,
+                                                @RequestParam(value = "sortOrder", required = false) String sortOrder,
                                                 HttpServletRequest request) {
-        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
     }
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -145,6 +145,6 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param personBuildingList
      * @return
      */
-    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType);
 
 }

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -145,5 +145,5 @@ public interface IStatisticalService {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder);
 }

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

@@ -447,9 +447,15 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder) {
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
         IPage<StatsBuilding> pg = new Page<>(pageNum, pageSize);
-        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList);
+        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType);
         return ResponseBean.success(page);
     }
 

src/main/resources/mapper/TaBuildingMapper.xml

@@ -407,6 +407,12 @@
                 AND a.realty_consultant IS NOT NULL
                 AND a.realty_consultant != ''
                 AND a.org_id = #{orgId}
+                <if test="startDate != null">
+                    and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
             GROUP BY
                 a.building_id
         ) aa ON aa.building_id = t.building_id
@@ -425,6 +431,12 @@
                     AND b.org_id = #{orgId}
                     AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
                     AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+                    <if test="startDate != null">
+                        and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                    </if>
+                    <if test="endDate != null">
+                        and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                    </if>
                 GROUP BY
                     b.person_id
             ) bb
@@ -439,11 +451,29 @@
                 ta_uv u
             WHERE
                 u.tagert_type = 'project'
+            <if test="startDate != null">
+                and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
             GROUP BY
                 u.be_uv
         ) uu ON uu.building_id = t.building_id
         WHERE
         t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != '' ">
+            AND t.building_id = #{buildingId}
+        </if>
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
     </select>
 
 </mapper>