数电发票导出添加报销编号

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -625,6 +625,7 @@
 		a.buyer_name,
 		a.remarks,
 		ri.type as "status",
+		ri.no as "no",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
 		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
@@ -644,6 +645,7 @@
 				#{id}
 			</foreach>
 		</where>
+		order by ri.update_time desc
 	</select>
 	<select id="findOfficeListByIdList" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
 		SELECT id,`name`,parent_id FROM sys_office

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/dto/ReimbursementAmountInfoDTO.java

@@ -19,99 +19,91 @@ public class ReimbursementAmountInfoDTO extends BaseEntity {
      */
     @Excel(name = "序号", width = 6, orderNum = "1")
     private Integer serialNumber;
-    /**
-     * 关联id
-     */
-    private String infoId;
 
-    /**
-     * 发票代码
-     */
-    private String code;
 
     /**
-     * 发票编号
+     * 报销编号
      */
-    @Excel(name = "发票号号", width = 22, orderNum = "3")
-    private String number;
+    @Excel(name = "报销编号", width = 20, orderNum = "2")
+    private String no;
 
     /**
-     * 金额
-     */
-    @Excel(name = "金额", width = 16, orderNum = "7")
-    private Double amount;
-
-    /**
-     * 税额
-     */
-    @Excel(name = "税额", width = 16, orderNum = "8")
-    private Double taxAmount;
-
-    /**
-     * 价税合计
+     * 发票类型Str
      */
-    @Excel(name = "合计", width = 16, orderNum = "9")
-    private Double count;
+    @Excel(name = "发票类型", width = 20, orderNum = "3")
+    private String invoiceTypeStr;
+    private String officeName;
 
     /**
-     * 报销类型（0：普通报销；1：电子发票报销）
+     * 关联id
      */
-    private String reimbursementType;
+    private String infoId;
 
     /**
-     * 发票类型（01：增值税发票；02：普通发票）
+     * 发票代码
      */
-    private String invoiceType;
+    private String code;
 
     /**
-     * 发票项目名
+     * 发票编号
      */
-    @Excel(name = "项目名称", width = 30, orderNum = "6")
-    private String invoiceProjectName;
+    @Excel(name = "发票号号", width = 22, orderNum = "4")
+    private String number;
 
     /**
      * 开票时间
      */
-    @Excel(name = "开票日期", width = 20, orderNum = "4")
+    @Excel(name = "开票日期", width = 20, orderNum = "5")
     private String invoiceDate;
 
     /**
      * 开票单位
      */
-    @Excel(name = "开票单位", width = 30, orderNum = "5")
+    @Excel(name = "开票单位", width = 30, orderNum = "6")
     private String invoiceUnit;
 
 
     /**
      * 购买方名称
      */
-    @Excel(name = "购买方名称", width = 30, orderNum = "5")
+    @Excel(name = "购买方名称", width = 30, orderNum = "7")
     private String buyerName;
 
     /**
-     * 备注
+     * 发票项目名
      */
-    //@Excel(name = "备注", width = 30, orderNum = "12")
-    private String remarks;
+    @Excel(name = "项目名称", width = 30, orderNum = "8")
+    private String invoiceProjectName;
 
     /**
-     * 发票类型Str
+     * 金额
      */
-    @Excel(name = "发票类型", width = 20, orderNum = "2")
-    private String invoiceTypeStr;
-    private String officeName;
+    @Excel(name = "金额", width = 16, orderNum = "9")
+    private Double amount;
+
+    /**
+     * 税额
+     */
+    @Excel(name = "税额", width = 16, orderNum = "10")
+    private Double taxAmount;
+
+    /**
+     * 价税合计
+     */
+    @Excel(name = "合计", width = 16, orderNum = "11")
+    private Double count;
 
     /**
      * 报销人
      */
-    @Excel(name = "报销人", width = 10, orderNum = "10")
+    @Excel(name = "报销人", width = 10, orderNum = "12")
     private String reimbursementApplicantName;
 
     /**
      * 报销日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "11")
+    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "13")
     private Date reimDate;
 
     /**
@@ -121,6 +113,23 @@ public class ReimbursementAmountInfoDTO extends BaseEntity {
     private String status;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14")
     private Date paymentTime;
+
+    /**
+     * 报销类型（0：普通报销；1：电子发票报销）
+     */
+    private String reimbursementType;
+
+    /**
+     * 发票类型（01：增值税发票；02：普通发票）
+     */
+    private String invoiceType;
+
+
+    /**
+     * 备注
+     */
+    //@Excel(name = "备注", width = 30, orderNum = "12")
+    private String remarks;
 }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/mapper/xml/CcpmReimbursementInfoMapper.xml

