增加订单汇总报表

blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportsServiceImpl.java

@@ -28,6 +28,7 @@ import org.springblade.factory.entity.TireSalesPolicy;
 import org.springblade.factory.entity.TireSalesPolicyItem;
 import org.springblade.factory.entity.ViewCustomerSel;
 import org.springblade.factory.fegin.ITireSalesOrderClient;
+import org.springblade.factory.vo.TireFactoryDealerOrderVo;
 import org.springblade.report.entity.Reports;
 import org.springblade.report.mapper.ReportsMapper;
 import org.springblade.report.service.IReportsService;
@@ -120,6 +121,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				throw new RuntimeException("获取数据失败，请联系管理员");
 			}
 			map.put("data", dealerOrderDto);
+		} else if ("订单汇总".equals(reportCode) && "导出明细".equals(groupCode) && "工厂".equals(type)) {
+			TireFactoryDealerOrderVo factoryDealerOrderVo = tireSalesOrderClient.getTireFactoryDealerOrderDetail(id);
+			if (factoryDealerOrderVo == null) {
+				throw new RuntimeException("获取数据失败，请联系管理员");
+			}
+			map.put("data", factoryDealerOrderVo);
 		}
 		return R.data(map);
 	}

blade-service-api/blade-factory-api/src/main/java/org/springblade/factory/fegin/ITireSalesOrderClient.java

@@ -3,9 +3,11 @@ package org.springblade.factory.fegin;
 import org.springblade.factory.dto.TireDealerOrderDto;
 import org.springblade.factory.dto.TireSalesForecastMainDto;
 import org.springblade.factory.dto.TireSalesPolicyDto;
+import org.springblade.factory.entity.TireFactoryDealerOrder;
 import org.springblade.factory.entity.TireSalesPolicy;
 import org.springblade.factory.entity.TireSalesPolicyItem;
 import org.springblade.factory.entity.ViewCustomerSel;
+import org.springblade.factory.vo.TireFactoryDealerOrderVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -33,6 +35,9 @@ public interface ITireSalesOrderClient {
 	String GET_TIRE_DEALER_ORDER_DETAIL = API_PREFIX + "/getTireDealerOrderDetail";
 
 
+	String GET_TIRE_FACTORY_DEALER_ORDER_DETAIL = API_PREFIX + "/getTireFactoryDealerOrderDetail";
+
+
 	/**
 	 * 获取订单模板
 	 *
@@ -81,4 +86,14 @@ public interface ITireSalesOrderClient {
 	@GetMapping(GET_TIRE_DEALER_ORDER_DETAIL)
 	TireDealerOrderDto getTireDealerOrderDetail(@RequestParam("id") Long id);
 
+
+	/**
+	 * 获取工厂订单提报
+	 *
+	 * @param id 订单id
+	 * @return 结果
+	 */
+	@GetMapping(GET_TIRE_FACTORY_DEALER_ORDER_DETAIL)
+	TireFactoryDealerOrderVo getTireFactoryDealerOrderDetail(@RequestParam("id") Long id);
+
 }

blade-service/blade-factory/src/main/java/org/springblade/factory/fegin/TireSalesOrderClient.java

@@ -13,6 +13,7 @@ import org.springblade.factory.entity.*;
 import org.springblade.factory.mapper.*;
 import org.springblade.factory.service.ITireSalesPolicyService;
 import org.springblade.factory.util.DealerUtil;
+import org.springblade.factory.vo.TireFactoryDealerOrderVo;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -41,6 +42,10 @@ public class TireSalesOrderClient implements ITireSalesOrderClient {
 
 	private final TireDealerOrderMapper tireDealerOrderMapper;
 
+	private final TireFactoryDealerOrderMapper tireFactoryDealerOrderMapper;
+
+	private final TireFactoryDealerOrderItemMapper tireFactoryDealerOrderItemMapper;
+
 	@Override
 	public TireSalesPolicyDto getTireSalesPolicyDetail(Long id) {
 		TireSalesPolicy tireSalesPolicy = salesPolicyService.getById(id);
@@ -104,4 +109,21 @@ public class TireSalesOrderClient implements ITireSalesOrderClient {
 		dealerOrderDto.setTireDealerOrderItemList(tireDealerOrderItemList);
 		return dealerOrderDto;
 	}
+
+	@Override
+	public TireFactoryDealerOrderVo getTireFactoryDealerOrderDetail(Long id) {
+		TireFactoryDealerOrder factoryDealerOrder = tireFactoryDealerOrderMapper.selectOne(new LambdaQueryWrapper<TireFactoryDealerOrder>()
+			.eq(TireFactoryDealerOrder::getId, id).eq(TireFactoryDealerOrder::getIsDeleted, 0));
+		if (Objects.isNull(factoryDealerOrder)) {
+			return null;
+		}
+		TireFactoryDealerOrderVo factoryDealerOrderVo = BeanUtil.copyProperties(factoryDealerOrder, TireFactoryDealerOrderVo.class);
+		if (Objects.isNull(factoryDealerOrderVo)) {
+			return null;
+		}
+		List<TireFactoryDealerOrderItem> tireDealerOrderItemList = tireFactoryDealerOrderItemMapper.selectList(new LambdaQueryWrapper<TireFactoryDealerOrderItem>()
+			.eq(TireFactoryDealerOrderItem::getMainId, factoryDealerOrder.getId()).eq(TireFactoryDealerOrderItem::getIsDeleted, 0));
+		factoryDealerOrderVo.setTireDealerOrderItemList(tireDealerOrderItemList);
+		return factoryDealerOrderVo;
+	}
 }

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/TireFactoryDealerOrderServiceImpl.java

@@ -1,6 +1,5 @@
 package org.springblade.factory.service.impl;
 
-import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -14,30 +13,27 @@ import org.springblade.core.secure.BladeUser;
 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.StringUtil;
-import org.springblade.factory.dto.TireDealerOrderDto;
-import org.springblade.factory.entity.*;
+import org.springblade.factory.entity.TireDealerOrder;
+import org.springblade.factory.entity.TireDealerOrderItem;
+import org.springblade.factory.entity.TireFactoryDealerOrder;
+import org.springblade.factory.entity.TireFactoryDealerOrderItem;
 import org.springblade.factory.mapper.TireDealerOrderItemMapper;
 import org.springblade.factory.mapper.TireDealerOrderMapper;
 import org.springblade.factory.mapper.TireFactoryDealerOrderItemMapper;
 import org.springblade.factory.mapper.TireFactoryDealerOrderMapper;
 import org.springblade.factory.service.ITireFactoryDealerOrderService;
-import org.springblade.factory.util.BillCodeUtil;
 import org.springblade.factory.util.DealerUtil;
 import org.springblade.factory.vo.TireDealerOrderVo;
 import org.springblade.factory.vo.TireFactoryDealerOrderVo;
 import org.springblade.factory.vo.TireOrderItemCalculateVo;
-import org.springblade.system.entity.Region;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 
 /**