bug

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

@@ -266,8 +266,10 @@ public class TaChannelController extends BaseController {
                                                      @RequestParam(value = "targetType", required = false)String targetType,
                                                      @RequestParam(value = "buildingId", required = false)String buildingId,
                                                      @RequestParam(value = "channelId") Integer channelId,
+                                                     @RequestParam(value = "sortField", required = false) String sortField,
+                                                     @RequestParam(value = "sortOrder", required = false) String sortOrder,
                                                      HttpServletRequest request) {
-        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId);
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder);
     }
 
     /**

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

@@ -56,7 +56,7 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @param buildingId
      * @return
      */
-    IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId);
+    IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId,@Param("sortField") String sortField,@Param("orderType") String orderType);
 
     IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
 

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

@@ -32,7 +32,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId);
+    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder);
 
     /**
      * 获取注册用户列表

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TsActivityDaily;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
@@ -42,9 +43,19 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId) {
+    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder) {
         IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
-        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId);
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        if(StringUtils.isEmpty(sortField)){
+            sortField = "new_customers";
+            orderType = "desc";
+        }
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType);
         return ResponseBean.success(data);
     }
 

src/main/resources/mapper/TaChannelMapper.xml

@@ -70,7 +70,22 @@
 
     <select id="getChannelIntroductionList" resultType="com.huiju.estateagents.entity.TsActivityDaily">
         SELECT
-            *
+            serial_no,
+            statis_date,
+            org_id,
+            building_id,
+            building_name,
+            target_id,
+            target_type,
+            target_name,
+            sum( share_num ) AS share_num,
+            sum( share_persons ) AS share_persons,
+            sum( visit_num ) AS visit_num,
+            sum( visit_persons ) AS visit_persons,
+            sum( new_persons ) AS new_persons,
+            sum( new_customers ) AS new_customers,
+            qr_code_id,
+            channel_id
         FROM
             ts_channel_daily
         WHERE
@@ -85,6 +100,10 @@
         <if test="buildingId != null and buildingId != ''">
             and building_id = #{buildingId}
         </if>
+        GROUP BY   target_id, target_type
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
     </select>
     <select id="getChannelNewuserList"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">