轮胎app营业统计接口修改，中电根据部门id查找运输调度接口修改

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -22,15 +22,12 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.corps.service.ICorpsAttnService;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.entity.*;
 import org.springblade.salesPart.enums.OrderTypeEnum;
 import org.springblade.salesPart.excel.*;
 import org.springblade.salesPart.goods.service.IGoodsDescService;
-import org.springblade.salesPart.goods.service.IGoodsFilesService;
-import org.springblade.salesPart.goods.service.impl.GoodsDescServiceImpl;
 import org.springblade.salesPart.order.service.IOrderItemsService;
 import org.springblade.salesPart.order.service.IOrderService;
 import org.springblade.salesPart.ship.service.IShipService;
@@ -78,7 +75,6 @@ public class OrderController extends BladeController {
 	private final IGoodsDescService goodsDescService;
 
 
-
 	/**
 	 * 销售详情
 	 */
@@ -110,7 +106,7 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipAmount, PjOrder::getOutGoodsTotalShipNum, PjOrder::getOutGoodsTotalShipAmount,
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
-				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId, PjOrder::getBillType,PjOrder::getRemarks,PjOrder::getPaymentRecoveredBalance)
+				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId, PjOrder::getBillType, PjOrder::getRemarks, PjOrder::getPaymentRecoveredBalance)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())
@@ -131,7 +127,7 @@ public class OrderController extends BladeController {
 			.like(ObjectUtils.isNotEmpty(order.getBusinessSource()), PjOrder::getBusinessSource, order.getBusinessSource())//来源
 			// 资金方
 			.like(StringUtil.isNotBlank(order.getFundingPartyName()), PjOrder::getFundingPartyName, order.getFundingPartyName())
-		// zh状态
+			// zh状态
 			.eq(StringUtil.isNotBlank(order.getWhetherRedeem()), PjOrder::getWhetherRedeem, order.getWhetherRedeem());
 		if (order.getDueDateList() != null && order.getDueDateList().size() > 1) {//应结日期
 			lambdaQueryWrapper.ge(PjOrder::getDueDate, order.getDueDateList().get(0));
@@ -769,7 +765,7 @@ public class OrderController extends BladeController {
 			.eq(PjOrder::getSalesCompanyId, user.getDeptId())
 			.eq(PjOrder::getActualPaymentStatus, 1)
 			.eq(PjOrder::getCustomerId, pjCorpsAttn.getPid())
-			.in(PjOrder::getBsType, "XS","GX")
+			.in(PjOrder::getBsType, "XS", "GX")
 			.orderByDesc(PjOrder::getCreateTime);
 		List<PjOrder> list = orderService.list(lambdaQueryWrapper);
 		if (list.isEmpty()) {
@@ -788,7 +784,7 @@ public class OrderController extends BladeController {
 			if (orderMap.getValue().isEmpty()) {
 				continue;
 			}
-			PjOrder nowOrder  = orderMap.getValue().stream().max(Comparator.comparing(PjOrder::getCreateTime)).orElse(null);
+			PjOrder nowOrder = orderMap.getValue().stream().max(Comparator.comparing(PjOrder::getCreateTime)).orElse(null);
 			Map<String, Object> objectMap = new HashMap<>(3);
 			mapList.add(objectMap);
 			objectMap.put("name", orderMap.getKey());
@@ -822,7 +818,7 @@ public class OrderController extends BladeController {
 			.eq(PjOrder::getSalesCompanyId, user.getDeptId())
 			.eq(PjOrder::getActualPaymentStatus, 1)
 			.eq(PjOrder::getCustomerId, pjCorpsAttn.getPid())
-			.in(PjOrder::getBsType, "XS","GX")
+			.in(PjOrder::getBsType, "XS", "GX")
 			.orderByDesc(PjOrder::getCreateTime);
 		List<PjOrder> list = orderService.list(lambdaQueryWrapper);
 		if (list.isEmpty()) {
@@ -845,7 +841,7 @@ public class OrderController extends BladeController {
 				objectMap.put("list", Collections.EMPTY_LIST);
 				continue;
 			}
-			List<PjOrder> nowOrderList  = orderMap.getValue().stream().sorted(Comparator.comparing(PjOrder::getCreateTime).reversed()).collect(Collectors.toList());
+			List<PjOrder> nowOrderList = orderMap.getValue().stream().sorted(Comparator.comparing(PjOrder::getCreateTime).reversed()).collect(Collectors.toList());
 			objectMap.put("list", nowOrderList);
 			for (PjOrder order : nowOrderList) {
 				List<PjOrderItems> nowOrderItemList = pjOrderItemsList.stream().filter(item -> order.getId().equals(item.getPid())).collect(Collectors.toList());
@@ -1016,13 +1012,14 @@ public class OrderController extends BladeController {
 
 		if (!pjOrderListXS.isEmpty()) {
 			List<Long> orderIdsD = pjOrderListXS.stream().map(PjOrder::getId).collect(Collectors.toList());
+			income = pjOrderListXS.stream().map(PjOrder::getSalesAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			if (!orderIdsD.isEmpty()) {
 				List<PjOrderItems> pjOrderItemsListD = orderItemsService.list(new LambdaQueryWrapper<PjOrderItems>()
 					.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 					.eq(PjOrderItems::getIsDeleted, 0)
 					.in(PjOrderItems::getPid, orderIdsD));
 				if (!pjOrderItemsListD.isEmpty()) {
-					income = pjOrderItemsListD.stream().map(PjOrderItems::getSubTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+//					income = pjOrderItemsListD.stream().map(PjOrderItems::getSubTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 					returnsAmount = pjOrderItemsListD.stream().map(PjOrderItems::getReturnsAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 					cost = pjOrderItemsListD.stream().map(PjOrderItems::getCostprie).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 					returnsCost = pjOrderItemsListD.stream().filter(e -> ObjectUtils.isNotNull(e.getReturnsNumber())

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -183,13 +183,19 @@ public class UserController {
 			.eq(User::getIsDeleted, 0);
 
 		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())
+			String ids = sysClient.getParamService("transportation.scheduling.id");
+			if (ids.contains(userVO.getDeptPid())){
+				userVO.setRoleAlias("分管调度");
+			}else{
+				userVO.setRoleAlias("大件调度");
+			}
+			/*if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())
 				|| "1862313560907030530".equals(userVO.getDeptPid())|| "1863853735860514817".equals(userVO.getDeptPid())
 			|| "1905144938132189185".equals(userVO.getDeptPid())|| "1909147036956012546".equals(userVO.getDeptPid())) {
 				userVO.setRoleAlias("分管调度");
 			} else {
 				userVO.setRoleAlias("大件调度");
-			}
+			}*/
 		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());