2022年10月21 19:16

blade-service-api/blade-land-api/src/main/java/org/springblade/land/constant/LandConst.java

@@ -47,8 +47,14 @@ public interface LandConst {
 
 	String MOLD_MANAGER = "散货经理";
 
+	String ROLE_DUZX = "调度中心";
+
 	String DDZX_MANAGER = "调度中心经理";
 
+	String ROLE_FGDD = "分管调度";
+
+	String ROLE_ZDD = "总调度";
+
 	/**
 	 * 权限标识
 	 */

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

@@ -0,0 +1,67 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DdzxAcctExcel {
+
+	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 String remarks;
+
+	@ExcelProperty("应付运费")
+	private BigDecimal landAmountC;
+
+	@ExcelProperty("应付杂费")
+	private BigDecimal extraAmountC;
+
+	@ExcelProperty("应付杂费明细")
+	private String extraAmountItemC;
+
+}

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

@@ -247,13 +247,14 @@ public class OrderController extends BladeController {
 		List<OrderAcctVO> acct = orderService.getAcctNoPage(acctVO);
 
 		String role = AuthUtil.getUserRole();
+		System.out.println("role==="+role);
 		if (role.contains(LandConst.ROLE_KH)) {
 			List<KhAcctExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, KhAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, KhAcctExcel.class);
-		} else if (role.equals("平台,分管调度")) {
+		} else if (role.contains(LandConst.ROLE_PT) && role.contains(LandConst.ROLE_FGDD)) {
 			List<PtAcctExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, PtAcctExcel.class);
@@ -271,12 +272,18 @@ public class OrderController extends BladeController {
 				list = BeanUtil.copy(acct, AllAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, AllAcctExcel.class);
-		}else if (role.equals("平台,总调度")){
+		}else if (role.contains(LandConst.ROLE_PT) && role.contains(LandConst.ROLE_ZDD)){
 			List<PtZddAcctExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, PtZddAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, PtZddAcctExcel.class);
+		}else if (role.contains(LandConst.ROLE_DUZX) || role.contains(LandConst.DDZX_MANAGER)) {
+			List<DdzxAcctExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, DdzxAcctExcel.class);
+			}
+			ExcelUtil.export(response, "陆运台账", "陆运台账", list, DdzxAcctExcel.class);
 		}else {
 			throw new RuntimeException("用户无导出权限");
 		}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -579,6 +579,9 @@ ORDER BY
             <if test="detailsVo.corpId != null and detailsVo.corpId != ''">
                 AND BO.corp_id like concat('%', #{detailsVo.corpId}, '%')
             </if>
+            <if test="detailsVo.brand != null and detailsVo.brand != ''">
+                AND BGD.Brand like concat('%', #{detailsVo.brand}, '%')
+            </if>
             <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
                 AND BO.charge_member like concat('%', #{detailsVo.salesName}, '%')
             </if>
@@ -630,6 +633,9 @@ ORDER BY
             <if test="detailsVo.corpId != null and detailsVo.corpId != ''">
                 AND BO.corp_id like concat('%', #{detailsVo.corpId}, '%')
             </if>
+            <if test="detailsVo.brand != null and detailsVo.brand != ''">
+                AND BGD.Brand like concat('%', #{detailsVo.brand}, '%')
+            </if>
             <if test="detailsVo.salesName != null and detailsVo.salesName != ''">
                 AND BO.charge_member like concat('%', #{detailsVo.salesName}, '%')
             </if>