贸易代理 2024年8月15日17:25:47

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/entity/AgentView.java

@@ -436,6 +436,16 @@ public class AgentView implements Serializable {
 	 */
 	@ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+	/**
+	 * 业务员id
+	 */
+	@ApiModelProperty(value = "业务员id")
+	private Long salesmanId;
+	/**
+	 * 业务员
+	 */
+	@ApiModelProperty(value = "业务员")
+	private String salesmanName;
 
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/TradeBillsController.java

@@ -122,6 +122,16 @@ public class TradeBillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEtd, bills.getEtdList().get(0));
 			lambdaQueryWrapper.le(Bills::getEtd, bills.getEtdList().get(1));
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
+					.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
+						.like(Bills::getSrcEnName, bills.getSrcCnName()));
+				lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
+			}
+		}
 		lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBillType()), Bills::getBillType, bills.getBillType())
 			.eq(Bills::getBusinessType, "SI")

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -28,6 +28,8 @@ import org.springblade.los.finance.stl.entity.FinStlBills;
 import org.springblade.los.finance.stl.mapper.FinStlBillsMapper;
 import org.springblade.los.statisticAnalysis.*;
 import org.springblade.los.statisticAnalysis.service.IStatisticAnalysisService;
+import org.springblade.los.trade.entity.Agent;
+import org.springblade.los.trade.service.IAgentService;
 import org.springblade.los.view.entity.BoxNumberProfit;
 import org.springblade.los.view.mapper.BoxNumberProfitMapper;
 import org.springblade.los.view.mapper.FinanceProfitMapper;
@@ -65,6 +67,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 
 	private final BoxNumberProfitMapper boxNumberProfitMapper;
 
+	private final IAgentService agentService;
+
 	@Override
 	public R<IPage<DecisionAnalysis>> decisionAnalysis(DecisionAnalysis decisionAnalysis, IPage<DecisionAnalysis> page) {
 		return R.data(page.setRecords(billsMapper.decisionAnalysis(decisionAnalysis, page)));
@@ -277,6 +281,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		long HYCK;
 		long KYJK;
 		long KYCK;
+		long MYDL;
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
@@ -330,11 +335,18 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getBusinessType, "AI");
 		KYJK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapperAI);
+		LambdaQueryWrapper<Agent> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper1.eq(Agent::getTenantId, AuthUtil.getTenantId())
+			.eq(Agent::getIsDeleted, 0)
+			.le(Agent::getBusinessDate, dateEnd)
+			.ge(Agent::getBusinessDate, dateStart);
+		MYDL = agentService.count(lambdaQueryWrapper1);
 		Map<String, Object> map = new HashMap<>();
 		map.put("HYJK", HYJK);
 		map.put("HYCK", HYCK);
 		map.put("KYJK", KYJK);
 		map.put("KYCK", KYCK);
+		map.put("MYDL", MYDL);
 		return R.data(map);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/trade/controller/AgentViewController.java

@@ -32,6 +32,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.trade.dto.AgentViewExport;
 import org.springblade.los.trade.entity.AgentView;
 import org.springblade.los.trade.service.IAgentViewService;
@@ -110,6 +111,13 @@ public class AgentViewController extends BladeController {
 			lambdaQueryWrapper.gt(AgentView::getActualReachHarbor, agentView.getActualReachHarborList().get(0));
 			lambdaQueryWrapper.lt(AgentView::getActualReachHarbor, agentView.getActualReachHarborList().get(1));
 		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(AgentView::getSalesmanId, AuthUtil.getUserId());
+			} else {
+				lambdaQueryWrapper.eq(AgentView::getCreateUserName, AuthUtil.getUserName());
+			}
+		}
 		lambdaQueryWrapper.orderByDesc(AgentView::getItemId);
 		lambdaQueryWrapper.orderByDesc(AgentView::getBusinessDate);
 		IPage<AgentView> pages = agentViewService.page(Condition.getPage(query), lambdaQueryWrapper);