散货修改

blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditPaths.java

@@ -83,6 +83,12 @@ public class AuditPaths implements Serializable {
 		@ApiModelProperty(value = "备注")
 		private String remarks;
 
+	/**
+	 * 业务类型
+	 */
+	 @ApiModelProperty(value = "业务类型")
+	 private String businessType;
+
 		@ApiModelProperty(value = "审批流配置明细级别表")
 		@TableField(exist = false)
 		private List<AuditPathsLevels> auditPathsLevels;

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

@@ -0,0 +1,80 @@
+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 PtZddAcctExcel 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 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/bulkCargoPtZddExcel.java

@@ -0,0 +1,84 @@
+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 bulkCargoPtZddExcel 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 BigDecimal profit;
+
+	@ExcelProperty("应收杂费明细")
+	private String extraAmountItemD;
+
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
+
+}

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

@@ -243,6 +243,7 @@ public class OrderController extends BladeController {
 
 	@GetMapping("/acct-export")
 	public void acctExport(OrderAcctVO acctVO, HttpServletResponse response) {
+		acctVO.setShippingMode("集装箱");
 		List<OrderAcctVO> acct = orderService.getAcctNoPage(acctVO);
 
 		String role = AuthUtil.getUserRole();
@@ -252,7 +253,7 @@ public class OrderController extends BladeController {
 				list = BeanUtil.copy(acct, KhAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, KhAcctExcel.class);
-		} else if (role.contains(LandConst.ROLE_PT)) {
+		} else if (role.equals("平台,分管调度")) {
 			List<PtAcctExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, PtAcctExcel.class);
@@ -270,6 +271,12 @@ public class OrderController extends BladeController {
 				list = BeanUtil.copy(acct, AllAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, AllAcctExcel.class);
+		}else if (role.equals("平台,总调度")){
+			List<PtZddAcctExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, PtZddAcctExcel.class);
+			}
+			ExcelUtil.export(response, "陆运台账", "陆运台账", list, PtZddAcctExcel.class);
 		}else {
 			throw new RuntimeException("用户无导出权限");
 		}
@@ -277,6 +284,7 @@ public class OrderController extends BladeController {
 
 	/**
 	 * 散货台账导出
+	 * @param acctVO
 	 */
 	@GetMapping("/bulkCargo-export")
 	public void bulkCargoAcctExport(OrderAcctVO acctVO, HttpServletResponse response) {
@@ -284,30 +292,36 @@ public class OrderController extends BladeController {
 		List<OrderAcctVO> acct = orderService.getAcctNoPage(acctVO);
 
 		String role = AuthUtil.getUserRole();
-		if (role.contains(LandConst.ROLE_KH)) {
+		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)) {
+		} else if (role.equals("平台,分管调度")) {//平台（分管调度）
 			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)) {
+		} 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)){
+		} else if (role.contains(LandConst.ROLE_ADMIN)){//admin看所有
 			List<bulkCargoAllExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, bulkCargoAllExcel.class);
 			}
 			ExcelUtil.export(response, "散货台账", "散货台账", list, bulkCargoAllExcel.class);
+		}else if (role.equals("平台,总调度")){//平台总调度增加利润
+			List<bulkCargoPtZddExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, bulkCargoPtZddExcel.class);
+			}
+			ExcelUtil.export(response, "散货台账", "散货台账", list, bulkCargoPtZddExcel.class);
 		}else {
 			throw new RuntimeException("用户无导出权限");
 		}