Переглянути джерело

fix 商务返回本月数据

zoujiajian 3 роки тому
батько
коміт
a06ba38431

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

@@ -3,6 +3,7 @@ package com.cyksj.web.controller.manage.distribute;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -363,10 +364,13 @@ public class DistributeController {
 	public Result<SearchResult<DistributeBusinessView>> getDistributeBusinessView() {
 		long adminId = StpUtil.getLoginIdAsLong();
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+		DateTime beginOfMonth = DateUtil.beginOfMonth(DateTime.now());
+		String thisMonth = beginOfMonth.toString("yyyy-MM");
 		//是否是商务人员
 		if (userBusinessRateService.isBusiness(adminId)) {
 			builder.field(DistributeBusinessView::getBusinessId, adminId);
 		}
+		builder.field(DistributeBusinessView::getMonthDate, 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());