报销调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfo.java

@@ -67,11 +67,31 @@ public class ReimbursementDetailInfo extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfoContract.java

@@ -77,11 +77,30 @@ public class ReimbursementDetailInfoContract extends BaseEntity implements Seria
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfoOther.java

@@ -74,13 +74,31 @@ public class ReimbursementDetailInfoOther extends BaseEntity implements Serializ
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
 
     /**
-     * 收据张数
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementDetailInfoProcured.java

@@ -76,11 +76,30 @@ public class ReimbursementDetailInfoProcured extends BaseEntity implements Seria
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -357,7 +357,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -386,7 +390,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		a.reimbursement_type,
@@ -417,7 +425,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		a.reimbursement_type,
@@ -448,7 +460,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

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

@@ -540,8 +540,6 @@ public class ReimbursementInfoService {
         }
 
         infoMapper.updateById(info);
-
-        infoMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据
         LambdaQueryWrapper<ReimbursementDetailInfo> detailWrapper = new LambdaQueryWrapper<>();

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfo.java

@@ -69,11 +69,31 @@ public class CcpmReimbursementDetailInfo extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoContract.java

@@ -72,11 +72,31 @@ public class CcpmReimbursementDetailInfoContract extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoOther.java

@@ -58,11 +58,31 @@ public class CcpmReimbursementDetailInfoOther extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoProcured.java

@@ -58,11 +58,31 @@ public class CcpmReimbursementDetailInfoProcured extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementDetailInfoReport.java

@@ -72,11 +72,31 @@ public class CcpmReimbursementDetailInfoReport extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -495,7 +495,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -522,7 +526,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -550,7 +558,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -577,7 +589,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.reimbursement_type,
 		a.unique_id,
@@ -607,7 +623,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfo.java

@@ -65,16 +65,35 @@ public class ZsReimbursementDetailInfo extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+    /**
      * 出差天数
      */
     private Integer days;
