散货台账导出

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/Order.java

@@ -288,7 +288,7 @@ public class Order implements Serializable {
 	 * 计价单位
 	 */
 	@ApiModelProperty(value = "计价单位")
-	private Long pricingUnit;
+	private String pricingUnit;
 	/**
 	 * 装卸货
 	 */

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/AllAcctExcel.java

@@ -0,0 +1,82 @@
+package org.springblade.land.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AllAcctExcel implements Serializable {
+
+	private static final Long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("箱型箱量")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
+
+	@ExcelProperty("应收运费")
+	private BigDecimal landAmountD;
+
+	@ExcelProperty("应收杂费")
+	private BigDecimal extraAmountD;
+
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ExcelProperty("应付运费")
+	private BigDecimal landAmountC;
+
+	@ExcelProperty("应付杂费")
+	private BigDecimal extraAmountC;
+
+	@ExcelProperty("利润")
+	private BigDecimal profit;
+
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
+
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
+}

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/CdAcctExcel.java

@@ -56,10 +56,9 @@ public class CdAcctExcel implements Serializable {
 	@ExcelProperty("应付杂费")
 	private BigDecimal extraAmountC;
 
-	@ExcelProperty("应付杂费明细")
-	private String extraAmountItemC;
-
 	@ExcelProperty("备注")
 	private String remarks;
 
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/KhAcctExcel.java

@@ -59,10 +59,9 @@ public class KhAcctExcel implements Serializable {
 	@ExcelProperty("应收杂费")
 	private BigDecimal extraAmountD;
 
-	@ExcelProperty("应收杂费明细")
-	private String extraAmountItemD;
-
 	@ExcelProperty("备注")
 	private String remarks;
 
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/PtAcctExcel.java

@@ -32,9 +32,6 @@ public class PtAcctExcel implements Serializable {
 	@ExcelProperty("运输调度")
 	private String dispatcherName;
 
-	@ExcelProperty("物流运输")
-	private String dispatchDeptName;
-
 	@ExcelProperty("货运地点")
 	private String addressDetail;
 
@@ -62,8 +59,8 @@ public class PtAcctExcel implements Serializable {
 	@ExcelProperty("应收杂费")
 	private BigDecimal extraAmountD;
 
-	@ExcelProperty("应收杂费明细")
-	private String extraAmountItemD;
+	@ExcelProperty("备注")
+	private String remarks;
 
 	@ExcelProperty("应付运费")
 	private BigDecimal landAmountC;
@@ -71,13 +68,10 @@ public class PtAcctExcel implements Serializable {
 	@ExcelProperty("应付杂费")
 	private BigDecimal extraAmountC;
 
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
+
 	@ExcelProperty("应付杂费明细")
 	private String extraAmountItemC;
 
-	@ExcelProperty("利润")
-	private BigDecimal profit;
-
-	@ExcelProperty("备注")
-	private String remarks;
-
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/bulkCargoAllExcel.java

@@ -0,0 +1,87 @@
+package org.springblade.land.excel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 散货导出 admin显示全部
+ */
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class bulkCargoAllExcel implements Serializable {
+
+	private static final Long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("派车单号")
+	private String dispatchNumber;
+
+	@ExcelProperty("合同号")
+	private String contractNo;
+
+	@ExcelProperty("装货地点")
+	private String addressDetail;
+
+	@ExcelProperty("卸货地点")
+	private String unloadingPlace;
+
+	@ExcelProperty("车型")
+	private String fleetVolum;
+
+	@ExcelProperty("车队")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
+
+	@ExcelProperty("应收运费")
+	private BigDecimal landAmountD;
+
+	@ExcelProperty("应收杂费")
+	private BigDecimal extraAmountD;
+
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ExcelProperty("应付运费")
+	private BigDecimal landAmountC;
+
+	@ExcelProperty("应付杂费")
+	private BigDecimal extraAmountC;
+
+	@ExcelProperty("利润")
+	private BigDecimal profit;
+
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
+
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
+}

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/bulkCargoCdExcel.java

@@ -0,0 +1,68 @@
+package org.springblade.land.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 散货导出 车队显示
+ */
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class bulkCargoCdExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
+	private Date arrivalTime;
+
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("派车单号")
+	private String dispatchNumber;
+
+	@ExcelProperty("合同号")
+	private String contractNo;
+
+	@ExcelProperty("装货地点")
+	private String addressDetail;
+
+	@ExcelProperty("卸货地点")
+	private String unloadingPlace;
+
+	@ExcelProperty("车型")
+	private String fleetVolum;
+
+	@ExcelProperty("车队")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
+
+	@ExcelProperty("应付运费")
+	private BigDecimal landAmountC;
+
+	@ExcelProperty("应付杂费")
+	private BigDecimal extraAmountC;
+
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
+}

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/bulkCargoKhExcel.java

@@ -0,0 +1,75 @@
+package org.springblade.land.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 散货导出 客户显示
+ */
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class bulkCargoKhExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("派车单号")
+	private String dispatchNumber;
+
+	@ExcelProperty("合同号")
+	private String contractNo;
+
+	@ExcelProperty("装货地点")
+	private String addressDetail;
+
+	@ExcelProperty("卸货地点")
+	private String unloadingPlace;
+
+	@ExcelProperty("车型")
+	private String fleetVolum;
+
+	@ExcelProperty("车队")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
+
+	@ExcelProperty("应收运费")
+	private BigDecimal landAmountD;
+
+	@ExcelProperty("应收杂费")
+	private BigDecimal extraAmountD;
+
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
+
+}

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/bulkCargoPtExcel.java

@@ -0,0 +1,81 @@
+package org.springblade.land.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 散货导出 平台显示
+ */
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class bulkCargoPtExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("派车单号")
+	private String dispatchNumber;
+
+	@ExcelProperty("合同号")
+	private String contractNo;
+
+	@ExcelProperty("装货地点")
+	private String addressDetail;
+
+	@ExcelProperty("卸货地点")
+	private String unloadingPlace;
+
+	@ExcelProperty("车型")
+	private String fleetVolum;
+
+	@ExcelProperty("车队")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
+
+	@ExcelProperty("应收运费")
+	private BigDecimal landAmountD;
+
+	@ExcelProperty("应收杂费")
+	private BigDecimal extraAmountD;
+
+	@ExcelProperty("备注")
+	private String remarks;
+
+	@ExcelProperty("应付运费")
+	private BigDecimal landAmountC;
+
+	@ExcelProperty("应付杂费")
+	private BigDecimal extraAmountC;
+
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
+
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
+
+}

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderController.java

@@ -33,9 +33,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.land.constant.LandConst;
 import org.springblade.land.entity.Order;
-import org.springblade.land.excel.CdAcctExcel;
-import org.springblade.land.excel.KhAcctExcel;
-import org.springblade.land.excel.PtAcctExcel;
+import org.springblade.land.excel.*;
 import org.springblade.land.service.IOrderService;
 import org.springblade.land.vo.OrderAcctVO;
 import org.springblade.land.vo.OrderVO;
@@ -266,7 +264,51 @@ public class OrderController extends BladeController {
 				list = BeanUtil.copy(acct, CdAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, CdAcctExcel.class);
-		} else {
+		} else if (role.contains(LandConst.ROLE_ADMIN)){
+			List<AllAcctExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, AllAcctExcel.class);
+			}
+			ExcelUtil.export(response, "陆运台账", "陆运台账", list, AllAcctExcel.class);
+		}else {
+			throw new RuntimeException("用户无导出权限");
+		}
+	}
+
+	/**
+	 * 散货台账导出
+	 */
+	@GetMapping("/bulkCargo-export")
+	public void bulkCargoAcctExport(OrderAcctVO acctVO, HttpServletResponse response) {
+		acctVO.setShippingMode("散货");
+		List<OrderAcctVO> acct = orderService.getAcctNoPage(acctVO);
+
+		String role = AuthUtil.getUserRole();
+		if (role.contains(LandConst.ROLE_KH)) {
+			List<bulkCargoKhExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, bulkCargoKhExcel.class);
+			}
+			ExcelUtil.export(response, "散货台账", "散货台账", list, bulkCargoKhExcel.class);
+		} else if (role.contains(LandConst.ROLE_PT)) {
+			List<bulkCargoPtExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, bulkCargoPtExcel.class);
+			}
+			ExcelUtil.export(response, "散货台账", "散货台账", list, bulkCargoPtExcel.class);
+		} else if (role.contains(LandConst.ROLE_CD)) {
+			List<bulkCargoCdExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, bulkCargoCdExcel.class);
+			}
+			ExcelUtil.export(response, "散货台账", "散货台账", list, bulkCargoCdExcel.class);
+		} else if (role.contains(LandConst.ROLE_ADMIN)){
+			List<bulkCargoAllExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, bulkCargoAllExcel.class);
+			}
+			ExcelUtil.export(response, "散货台账", "散货台账", list, bulkCargoAllExcel.class);
+		}else {
 			throw new RuntimeException("用户无导出权限");
 		}
 	}

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderFeeController.java

@@ -25,6 +25,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.land.entity.OrderFee;
@@ -78,6 +79,8 @@ public class OrderFeeController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderFee")
 	public R<List<OrderFee>> list(OrderFee orderFee) {
+		orderFee.setIsDeleted(0);
+		orderFee.setTenantId(AuthUtil.getTenantId());
 		return R.data(orderFeeService.getListNoPage(orderFee));
 	}
 

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -1213,8 +1213,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			LambdaQueryWrapper<OrderFee> orderFeeLambda = new LambdaQueryWrapper<>();
 			orderFeeLambda.eq(OrderFee::getIsDeleted, 0);
 
-			System.out.println("是散货======="+acct.getShippingMode());
-
 			if (!ObjectUtil.isEmpty(acct.getShippingMode()) && acct.getShippingMode().equals("散货")){
 				orderFeeLambda.eq(OrderFee::getOrderId, acct.getOrderId());
 			}else {