订单管理-导出订单去除订单编号改为需求单号

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/ordermanager/controller/HwOrderController.java

@@ -522,7 +522,7 @@ public class HwOrderController {
             wb = new XSSFWorkbook();
         }
         int rowNumber = 0;
-        String[] headArray = {"订单编号", "姓名", "身份证号", "银行卡号", "金额", "是否招商银行卡", "开户行", "开户地"};
+        String[] headArray = {"需求单号", "姓名", "身份证号", "银行卡号", "金额", "是否招商银行卡", "开户行", "开户地"};
         // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet
         Sheet sheet = wb.createSheet(sheetName);
 
@@ -633,7 +633,7 @@ public class HwOrderController {
             //将内容按顺序赋给对应的列对象
             cell = row.createCell(0);
             cell.setCellStyle(style);
-            addCell(cell, list.get(i).getOrderNumber());
+            addCell(cell, list.get(i).getRequireCode());
             cell = row.createCell(1);
             cell.setCellStyle(style);
             addCell(cell, list.get(i).getUserName());

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/ordermanager/entity/HwOrder.java

@@ -46,16 +46,10 @@ public class HwOrder implements Serializable {
     /**
      * 订单编号
      */
+    @Excel(name = "订单编号", width = 25)
     private java.lang.String orderNumber;
 
     /**
-     * 需求单号
-     */
-    @Excel(name = "需求单号", width = 25)
-    @TableField(exist = false)
-    private String requireCode;
-
-    /**
      * 承揽合同是否电子合同（0:非电子合同 1：电子合同），此值从需求带过来
      */
     @Dict(dicCode = "workContractType")
@@ -113,6 +107,12 @@ public class HwOrder implements Serializable {
     private List<HwOrderProcessDetail> hwOrderProcessDetailList;
 
     /**
+     * 需求单号
+     */
+    @TableField(exist = false)
+    private String requireCode;
+
+    /**
      * 接单人
      */
     @TableField(exist = false)