陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

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

@@ -1,46 +0,0 @@
-package org.springblade.land.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class AcctExcel implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private Date arrivalTime;
-
-	@ExcelProperty("业务员")
-	private String salesmanName;
-
-	@ExcelProperty("货运地点")
-	private String addressDetail;
-
-	@ExcelProperty("票据号")
-	private String receiptNo;
-
-	@ExcelProperty("提单号")
-	private String billNo;
-
-	@ExcelProperty("场站")
-	private String station;
-
-	@ExcelProperty("尺寸箱型")
-	private String ctnDetail;
-
-	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车号")
-	private String plateNo;
-
-	@ExcelProperty("备注")
-	private String remarks;
-
-}

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

@@ -1,20 +1,54 @@
 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 lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-@EqualsAndHashCode(callSuper = true)
-public class CdAcctExcel extends AcctExcel {
+public class CdAcctExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("尺寸箱型")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
 
 	@ExcelProperty("运费")
 	private BigDecimal landAmountC;
@@ -22,4 +56,7 @@ public class CdAcctExcel extends AcctExcel {
 	@ExcelProperty("杂费")
 	private BigDecimal extraAmountC;
 
+	@ExcelProperty("备注")
+	private String remarks;
+
 }

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

@@ -1,20 +1,54 @@
 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 lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-@EqualsAndHashCode(callSuper = true)
-public class KhAcctExcel extends AcctExcel {
+public class KhAcctExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("尺寸箱型")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
 
 	@ExcelProperty("运费")
 	private BigDecimal landAmountD;
@@ -22,4 +56,7 @@ public class KhAcctExcel extends AcctExcel {
 	@ExcelProperty("杂费")
 	private BigDecimal extraAmountD;
 
+	@ExcelProperty("备注")
+	private String remarks;
+
 }

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

@@ -1,20 +1,54 @@
 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 lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-@EqualsAndHashCode(callSuper = true)
-public class PtAcctExcel extends AcctExcel {
+public class PtAcctExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("尺寸箱型")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
 
 	@ExcelProperty("应付运费")
 	private BigDecimal landAmountC;
@@ -31,4 +65,7 @@ public class PtAcctExcel extends AcctExcel {
 	@ExcelProperty("利润")
 	private BigDecimal profit;
 
+	@ExcelProperty("备注")
+	private String remarks;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -1,6 +1,5 @@
 package org.springblade.client.corps.controller;
 
-import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -103,6 +102,18 @@ public class CorpsDescController extends BladeController {
 					CorpsDesc desc = corpsDescService.getById(item.getBelongtocompany());
 					item.setBelongCompany(desc.getCname());
 				}
+
+				List<Long> typeIdList = corpsTypeDescService.list(new LambdaQueryWrapper<CorpsTypeDesc>().eq(CorpsTypeDesc::getCorpId, item.getId()))
+					.stream().map(CorpsTypeDesc::getCorpTypeId).collect(Collectors.toList());
+
+				if (CollectionUtil.isNotEmpty(typeIdList)) {
+					String typeName = corpsTypeService.list(new LambdaQueryWrapper<CorpsType>()
+						.in(CorpsType::getId, typeIdList)
+						.eq(CorpsType::getCorpType, item.getCorpType())
+						.eq(CorpsType::getIsDeleted, 0)
+					).stream().map(CorpsType::getCname).collect(Collectors.joining(","));
+					item.setCorpsTypeName(typeName);
+				}
 			});
 		}
 		return R.data(pages);

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

@@ -34,7 +34,7 @@
                t1.receipt_no as receiptNo,
                t1.bill_no as billNo,
                t1.station,
-               t2.ctn_type as ctnDetail,
+               concat(t2.ctn_type, '×', sum(t2.ctn_quantity)) as ctnDetail,
                t4.cname as fleetName,
                t4.short_name as fleetShortName,
                t2.plate_no,