双十一活动统计页面改造

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupActivityDao.java

@@ -104,9 +104,9 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
     * @author zx
     * @date 2021/10/25 15:44
     */
-	List<DoubleEleven2021Dto> countOrganDoubleEleven2021Statis(@Param("organId") Integer organId);
+	List<DoubleEleven2021Dto> countOrganDoubleEleven2021Statis(@Param("organId") String organId);
 
-	List<DoubleEleven2021Dto> countOrganDoubleEleven2022Statis(@Param("organId") Integer organId);
+	List<DoubleEleven2021Dto> countOrganDoubleEleven2022Statis(@Param("organId") String organId);
 
 	/**
 	* @description: 双十一活动统计

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OrganDoubleEleven2021StatisDto.java

@@ -2,17 +2,17 @@ package com.ym.mec.biz.dal.dto;
 
 public class OrganDoubleEleven2021StatisDto{
 
-    private Integer organId;
+    private String organId;
 
     private String order = "DESC";
 
     private String sort = "totalBuyAmount";
 
-    public Integer getOrganId() {
+    public String getOrganId() {
         return organId;
     }
 
-    public void setOrganId(Integer organId) {
+    public void setOrganId(String organId) {
         this.organId = organId;
     }
 

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -475,10 +475,7 @@
 		SELECT SUM(spo.expect_amount_) total_buy_amount_,COUNT(DISTINCT spo.user_id_) total_buy_num_,o.name_ organ_name_,o.id_ organ_id_
 		FROM organization o
 		LEFT JOIN student_payment_order spo ON o.id_ = spo.organ_id_ AND spo.type_ = 'DOUBLE_ELEVEN2021' AND spo.status_ = 'SUCCESS'
-		WHERE o.id_ IN (10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16,4)
-		<if test="organId != null">
-			AND o.id_ = #{organId}
-		</if>
+		WHERE FIND_IN_SET(o.id_,#{organId})
 		GROUP BY o.id_
 	</select>
 	<select id="countOrganDoubleEleven2022Statis" resultMap="DoubleEleven2021Dto">
@@ -486,10 +483,7 @@
 		FROM organization o
 		LEFT JOIN student_payment_order spo ON o.id_ = spo.organ_id_
 		AND spo.group_type_ = 'ACTIVITY' AND spo.type_ = 'SMALL_CLASS_TO_BUY' AND spo.status_ = 'SUCCESS' AND spo.memo_ = '2022双十一活动购买'
-		WHERE o.id_ IN (10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16,4)
-		<if test="organId != null">
-			AND o.id_ = #{organId}
-		</if>
+		WHERE FIND_IN_SET(o.id_,#{organId})
 		GROUP BY o.id_
 	</select>
 	<resultMap id="DoubleEleven2021OrderDetailDto" type="com.ym.mec.biz.dal.dto.DoubleEleven2021OrderDetailDto">

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -552,6 +552,9 @@ public class ExportController extends BaseController {
     @RequestMapping("export/organDoubleEleven2022Statis")
     @PreAuthorize("@pcs.hasPermissions('export/organDoubleEleven2022Statis')")
     public void organDoubleEleven2022Statis(HttpServletResponse response, OrganDoubleEleven2021StatisDto statisDto) throws IOException {
+        if(StringUtils.isEmpty(statisDto.getOrganId())){
+            statisDto.setOrganId("10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16");
+        }
         List<DoubleEleven2021Dto> rows = vipGroupActivityService.organDoubleEleven2022Statis(statisDto);
         if (rows.size() < 1) {
             throw new BizException("没有可导出数据");

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -18,6 +18,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
@@ -60,6 +61,9 @@ public class VipGroupActivityController extends BaseController {
     @GetMapping("/organDoubleEleven2022Statis")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/organDoubleEleven2022Statis')")
     public HttpResponseResult organDoubleEleven2022Statis(OrganDoubleEleven2021StatisDto queryInfo){
+        if(StringUtils.isEmpty(queryInfo.getOrganId())){
+            queryInfo.setOrganId("10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16");
+        }
         return succeed(vipGroupActivityService.organDoubleEleven2022Statis(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -86,8 +86,18 @@ public class ActivityController extends BaseController {
     }
 
     @ApiOperation(value = "分部双11活动统计")
+    @GetMapping("/organDoubleEleven2022Statis1（杭州）")
+    public HttpResponseResult organDoubleEleven2022Statis1(OrganDoubleEleven2021StatisDto queryInfo){
+        queryInfo.setOrganId("4");
+        return succeed(vipGroupActivityService.organDoubleEleven2022Statis(queryInfo));
+    }
+
+    @ApiOperation(value = "分部双11活动统计")
     @GetMapping("/organDoubleEleven2022Statis")
     public HttpResponseResult organDoubleEleven2022Statis(OrganDoubleEleven2021StatisDto queryInfo){
+        if(StringUtils.isEmpty(queryInfo.getOrganId())){
+            queryInfo.setOrganId("10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16");
+        }
         return succeed(vipGroupActivityService.organDoubleEleven2022Statis(queryInfo));
     }