@@ -817,6 +817,7 @@
 		a.buyer_name,
 		a.remarks,
 		ri.type as "status",
+		ri.no as "no",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
         date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
         su.name as "reimbursementApplicantName",
@@ -836,6 +837,7 @@
 				#{id}
 			</foreach>
 		</where>
+        order by ri.update_time desc
 	</select>
 
 	<select id="findById" resultType="com.jeeplus.ccpm.approvalInfo.domain.CcpmReimbursementInfo">

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/dto/CcpmReimbursementAmountInfoDTO.java

@@ -18,99 +18,91 @@ public class CcpmReimbursementAmountInfoDTO extends BaseEntity {
      */
     @Excel(name = "序号", width = 6, orderNum = "1")
     private Integer serialNumber;
-    /**
-     * 关联id
-     */
-    private String infoId;
 
-    /**
-     * 发票代码
-     */
-    private String code;
 
     /**
-     * 发票编号
+     * 报销编号
      */
-    @Excel(name = "发票号号", width = 22, orderNum = "3")
-    private String number;
+    @Excel(name = "报销编号", width = 20, orderNum = "2")
+    private String no;
 
     /**
-     * 金额
-     */
-    @Excel(name = "金额", width = 16, orderNum = "7")
-    private Double amount;
-
-    /**
-     * 税额
-     */
-    @Excel(name = "税额", width = 16, orderNum = "8")
-    private Double taxAmount;
-
-    /**
-     * 价税合计
+     * 发票类型Str
      */
-    @Excel(name = "合计", width = 16, orderNum = "9")
-    private Double count;
+    @Excel(name = "发票类型", width = 20, orderNum = "3")
+    private String invoiceTypeStr;
+    private String officeName;
 
     /**
-     * 报销类型（0：普通报销；1：电子发票报销）
+     * 关联id
      */
-    private String reimbursementType;
+    private String infoId;
 
     /**
-     * 发票类型（01：增值税发票；02：普通发票）
+     * 发票代码
      */
-    private String invoiceType;
+    private String code;
 
     /**
-     * 发票项目名
+     * 发票编号
      */
-    @Excel(name = "项目名称", width = 30, orderNum = "6")
-    private String invoiceProjectName;
+    @Excel(name = "发票号号", width = 22, orderNum = "4")
+    private String number;
 
     /**
      * 开票时间
      */
-    @Excel(name = "开票日期", width = 20, orderNum = "4")
+    @Excel(name = "开票日期", width = 20, orderNum = "5")
     private String invoiceDate;
 
     /**
      * 开票单位
      */
-    @Excel(name = "开票单位", width = 30, orderNum = "5")
+    @Excel(name = "开票单位", width = 30, orderNum = "6")
     private String invoiceUnit;
 
 
     /**
      * 购买方名称
      */
-    @Excel(name = "购买方名称", width = 30, orderNum = "5")
+    @Excel(name = "购买方名称", width = 30, orderNum = "7")
     private String buyerName;
 
     /**
-     * 备注
+     * 发票项目名
      */
-    //@Excel(name = "备注", width = 30, orderNum = "12")
-    private String remarks;
+    @Excel(name = "项目名称", width = 30, orderNum = "8")
+    private String invoiceProjectName;
 
     /**
-     * 发票类型Str
+     * 金额
      */
-    @Excel(name = "发票类型", width = 20, orderNum = "2")
-    private String invoiceTypeStr;
-    private String officeName;
+    @Excel(name = "金额", width = 16, orderNum = "9")
+    private Double amount;
+
+    /**
+     * 税额
+     */
+    @Excel(name = "税额", width = 16, orderNum = "10")
+    private Double taxAmount;
+
+    /**
+     * 价税合计
+     */
+    @Excel(name = "合计", width = 16, orderNum = "11")
+    private Double count;
 
     /**
      * 报销人
      */
-    @Excel(name = "报销人", width = 10, orderNum = "10")
+    @Excel(name = "报销人", width = 10, orderNum = "12")
     private String reimbursementApplicantName;
 
     /**
      * 报销日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "11")
+    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "13")
     private Date reimDate;
 
     /**
@@ -120,6 +112,23 @@ public class CcpmReimbursementAmountInfoDTO extends BaseEntity {
     private String status;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14")
     private Date paymentTime;
+
+    /**
+     * 报销类型（0：普通报销；1：电子发票报销）
+     */
+    private String reimbursementType;
+
+    /**
+     * 发票类型（01：增值税发票；02：普通发票）
+     */
+    private String invoiceType;
+
+
+    /**
+     * 备注
+     */
+    //@Excel(name = "备注", width = 30, orderNum = "12")
+    private String remarks;
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/xml/ZsReimbursementInfoMapper.xml

@@ -890,6 +890,7 @@
 		a.buyer_name,
 		a.remarks,
 		ri.type as "status",
+		ri.no as "no",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
 		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
@@ -909,6 +910,7 @@
 				#{id}
 			</foreach>
 		</where>
+		order by ri.update_time desc
 	</select>
 
 	<update id="updatePaymentById">

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/dto/ZsReimbursementAmountInfoDTO.java

@@ -18,6 +18,21 @@ public class ZsReimbursementAmountInfoDTO extends BaseEntity {
      */
     @Excel(name = "序号", width = 6, orderNum = "1")
     private Integer serialNumber;
+
+
+    /**
+     * 报销编号
+     */
+    @Excel(name = "报销编号", width = 20, orderNum = "2")
+    private String no;
+
+    /**
+     * 发票类型Str
+     */
+    @Excel(name = "发票类型", width = 20, orderNum = "3")
+    private String invoiceTypeStr;
+    private String officeName;
+
     /**
      * 关联id
      */
@@ -31,85 +46,63 @@ public class ZsReimbursementAmountInfoDTO extends BaseEntity {
     /**
      * 发票编号
      */
-    @Excel(name = "发票号号", width = 22, orderNum = "3")
+    @Excel(name = "发票号号", width = 22, orderNum = "4")
     private String number;
 
     /**
-     * 金额
-     */
-    @Excel(name = "金额", width = 16, orderNum = "7")
-    private Double amount;
-
-    /**
-     * 税额
+     * 开票时间
      */
-    @Excel(name = "税额", width = 16, orderNum = "8")
-    private Double taxAmount;
+    @Excel(name = "开票日期", width = 20, orderNum = "5")
+    private String invoiceDate;
 
     /**
-     * 价税合计
+     * 开票单位
      */
-    @Excel(name = "合计", width = 16, orderNum = "9")
-    private Double count;
+    @Excel(name = "开票单位", width = 30, orderNum = "6")
+    private String invoiceUnit;
 
-    /**
-     * 报销类型（0：普通报销；1：电子发票报销）
-     */
-    private String reimbursementType;
 
     /**
-     * 发票类型（01：增值税发票；02：普通发票）
+     * 购买方名称
      */
-    private String invoiceType;
+    @Excel(name = "购买方名称", width = 30, orderNum = "7")
+    private String buyerName;
 
     /**
      * 发票项目名
      */
-    @Excel(name = "项目名称", width = 30, orderNum = "6")
+    @Excel(name = "项目名称", width = 30, orderNum = "8")
     private String invoiceProjectName;
 
     /**
-     * 开票时间
-     */
-    @Excel(name = "开票日期", width = 20, orderNum = "4")
-    private String invoiceDate;
-
-    /**
-     * 开票单位
+     * 金额
      */
-    @Excel(name = "开票单位", width = 30, orderNum = "5")
-    private String invoiceUnit;
-
+    @Excel(name = "金额", width = 16, orderNum = "9")
+    private Double amount;
 
     /**
-     * 购买方名称
-     */
-    @Excel(name = "购买方名称", width = 30, orderNum = "5")
-    private String buyerName;
-    /**
-     * 备注
+     * 税额
      */
-    //@Excel(name = "备注", width = 30, orderNum = "12")
-    private String remarks;
+    @Excel(name = "税额", width = 16, orderNum = "10")
+    private Double taxAmount;
 
     /**
-     * 发票类型Str
+     * 价税合计
      */
-    @Excel(name = "发票类型", width = 20, orderNum = "2")
-    private String invoiceTypeStr;
-    private String officeName;
+    @Excel(name = "合计", width = 16, orderNum = "11")
+    private Double count;
 
     /**
      * 报销人
      */
-    @Excel(name = "报销人", width = 10, orderNum = "10")
+    @Excel(name = "报销人", width = 10, orderNum = "12")
     private String reimbursementApplicantName;
 
     /**
      * 报销日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "11")
+    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "13")
     private Date reimDate;
 
     /**
@@ -118,11 +111,25 @@ public class ZsReimbursementAmountInfoDTO extends BaseEntity {
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
 
-    /**
-     * 付款时间
-     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14")
     private Date paymentTime;
 
+    /**
+     * 报销类型（0：普通报销；1：电子发票报销）
+     */
+    private String reimbursementType;
+
+    /**
+     * 发票类型（01：增值税发票；02：普通发票）
+     */
+    private String invoiceType;
+
+
+    /**
+     * 备注
+     */
+    //@Excel(name = "备注", width = 30, orderNum = "12")
+    private String remarks;
+
 }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/mapper/xml/ConsultancyReimbursementInfoMapper.xml

@@ -787,6 +787,7 @@
 		a.buyer_name,
 		a.remarks,
 		ri.type as "status",
+		ri.no as "no",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
 		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
@@ -806,6 +807,7 @@
 				#{id}
 			</foreach>
 		</where>
+		order by ri.update_time desc
 	</select>
 
 	<select id="findById" resultType="com.jeeplus.consultancy.approvalInfo.domain.ConsultancyReimbursementInfo">

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/dto/ConsultancyReimbursementAmountInfoDTO.java

@@ -18,99 +18,91 @@ public class ConsultancyReimbursementAmountInfoDTO extends BaseEntity {
      */
     @Excel(name = "序号", width = 6, orderNum = "1")
     private Integer serialNumber;
-    /**
-     * 关联id
-     */
-    private String infoId;
-
-    /**
-     * 发票代码
-     */
-    private String code;
-
-    /**
-     * 发票编号
-     */
-    @Excel(name = "发票号号", width = 22, orderNum = "3")
-    private String number;
 
-    /**
-     * 金额
-     */
-    @Excel(name = "金额", width = 16, orderNum = "7")
-    private Double amount;
 
     /**
-     * 税额
+     * 报销编号
      */
-    @Excel(name = "税额", width = 16, orderNum = "8")
-    private Double taxAmount;
+    @Excel(name = "报销编号", width = 20, orderNum = "2")
+    private String no;
 
     /**
-     * 价税合计
+     * 发票类型Str
      */
-    @Excel(name = "合计", width = 16, orderNum = "9")
-    private Double count;
+    @Excel(name = "发票类型", width = 20, orderNum = "3")
+    private String invoiceTypeStr;
+    private String officeName;
 
     /**
-     * 报销类型（0：普通报销；1：电子发票报销）
+     * 关联id
      */
-    private String reimbursementType;
+    private String infoId;
 
     /**
-     * 发票类型（01：增值税发票；02：普通发票）
+     * 发票代码
      */
-    private String invoiceType;
+    private String code;
 
     /**
-     * 发票项目名
+     * 发票编号
      */
-    @Excel(name = "项目名称", width = 30, orderNum = "6")
-    private String invoiceProjectName;
+    @Excel(name = "发票号号", width = 22, orderNum = "4")
+    private String number;
 
     /**
      * 开票时间
      */
-    @Excel(name = "开票日期", width = 20, orderNum = "4")
+    @Excel(name = "开票日期", width = 20, orderNum = "5")
     private String invoiceDate;
 
     /**
      * 开票单位
      */
-    @Excel(name = "开票单位", width = 30, orderNum = "5")
+    @Excel(name = "开票单位", width = 30, orderNum = "6")
     private String invoiceUnit;
 
 
     /**
      * 购买方名称
      */
-    @Excel(name = "购买方名称", width = 30, orderNum = "5")
+    @Excel(name = "购买方名称", width = 30, orderNum = "7")
     private String buyerName;
 
     /**
-     * 备注
+     * 发票项目名
      */
-    //@Excel(name = "备注", width = 30, orderNum = "12")
-    private String remarks;
+    @Excel(name = "项目名称", width = 30, orderNum = "8")
+    private String invoiceProjectName;
 
     /**
-     * 发票类型Str
+     * 金额
      */
-    @Excel(name = "发票类型", width = 20, orderNum = "2")
-    private String invoiceTypeStr;
-    private String officeName;
+    @Excel(name = "金额", width = 16, orderNum = "9")
+    private Double amount;
+
+    /**
+     * 税额
+     */
+    @Excel(name = "税额", width = 16, orderNum = "10")
+    private Double taxAmount;
+
+    /**
+     * 价税合计
+     */
+    @Excel(name = "合计", width = 16, orderNum = "11")
+    private Double count;
 
     /**
      * 报销人
      */
-    @Excel(name = "报销人", width = 10, orderNum = "10")
+    @Excel(name = "报销人", width = 10, orderNum = "12")
     private String reimbursementApplicantName;
 
     /**
      * 报销日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "11")
+    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "13")
     private Date reimDate;
 
     /**
@@ -119,10 +111,24 @@ public class ConsultancyReimbursementAmountInfoDTO extends BaseEntity {
     //@Excel(name = "报销状态", width = 30, orderNum = "12",dict = "status")
     private String status;
 
-    /**
-     * 报销日期
-     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14")
     private Date paymentTime;
+
+    /**
+     * 报销类型（0：普通报销；1：电子发票报销）
+     */
+    private String reimbursementType;
+
+    /**
+     * 发票类型（01：增值税发票；02：普通发票）
+     */
+    private String invoiceType;
+
+
+    /**
+     * 备注
+     */
+    //@Excel(name = "备注", width = 30, orderNum = "12")
+    private String remarks;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -860,6 +860,7 @@
 		a.buyer_name,
 		a.remarks,
 		ri.type as "status",
+		ri.no as "no",
 		date_format(ri.reim_date,'%Y-%m-%d') as 'reimDate',
 		date_format(ri.payment_time,'%Y-%m-%d %H:%i:%s') as 'paymentTime',
 		su.name as "reimbursementApplicantName",
@@ -880,6 +881,7 @@
 				#{id}
 			</foreach>
 		</where>
+		order by ri.update_time desc
 	</select>
     <select id="getHumanProcuredDetailList"
             resultType="com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.HumanReimbursementDetailInfoProcured">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/dto/CwReimbursementAmountInfoDTO.java

@@ -18,6 +18,14 @@ public class CwReimbursementAmountInfoDTO extends BaseEntity {
      */
     @Excel(name = "序号", width = 6, orderNum = "1")
     private Integer serialNumber;
+
+
+    /**
+     * 报销编号
+     */
+    @Excel(name = "报销编号", width = 20, orderNum = "2")
+    private String no;
+
     /**
      * 关联id
      */
@@ -31,25 +39,25 @@ public class CwReimbursementAmountInfoDTO extends BaseEntity {
     /**
      * 发票编号
      */
-    @Excel(name = "发票号号", width = 22, orderNum = "3")
+    @Excel(name = "发票号号", width = 22, orderNum = "4")
     private String number;
 
     /**
      * 金额
      */
-    @Excel(name = "金额", width = 16, orderNum = "7")
+    @Excel(name = "金额", width = 16, orderNum = "9")
     private Double amount;
 
     /**
      * 税额
      */
-    @Excel(name = "税额", width = 16, orderNum = "8")
+    @Excel(name = "税额", width = 16, orderNum = "10")
     private Double taxAmount;
 
     /**
      * 价税合计
      */
-    @Excel(name = "合计", width = 16, orderNum = "9")
+    @Excel(name = "合计", width = 16, orderNum = "11")
     private Double count;
 
     /**
@@ -65,26 +73,26 @@ public class CwReimbursementAmountInfoDTO extends BaseEntity {
     /**
      * 发票项目名
      */
-    @Excel(name = "项目名称", width = 30, orderNum = "6")
+    @Excel(name = "项目名称", width = 30, orderNum = "8")
     private String invoiceProjectName;
 
     /**
      * 开票时间
      */
-    @Excel(name = "开票日期", width = 20, orderNum = "4")
+    @Excel(name = "开票日期", width = 20, orderNum = "5")
     private String invoiceDate;
 
     /**
      * 开票单位
      */
-    @Excel(name = "开票单位", width = 30, orderNum = "5")
+    @Excel(name = "开票单位", width = 30, orderNum = "6")
     private String invoiceUnit;
 
 
     /**
      * 购买方名称
      */
-    @Excel(name = "购买方名称", width = 30, orderNum = "5")
+    @Excel(name = "购买方名称", width = 30, orderNum = "7")
     private String buyerName;
 
     /**
@@ -96,21 +104,21 @@ public class CwReimbursementAmountInfoDTO extends BaseEntity {
     /**
      * 发票类型Str
      */
-    @Excel(name = "发票类型", width = 20, orderNum = "2")
+    @Excel(name = "发票类型", width = 20, orderNum = "3")
     private String invoiceTypeStr;
     private String officeName;
 
     /**
      * 报销人
      */
-    @Excel(name = "报销人", width = 10, orderNum = "10")
+    @Excel(name = "报销人", width = 10, orderNum = "12")
     private String reimbursementApplicantName;
 
     /**
      * 报销日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "11")
+    @Excel(name = "报销日期", exportFormat="yyyy-MM-dd", width = 12, orderNum = "13")
     private Date reimDate;
 
     /**
@@ -123,6 +131,6 @@ public class CwReimbursementAmountInfoDTO extends BaseEntity {
      * 付款时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "11")
+    @Excel(name = "付款时间", exportFormat="yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14")
     private Date paymentTime;
 }