Przeglądaj źródła

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

ZhangWenQiang 4 lat temu
rodzic
commit
6c5e45ed03

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

@@ -46,10 +46,16 @@ 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")
@@ -107,12 +113,6 @@ public class HwOrder implements Serializable {
     private List<HwOrderProcessDetail> hwOrderProcessDetailList;
 
     /**
-     * 需求单号
-     */
-    @TableField(exist = false)
-    private String requireCode;
-
-    /**
      * 接单人
      */
     @TableField(exist = false)

+ 2 - 1
happy-boot-module-flexjob/src/main/java/org/jeecg/modules/ordermanager/mapper/xml/HwOrderMapper.xml

@@ -273,7 +273,8 @@
         <include refid="hwOrderExportColumns"/>
         ,b.bnkflg AS "bnkflg",
         b.eacbnk AS "eacbnk",
-        b.rcveaa AS "rcveaa"
+        b.rcveaa AS "rcveaa",
+        r.code AS "requireCode"
         FROM hw_order a
         <include refid="hwOrderExportJoins"/>
         <where>