完善导出表格式

src/main/java/org/rcisoft/bus/custrecharge/entity/CustRecharge.java

@@ -25,7 +25,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column customer_id
      * @default
      */
-     @Excel(name = "客户", orderNum = "0", width = 20)
+     @Excel(name = "客户", orderNum = "1", width = 20)
      private Integer customerId;
 
      /**
@@ -33,7 +33,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column actual_recharge
      * @default
      */
-     @Excel(name = "实际充值", orderNum = "1", width = 20)
+     @Excel(name = "实际充值", orderNum = "2", width = 20)
      private BigDecimal actualRecharge;
 
      /**
@@ -41,7 +41,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column actual_receipt
      * @default
      */
-     @Excel(name = "实际到账", orderNum = "2", width = 20)
+     @Excel(name = "实际到账", orderNum = "4", width = 20)
      private BigDecimal actualReceipt;
 
      /**
@@ -49,7 +49,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column order_number
      * @default
      */
-     @Excel(name = "消费订单号", orderNum = "3", width = 20)
+     @Excel(name = "消费订单号", orderNum = "5", width = 20)
      private String orderNumber;
 
      /**
@@ -57,7 +57,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column consumption_amount
      * @default
      */
-     @Excel(name = "消费金额", orderNum = "4", width = 20)
+     @Excel(name = "消费金额", orderNum = "7", width = 20)
      private BigDecimal consumptionAmount;
 
      /**
@@ -65,7 +65,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column customer_balance
      * @default
      */
-     @Excel(name = "充值/消费余额", orderNum = "5", width = 20)
+     @Excel(name = "充值/消费余额", orderNum = "8", width = 20)
      private BigDecimal customerBalance;
 
      /**
@@ -73,7 +73,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column store_id
      * @default
      */
-     @Excel(name = "门店", orderNum = "6", width = 20)
+     @Excel(name = "门店", orderNum = "0", width = 20)
      private String storeId;
 
      /**
@@ -81,7 +81,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      * @column is_recharge
      * @default
      */
-     @Excel(name = "(0消费 1充值)", orderNum = "7", width = 20)
+     @Excel(name = "(0消费 1充值)", orderNum = "6", width = 20)
      private String isRecharge;
 
      /**
@@ -131,6 +131,7 @@ public class CustRecharge  extends CyIdIncreEntity<CustRecharge> {
      /**
       * 是否为退款
       */
+     @Excel(name = "充值类型（1为退款)",orderNum = "3", width = 20)
      private String isReturn;
 }
 

src/main/java/org/rcisoft/bus/storegoodslog/controller/StoreGoodsLogController.java

@@ -133,6 +133,6 @@ public class StoreGoodsLogController extends CyPaginationController<StoreGoodsLo
             case "2": excelName="商品记录表信息.csv";break;
         }
         List<StoreGoodsLog> storeGoodsLogList = storeGoodsLogServiceImpl.export(storeGoodsLog);
-        CyEpExcelUtil.exportExcel(storeGoodsLogList, "商品记录表信息", "商品记录表信息", StoreGoodsLog.class, excelName, response);
+        CyEpExcelUtil.exportExcel(storeGoodsLogList, "销售明细表信息", "销售明细表信息", StoreGoodsLog.class, excelName, response);
     }
 }

src/main/java/org/rcisoft/bus/storegoodslog/entity/StoreGoodsLog.java

@@ -25,6 +25,7 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
      @Excel(name = "商品编码", orderNum = "2", width = 20)
      private String goodsCode;
      private Integer applyId;
+     @Excel(name = "总数量",orderNum = "8", width = 20)
      private Integer goodsCounts;
      private Integer updateCounts;
      private Integer goodsId;
@@ -78,7 +79,7 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
       * @default
       */
      @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-     @Excel(name = "销售日期", orderNum = "8", width = 20, format = "yyyy-MM-dd")
+     @Excel(name = "销售日期", orderNum = "9", width = 20, format = "yyyy-MM-dd")
      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date updateDate;