导出实物excel格式修改

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelRealGoodsOrderData.java

@@ -4,11 +4,11 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.cyksj.model.entity.OrderDon;
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /*
@@ -99,57 +99,32 @@ public class ExcelRealGoodsOrderData {
 	/**
 	 * 收货人
 	 */
-	@ExcelProperty("序号")
-	@DbIgnore
-	private Integer index;
-
-	/**
-	 * 收货人
-	 */
-	@ExcelProperty("姓名")
+	@ExcelProperty("*收件人姓名")
 	@DbField("odt.receiver")
 	private String receiver;
 
 	/**
 	 * 手机号
 	 */
-	@ExcelProperty("手机号码")
+	@ExcelProperty("*收件人电话")
 	@DbField("odt.phone")
 	private String phone;
 
-	@ExcelProperty("座机号")
-	private String landLine;
-
-	@ExcelProperty("公司名称")
-	private String company;
-
 	/**
 	 * 省份
 	 */
-	@ExcelProperty("省")
-	@DbField("odt.province")
-	private String province;
+	@ExcelProperty("*收件人地址")
+	@DbField("concat(odt.province,odt.city,odt.district,odt.address)")
+	private String address;
 
-	/**
-	 * 城市
-	 */
-	@ExcelProperty("市")
-	@DbField("odt.city")
-	private String city;
+	@ExcelProperty("公司名称")
+	private String company;
 
-	/**
-	 * 区/县
-	 */
-	@ExcelProperty("区")
-	@DbField("odt.district")
-	private String district;
+	@ExcelProperty("物品名称")
+	private String realGoodName;
 
-	/**
-	 * 详细地址
-	 */
-	@ExcelProperty("详细地址")
-	@DbField("odt.address")
-	private String address;
+	@ExcelProperty("重量（kg）")
+	private BigDecimal weight;
 
 	@ExcelProperty("付款方式")
 	private String payType;
@@ -157,18 +132,12 @@ public class ExcelRealGoodsOrderData {
 	@ExcelProperty("月结卡号")
 	private String monthCardNo;
 
-	@ExcelProperty("托寄物名称")
-	private String realGoodName;
-
-	@ExcelProperty("代收卡号(可选增加服务)")
+	@ExcelProperty("代收卡号")
 	private String toMoneyCardNumber;
 
-	@ExcelProperty("代收金额(可选增值服务)")
+	@ExcelProperty("代收金额")
 	private String toMoney;
 
-	@ExcelProperty("收件统编")
-	private String deliveryNumber;
-
 	@ExcelProperty("备注")
 	private String remark;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -32,7 +32,6 @@ import com.cyksj.model.excel.ExcelOrderDonData;
 import com.cyksj.model.excel.ExcelRealGoodsOrderData;
 import com.cyksj.model.excel.ExcelRealGoodsUserInterestData;
 import com.cyksj.model.excel.ExcelRealGoodsUserInterestHasPaymentData;
-import com.cyksj.model.excel.merge.RealGoodsOrderLineStrategy;
 import com.cyksj.model.manage.request.ReqSetLogisticsPost;
 import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.manage.views.OrderDonBackView;
@@ -59,7 +58,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -276,7 +274,7 @@ public class CmsOrderController {
 		List<ExcelRealGoodsOrderData> list = beanSearcher.searchAll(ExcelRealGoodsOrderData.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(ExcelOrderDonData::getGoodsDonType, Constant.realGoodsType).op(Operator.InList)
 				.build());
-		AtomicInteger index = new AtomicInteger(1);
+//		AtomicInteger index = new AtomicInteger(1);
 		list.forEach(data -> {
 			data.setPayType("寄付现结");
 			if (data.getGoodsDonType() == Constant.realGoodsType.get(0)) {
@@ -284,7 +282,7 @@ public class CmsOrderController {
 			} else if (data.getGoodsDonType() == Constant.realGoodsType.get(1)) {
 				data.setRealGoodName("银河潮玩");
 			}
-			data.setIndex(index.getAndIncrement());
+//			data.setIndex(index.getAndIncrement());
 		});
 		if (CollUtil.isEmpty(list)) {
 			throw BusinessRuntimeException.getInstance("导出数据为空");
@@ -299,11 +297,11 @@ public class CmsOrderController {
 		EasyExcel.write(response.getOutputStream())
 				.head(ExcelRealGoodsOrderData.class)
 				//设置合并单元格策略
-				.registerWriteHandler(new RealGoodsOrderLineStrategy())
+//				.registerWriteHandler(new RealGoodsOrderLineStrategy())
 				.excelType(ExcelTypeEnum.XLS)
 				.sheet("实物订单列表")
 				//设置头部标题从那行开始
-				.relativeHeadRowIndex(2)
+//				.relativeHeadRowIndex(2)
 				.doWrite(list);
 	}