@@ -93,4 +112,9 @@ public class ZsReimbursementDetailInfo extends BaseEntity {
      * 报销类型
      */
     private String reimbursementType;
+
+    /**
+     * 排序
+     */
+    private String sort;
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfoContract.java

@@ -65,18 +65,38 @@ public class ZsReimbursementDetailInfoContract extends BaseEntity {
      * 报告号
      */
     private String reportNumber;
-
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfoOther.java

@@ -53,16 +53,37 @@ public class ZsReimbursementDetailInfoOther extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfoProcured.java

@@ -53,16 +53,37 @@ public class ZsReimbursementDetailInfoProcured extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfoProject.java

@@ -50,16 +50,36 @@ public class ZsReimbursementDetailInfoProject extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementDetailInfoReport.java

@@ -64,16 +64,36 @@ public class ZsReimbursementDetailInfoReport extends BaseEntity {
     private String reportNumber;
 
     /**
-     * 费用(元)
+     * 费用(元),数电发票
      */
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -268,6 +268,7 @@
 		WHERE
 			del_flag = 0
 			AND attachment_id = #{id}
+		ORDER BY create_time DESC
 	</select>
 	<select id="findOfficeList"
 			resultType="com.jeeplus.centrecareful.approvalInfo.service.dto.ZsTreeUserDto">
@@ -557,7 +558,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.reimbursement_type,
 		a.unique_id,
@@ -586,7 +591,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -614,7 +623,11 @@
 			a.project_id,
 			a.report_number,
 			a.number,
+			a.ordinary_number,
 			a.receipt_number,
+			a.ordinary_receipt_number,
+			a.receipt_number_count,
+			a.number_count,
 			a.days,
 			a.content,
 			a.reimbursement_type,
@@ -644,7 +657,11 @@
 			a.project_id,
 			a.report_number,
 			a.number,
+			a.ordinary_number,
 			a.receipt_number,
+			a.ordinary_receipt_number,
+			a.receipt_number_count,
+			a.number_count,
 			a.days,
 			a.content,
 			a.reimbursement_type,
@@ -658,7 +675,7 @@
 				 left join sys_office so on a.dept_id = so.id and so.del_flag = '0'
 				 left join cw_reimbursement_type_info zs_type on zs_type.id = a.type_id and zs_type.del_flag = '0'
 		where a.del_flag = '0' and a.info_id = #{id}
-		order by a.number asc
+		order by a.create_time asc
 	</select>
 
 	<select id="getOtherDetailList" resultType="com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementDetailInfoOther">
@@ -674,7 +691,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.reimbursement_type,
 		a.unique_id,
@@ -705,7 +726,11 @@
 			a.project_id,
 			a.report_number,
 			a.number,
+			a.ordinary_number,
 			a.receipt_number,
+			a.ordinary_receipt_number,
+			a.receipt_number_count,
+			a.number_count,
 			a.days,
 			a.content,
 			a.reimbursement_type,
@@ -738,7 +763,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

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

@@ -322,10 +322,13 @@ public class ZsReimbursementInfoService {
         infoMapper.insert(info);
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
+            int i = 0;
             for (ZsReimbursementDetailInfo detailInfo : dto.getDetailInfos()) {
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(id);
+                detailInfo.setSort(String.valueOf(i));
                 detailInfoMapper.insert(detailInfo);
+                i++;
             }
         }
         // 保存合同详情列表信息

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfo.java

@@ -67,13 +67,34 @@ public class ConsultancyReimbursementDetailInfo extends BaseEntity {
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
 
     /**
-     * 收据张数
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoContract.java

@@ -72,11 +72,33 @@ public class ConsultancyReimbursementDetailInfoContract extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoOther.java

@@ -56,13 +56,34 @@ public class ConsultancyReimbursementDetailInfoOther extends BaseEntity {
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
 
     /**
-     * 收据张数
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoProcured.java

@@ -58,11 +58,33 @@ public class ConsultancyReimbursementDetailInfoProcured extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementDetailInfoReport.java

@@ -72,11 +72,33 @@ public class ConsultancyReimbursementDetailInfoReport extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -477,7 +477,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -504,7 +508,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -532,7 +540,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -559,7 +571,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.reimbursement_type,
 		a.unique_id,
@@ -589,7 +605,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfo.java

@@ -68,13 +68,33 @@ public class CwReimbursementDetailInfo extends BaseEntity {
      * 费用(元)
      */
     private String number;
+    /**
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
 
     /**
-     * 收据张数
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoContract.java

@@ -72,11 +72,32 @@ public class CwReimbursementDetailInfoContract extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoOther.java

@@ -58,11 +58,32 @@ public class CwReimbursementDetailInfoOther extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoProcured.java

@@ -58,11 +58,32 @@ public class CwReimbursementDetailInfoProcured extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfoReport.java

@@ -72,11 +72,32 @@ public class CwReimbursementDetailInfoReport extends BaseEntity {
     private String number;
 
     /**
-     * 收据张数
+     * 费用(元),普通发票
+     */
+    private String ordinaryNumber;
+
+    /**
+     * 费用汇总
+     */
+    private String numberCount;
+
+    /**
+     * 收据张数，数电发票
      */
     private Integer receiptNumber;
 
     /**
+     * 收据张数，普通发票
+     */
+    private Integer ordinaryReceiptNumber;
+
+    /**
+     * 张数汇总
+     */
+    private Integer receiptNumberCount;
+
+
+    /**
      * 出差天数
      */
     private Integer days;

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

@@ -559,7 +559,11 @@
 		a.contract_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,
@@ -588,7 +592,11 @@
 		a.report_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		a.unique_id,
@@ -624,7 +632,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.unique_id,
 		a.reimbursement_type,
@@ -655,7 +667,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		a.unique_id,
@@ -686,7 +702,11 @@
 		a.project_id,
 		a.report_number,
 		a.number,
+		a.ordinary_number,
 		a.receipt_number,
+		a.ordinary_receipt_number,
+		a.receipt_number_count,
+		a.number_count,
 		a.days,
 		a.content,
 		su.name as user_name,