双十一活动

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

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

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupActivityService.java

@@ -75,7 +75,7 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
     * @author zx
     * @date 2021/10/25 12:07
     */
-    List<DoubleEleven2021Dto> organDoubleEleven2021Statis(String order,String sort);
+    List<DoubleEleven2021Dto> organDoubleEleven2021Statis(String order,String sort,Integer organId);
 
     /**
     * @description: 双11活动统计

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupActivityServiceImpl.java

@@ -195,14 +195,14 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
     @Override
-    public List<DoubleEleven2021Dto> organDoubleEleven2021Statis(String order,String sort) {
+    public List<DoubleEleven2021Dto> organDoubleEleven2021Statis(String order,String sort,Integer organId) {
 		if(StringUtils.isEmpty(order)){
 			order = "DESC";
 		}
 		if(StringUtils.isEmpty(sort)){
 			sort = "totalBuyAmount";
 		}
-		List<DoubleEleven2021Dto> doubleEleven2021Dtos = vipGroupActivityDao.countOrganDoubleEleven2021Statis();
+		List<DoubleEleven2021Dto> doubleEleven2021Dtos = vipGroupActivityDao.countOrganDoubleEleven2021Statis(organId);
 		if(doubleEleven2021Dtos != null && doubleEleven2021Dtos.size() > 0){
 			List<Integer> organIdList = doubleEleven2021Dtos.stream().map(e -> e.getOrganId()).collect(Collectors.toList());
 			List<DoubleEleven2021ActivityDto> activityDtoList = vipGroupActivityDao.countOrganActivityStatis(organIdList);

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

@@ -388,6 +388,9 @@
 		FROM student_payment_order spo
 		LEFT JOIN organization o ON o.id_ = spo.organ_id_
 		WHERE spo.type_ = 'DOUBLE_ELEVEN2021' AND spo.status_ = 'SUCCESS'
+		<if test="organId != null">
+			AND spo.organ_id_ = #{organId}
+		</if>
 		AND spo.organ_id_ NOT IN (36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,2,27,22,24)
 		GROUP BY spo.organ_id_
 	</select>

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

@@ -147,8 +147,8 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "分部2021双11活动统计导出")
     @RequestMapping("/organDoubleEleven2021Statis")
     @PreAuthorize("@pcs.hasPermissions('export/organDoubleEleven2021Statis')")
-    public void organDoubleEleven2021Statis(String order, String sort,HttpServletResponse response) throws IOException {
-        List<DoubleEleven2021Dto> rows = vipGroupActivityService.organDoubleEleven2021Statis(order, sort);
+    public void organDoubleEleven2021Statis(Integer organId,String order, String sort,HttpServletResponse response) throws IOException {
+        List<DoubleEleven2021Dto> rows = vipGroupActivityService.organDoubleEleven2021Statis(order, sort,organId);
         if(rows.size() < 1){
             throw new BizException("没有可导出数据");
         }