zoujiajian 3 rokov pred
rodič
commit
af5b59280a

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/DistributeBusinessView.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select distinct business_id from user_distribute_business_rate) ur left join user_distribute_business_order_don_record ubr on ubr.business_id = ur.business_id" +
+@SearchBean(tables = "(select distinct business_id from user_distribute_business_rate) ur left join user_distribute_business_order_don_record ubr on ubr.business_id = ur.business_id and :time:" +
 		" left join cms_user cu on cu.id = ur.business_id",
 		groupBy = "ur.business_id,cu.nickname,date_format(ubr.order_created_time,'%Y-%m')")
 public class DistributeBusinessView {

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -370,7 +370,7 @@ public class DistributeController {
 		if (userBusinessRateService.isBusiness(adminId)) {
 			builder.field(DistributeBusinessView::getBusinessId, adminId);
 		}
-		builder.field(DistributeBusinessView::getMonthDate, thisMonth);
+		builder.put("time", String.format("date_format(ubr.order_created_time,'%%Y-%%m') = '%s'", thisMonth));
 		SearchResult<DistributeBusinessView> search = beanSearcher.search(DistributeBusinessView.class, builder.build());
 		search.getDataList().forEach(data->{
 			Number numOfRelation = beanSearcher.searchCount(UserDistribute.class, MapUtils.builder().field(UserDistribute::getBusinessId, data.getBusinessId()).field(UserDistribute::getDeleted, true).build());