sangwenwei 1 рік тому
батько
коміт
95a4d41d97

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

@@ -83,4 +83,16 @@ public class CwReimbursementDetailInfo extends BaseEntity {
      * 内容
      */
     private String content;
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
+    /**
+     * 附件名称
+     */
+    private String fileName;
+    /**
+     * 发票编号
+     */
+    private String invoiceNumber;
 }

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

@@ -81,4 +81,17 @@ public class CwReimbursementDetailInfoOther extends BaseEntity {
      * 报销项目名称
      */
     private String projectName;
+
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
+    /**
+     * 附件名称
+     */
+    private String fileName;
+    /**
+     * 发票编号
+     */
+    private String invoiceNumber;
 }

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

@@ -96,4 +96,16 @@ public class CwReimbursementDetailInfoReport extends BaseEntity {
      */
     @TableField(exist = false)
     private String projectName;
+    /**
+     * 报销类型
+     */
+    private String reimbursementType;
+    /**
+     * 附件名称
+     */
+    private String fileName;
+    /**
+     * 发票编号
+     */
+    private String invoiceNumber;
 }

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

@@ -66,6 +66,16 @@
 			WHEN a.source_type = 4 THEN b4.`number`
 			WHEN a.source_type = 6 THEN b6.`number`
 									ELSE b5.`number` END) AS `number`,
+
+			(CASE
+			WHEN a.source_type = 1 AND b.`reimbursement_type` IS NOT NULL THEN b.`reimbursement_type`
+			WHEN a.source_type = 2 AND b2.`reimbursement_type` IS NOT NULL THEN b2.`reimbursement_type`
+			WHEN a.source_type = 3 AND b3.`reimbursement_type` IS NOT NULL THEN b3.`reimbursement_type`
+			WHEN a.source_type = 4 AND b4.`reimbursement_type` IS NOT NULL THEN b4.`reimbursement_type`
+			WHEN a.source_type = 6 AND b6.`reimbursement_type` IS NOT NULL THEN b6.`reimbursement_type`
+			WHEN a.reimbursement_type IS NOT NULL THEN a.reimbursement_type
+			ELSE b5.`reimbursement_type`
+			END) as reimbursementType,
 			a.user_name,
 			a.reim_date,
 			a.type,
@@ -75,7 +85,6 @@
 			a.create_by_id as create_id,
 			a.source_type,
 			a.purchase_id,
-			a.reimbursement_type,
 			b.user_id as projectUser,
 			b.dept_id as projectOffice,
 			b3.user_id as reportUser,
@@ -459,6 +468,9 @@
 		a.receipt_number,
 		a.days,
 		a.content,
+		a.reimbursement_type,
+		a.file_name,
+		a.invoice_number,
 		su.name as user_name,
 		so.name as dept_name,
 		cw_type.name as type_name,
@@ -491,6 +503,9 @@
 		a.receipt_number,
 		a.days,
 		a.content,
+		a.reimbursement_type,
+		a.file_name,
+		a.invoice_number,
 		su.name as user_name,
 		so.name as dept_name,
 		cw_type.name as type_name,
@@ -520,6 +535,9 @@
 		a.receipt_number,
 		a.days,
 		a.content,
+		a.reimbursement_type,
+		a.file_name,
+		a.invoice_number,
 		su.name as user_name,
 		so.name as dept_name,
 		cw_type.name as type_name,

+ 252 - 116
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -319,6 +319,29 @@ public class CwReimbursementInfoService {
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(id);
                 detailInfoMapper.insert(detailInfo);
+                //保存数电发票信息
+                if (StringUtils.isNotBlank(detailInfo.getReimbursementType())&&"1".equals(detailInfo.getReimbursementType())&& StringUtils.isNotBlank(detailInfo.getFileName())){
+                    if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+                        for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+                            if (amountInfo.getNumber().equals(detailInfo.getInvoiceNumber())){
+                                //电子发票报销 发票信息
+                                amountInfo.setReimbursementType("1");
+                                // 生成id
+                                String amountId = UUID.randomUUID().toString().replace("-", "");
+                                amountInfo.setId(amountId);
+                                amountInfo.setCreateById(userDTO.getId());
+                                amountInfo.setCreateTime(new Date());
+                                amountInfo.setUpdateById(userDTO.getId());
+                                amountInfo.setUpdateTime(new Date());
+                                amountInfo.setDelFlag(0);
+                                // 保存基础表信息主键值
+                                amountInfo.setInfoId(id);
+                                amountInfoMapper.insert(amountInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
             }
         }
         // 保存合同详情列表信息
@@ -335,6 +358,30 @@ public class CwReimbursementInfoService {
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(id);
                 cwReimbursementDetailInfoReportMapper.insert(detailInfo);
+                //保存数电发票信息
+                if (StringUtils.isNotBlank(detailInfo.getReimbursementType())&&"1".equals(detailInfo.getReimbursementType())&& StringUtils.isNotBlank(detailInfo.getFileName())){
+                    if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+                        for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+                            if (amountInfo.getNumber().equals(detailInfo.getInvoiceNumber())){
+                                //电子发票报销 发票信息
+                                amountInfo.setReimbursementType("1");
+                                // 生成id
+                                String amountId = UUID.randomUUID().toString().replace("-", "");
+                                amountInfo.setId(amountId);
+                                amountInfo.setCreateById(userDTO.getId());
+                                amountInfo.setCreateTime(new Date());
+                                amountInfo.setUpdateById(userDTO.getId());
+                                amountInfo.setUpdateTime(new Date());
+                                amountInfo.setDelFlag(0);
+                                // 保存基础表信息主键值
+                                amountInfo.setInfoId(id);
+                                amountInfoMapper.insert(amountInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
+
             }
         }
         // 保存其他报销详情列表信息
@@ -343,6 +390,30 @@ public class CwReimbursementInfoService {
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(id);
                 cwReimbursementDetailInfoOtherMapper.insert(detailInfo);
+                //保存数电发票信息
+                if (StringUtils.isNotBlank(detailInfo.getReimbursementType())&&"1".equals(detailInfo.getReimbursementType())&& StringUtils.isNotBlank(detailInfo.getFileName())){
+                    if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+                        for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+                            if (amountInfo.getNumber().equals(detailInfo.getInvoiceNumber())){
+                                //电子发票报销 发票信息
+                                amountInfo.setReimbursementType("1");
+                                // 生成id
+                                String amountId = UUID.randomUUID().toString().replace("-", "");
+                                amountInfo.setId(amountId);
+                                amountInfo.setCreateById(userDTO.getId());
+                                amountInfo.setCreateTime(new Date());
+                                amountInfo.setUpdateById(userDTO.getId());
+                                amountInfo.setUpdateTime(new Date());
+                                amountInfo.setDelFlag(0);
+                                // 保存基础表信息主键值
+                                amountInfo.setInfoId(id);
+                                amountInfoMapper.insert(amountInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
+
             }
         }
         // 保存采购报销详情列表信息
@@ -363,63 +434,53 @@ public class CwReimbursementInfoService {
                 humanReimbursementDetailInfoProcuredMapper.insert(detailInfo);
             }
         }
-        if(StringUtils.isNotBlank(dto.getReimbursementType())){
-            if("0".equals(dto.getReimbursementType())){
-                // 保存专用发票列表信息
-                if (CollectionUtils.isNotEmpty(dto.getAmountInfos())) {
-                    for (CwReimbursementAmountInfo amountInfo : dto.getAmountInfos()) {
-                        //普通报销 发票信息
-                        amountInfo.setReimbursementType("0");
-                        // 生成id
-                        String amountId = UUID.randomUUID().toString().replace("-", "");
-                        amountInfo.setId(amountId);
-                        amountInfo.setCreateById(userDTO.getId());
-                        amountInfo.setCreateTime(new Date());
-                        amountInfo.setUpdateById(userDTO.getId());
-                        amountInfo.setUpdateTime(new Date());
-                        amountInfo.setDelFlag(0);
-                        // 保存基础表信息主键值
-                        amountInfo.setInfoId(id);
-                        amountInfoMapper.insert(amountInfo);
-                    }
-                }
-                //清除电子发票信息
-                // 删除合同列表
-                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
-                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
-                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "0");
-                amountInfoMapper.delete(deleteInfo);
-            }else if("1".equals(dto.getReimbursementType())){
-                // 保存电子发票列表信息
-                if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
-                    for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
-                        //电子发票报销 发票信息
-                        amountInfo.setReimbursementType("1");
-                        // 生成id
-                        String amountId = UUID.randomUUID().toString().replace("-", "");
-                        amountInfo.setId(amountId);
-                        amountInfo.setCreateById(userDTO.getId());
-                        amountInfo.setCreateTime(new Date());
-                        amountInfo.setUpdateById(userDTO.getId());
-                        amountInfo.setUpdateTime(new Date());
-                        amountInfo.setDelFlag(0);
-                        // 保存基础表信息主键值
-                        amountInfo.setInfoId(id);
-                        amountInfoMapper.insert(amountInfo);
-                    }
-                }
-                //清除专用发票信息
-                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
-                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
-                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "1");
-                amountInfoMapper.delete(deleteInfo);
-
-                // 保存电子发票附件列表信息
-                if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursementFiles())) {
-                    infoService.saveFiles(dto.getInvoiceReimbursementFiles(), userDTO, id,"invoiceReimbursement");
-                }
+        // 保存专用发票列表信息
+        if (CollectionUtils.isNotEmpty(dto.getAmountInfos())) {
+            for (CwReimbursementAmountInfo amountInfo : dto.getAmountInfos()) {
+                //普通报销 发票信息
+                amountInfo.setReimbursementType("0");
+                // 生成id
+                String amountId = UUID.randomUUID().toString().replace("-", "");
+                amountInfo.setId(amountId);
+                amountInfo.setCreateById(userDTO.getId());
+                amountInfo.setCreateTime(new Date());
+                amountInfo.setUpdateById(userDTO.getId());
+                amountInfo.setUpdateTime(new Date());
+                amountInfo.setDelFlag(0);
+                // 保存基础表信息主键值
+                amountInfo.setInfoId(id);
+                amountInfoMapper.insert(amountInfo);
             }
         }
+//        if(StringUtils.isNotBlank(dto.getReimbursementType())){
+//            if("0".equals(dto.getReimbursementType())){
+//
+//
+//                //清除电子发票信息
+//                // 删除合同列表
+//                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
+//                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
+//                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "0");
+//                amountInfoMapper.delete(deleteInfo);
+//            }else if("1".equals(dto.getReimbursementType())){
+//                // 保存电子发票列表信息
+//
+//                //清除专用发票信息
+//                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
+//                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
+//                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "1");
+//                amountInfoMapper.delete(deleteInfo);
+//
+//                // 保存电子发票附件列表信息
+//                if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursementFiles())) {
+//                    infoService.saveFiles(dto.getInvoiceReimbursementFiles(), userDTO, id,"invoiceReimbursement");
+//                }
+//            }
+//        }
+        // 保存电子发票附件列表信息
+        if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursementFiles())) {
+            infoService.saveFiles(dto.getInvoiceReimbursementFiles(), userDTO, id,"invoiceReimbursement");
+        }
         // 保存附件列表信息
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
             infoService.saveFiles(dto.getFiles(), userDTO, id);
@@ -461,6 +522,12 @@ public class CwReimbursementInfoService {
         humanDetailWrapperProcured.eq(HumanReimbursementDetailInfoProcured::getInfoId, dto.getId());
         humanReimbursementDetailInfoProcuredMapper.delete(humanDetailWrapperProcured);
 
+        // 修改专用发票信息列表
+        // 删除原有数据
+        LambdaQueryWrapper<CwReimbursementAmountInfo> amountWrapper = new LambdaQueryWrapper<>();
+        amountWrapper.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
+        amountInfoMapper.delete(amountWrapper);
+
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
             for (CwReimbursementDetailInfo detailInfo : dto.getDetailInfos()) {
@@ -468,6 +535,30 @@ public class CwReimbursementInfoService {
                 detailInfo.setInfoId(dto.getId());
                 detailInfo.setId("");
                 detailInfoMapper.insert(detailInfo);
+                //保存数电发票信息
+                if (StringUtils.isNotBlank(detailInfo.getReimbursementType())&&"1".equals(detailInfo.getReimbursementType())&& StringUtils.isNotBlank(detailInfo.getFileName())){
+                    if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+                        for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+                            if (amountInfo.getNumber().equals(detailInfo.getInvoiceNumber())){
+                                //电子发票报销 发票信息
+                                amountInfo.setReimbursementType("1");
+                                // 生成id
+                                String amountId = UUID.randomUUID().toString().replace("-", "");
+                                amountInfo.setId(amountId);
+                                amountInfo.setCreateById(userDTO.getId());
+                                amountInfo.setCreateTime(new Date());
+                                amountInfo.setUpdateById(userDTO.getId());
+                                amountInfo.setUpdateTime(new Date());
+                                amountInfo.setDelFlag(0);
+                                // 保存基础表信息主键值
+                                amountInfo.setInfoId(dto.getId());
+                                amountInfoMapper.insert(amountInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
+
             }
         }
         // 保存合同详情列表信息
@@ -486,6 +577,30 @@ public class CwReimbursementInfoService {
                 detailInfo.setInfoId(dto.getId());
                 detailInfo.setId("");
                 cwReimbursementDetailInfoReportMapper.insert(detailInfo);
+                //保存数电发票信息
+                if (StringUtils.isNotBlank(detailInfo.getReimbursementType())&&"1".equals(detailInfo.getReimbursementType())&& StringUtils.isNotBlank(detailInfo.getFileName())){
+                    if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+                        for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+                            if (amountInfo.getNumber().equals(detailInfo.getInvoiceNumber())){
+                                //电子发票报销 发票信息
+                                amountInfo.setReimbursementType("1");
+                                // 生成id
+                                String amountId = UUID.randomUUID().toString().replace("-", "");
+                                amountInfo.setId(amountId);
+                                amountInfo.setCreateById(userDTO.getId());
+                                amountInfo.setCreateTime(new Date());
+                                amountInfo.setUpdateById(userDTO.getId());
+                                amountInfo.setUpdateTime(new Date());
+                                amountInfo.setDelFlag(0);
+                                // 保存基础表信息主键值
+                                amountInfo.setInfoId(dto.getId());
+                                amountInfoMapper.insert(amountInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
+
             }
         }
         // 保存其他报销详情列表信息
@@ -495,6 +610,30 @@ public class CwReimbursementInfoService {
                 detailInfo.setInfoId(dto.getId());
                 detailInfo.setId("");
                 cwReimbursementDetailInfoOtherMapper.insert(detailInfo);
+                //保存数电发票信息
+                if (StringUtils.isNotBlank(detailInfo.getReimbursementType())&&"1".equals(detailInfo.getReimbursementType())&& StringUtils.isNotBlank(detailInfo.getFileName())){
+                    if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+                        for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+                            if (amountInfo.getNumber().equals(detailInfo.getInvoiceNumber())){
+                                //电子发票报销 发票信息
+                                amountInfo.setReimbursementType("1");
+                                // 生成id
+                                String amountId = UUID.randomUUID().toString().replace("-", "");
+                                amountInfo.setId(amountId);
+                                amountInfo.setCreateById(userDTO.getId());
+                                amountInfo.setCreateTime(new Date());
+                                amountInfo.setUpdateById(userDTO.getId());
+                                amountInfo.setUpdateTime(new Date());
+                                amountInfo.setDelFlag(0);
+                                // 保存基础表信息主键值
+                                amountInfo.setInfoId(dto.getId());
+                                amountInfoMapper.insert(amountInfo);
+                                break;
+                            }
+                        }
+                    }
+                }
+
             }
         }
         // 保存采购报销详情列表信息
@@ -516,69 +655,66 @@ public class CwReimbursementInfoService {
                 humanReimbursementDetailInfoProcuredMapper.insert(detailInfo);
             }
         }
-        // 修改专用发票信息列表
-        // 删除原有数据
-        LambdaQueryWrapper<CwReimbursementAmountInfo> amountWrapper = new LambdaQueryWrapper<>();
-        amountWrapper.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
-        amountInfoMapper.delete(amountWrapper);
-        if(StringUtils.isNotBlank(dto.getReimbursementType())){
-            if("0".equals(dto.getReimbursementType())){
-                // 保存专用发票列表信息
-                if (CollectionUtils.isNotEmpty(dto.getAmountInfos())) {
-                    for (CwReimbursementAmountInfo amountInfo : dto.getAmountInfos()) {
-                        //普通报销 发票信息
-                        amountInfo.setReimbursementType("0");
-                        // 生成id
-                        String amountId = UUID.randomUUID().toString().replace("-", "");
-                        amountInfo.setId(amountId);
-                        amountInfo.setCreateById(userDTO.getId());
-                        amountInfo.setCreateTime(new Date());
-                        amountInfo.setUpdateById(userDTO.getId());
-                        amountInfo.setUpdateTime(new Date());
-                        amountInfo.setDelFlag(0);
-                        // 保存基础表信息主键值
-                        amountInfo.setInfoId(dto.getId());
-                        amountInfoMapper.insert(amountInfo);
-                    }
-                }
-                //清除电子发票信息
-                // 删除合同列表
-                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
-                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
-                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "0");
-                amountInfoMapper.delete(deleteInfo);
-            }else if("1".equals(dto.getReimbursementType())){
-                // 保存电子发票列表信息
-                if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
-                    for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
-                        //电子发票报销 发票信息
-                        amountInfo.setReimbursementType("1");
-                        // 生成id
-                        String amountId = UUID.randomUUID().toString().replace("-", "");
-                        amountInfo.setId(amountId);
-                        amountInfo.setCreateById(userDTO.getId());
-                        amountInfo.setCreateTime(new Date());
-                        amountInfo.setUpdateById(userDTO.getId());
-                        amountInfo.setUpdateTime(new Date());
-                        amountInfo.setDelFlag(0);
-                        // 保存基础表信息主键值
-                        amountInfo.setInfoId(dto.getId());
-                        amountInfoMapper.insert(amountInfo);
-                    }
-                }
-                //清除专用发票信息
-                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
-                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
-                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "1");
-                amountInfoMapper.delete(deleteInfo);
-
-                // 保存电子发票附件列表信息
-                if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursementFiles())) {
-                    infoService.updateFiles(dto.getInvoiceReimbursementFiles(), userDTO, dto.getId(),"invoiceReimbursement");
-                }
+
+        // 保存专用发票列表信息
+        if (CollectionUtils.isNotEmpty(dto.getAmountInfos())) {
+            for (CwReimbursementAmountInfo amountInfo : dto.getAmountInfos()) {
+                //普通报销 发票信息
+                amountInfo.setReimbursementType("0");
+                // 生成id
+                String amountId = UUID.randomUUID().toString().replace("-", "");
+                amountInfo.setId(amountId);
+                amountInfo.setCreateById(userDTO.getId());
+                amountInfo.setCreateTime(new Date());
+                amountInfo.setUpdateById(userDTO.getId());
+                amountInfo.setUpdateTime(new Date());
+                amountInfo.setDelFlag(0);
+                // 保存基础表信息主键值
+                amountInfo.setInfoId(dto.getId());
+                amountInfoMapper.insert(amountInfo);
             }
         }
-
+//        if(StringUtils.isNotBlank(dto.getReimbursementType())){
+//            if("0".equals(dto.getReimbursementType())){
+//
+//                //清除电子发票信息
+//                // 删除合同列表
+//                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
+//                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
+//                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "0");
+//                amountInfoMapper.delete(deleteInfo);
+//            }else if("1".equals(dto.getReimbursementType())){
+//                // 保存电子发票列表信息
+//                if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursements())) {
+//                    for (CwReimbursementAmountInfo amountInfo : dto.getInvoiceReimbursements()) {
+//                        //电子发票报销 发票信息
+//                        amountInfo.setReimbursementType("1");
+//                        // 生成id
+//                        String amountId = UUID.randomUUID().toString().replace("-", "");
+//                        amountInfo.setId(amountId);
+//                        amountInfo.setCreateById(userDTO.getId());
+//                        amountInfo.setCreateTime(new Date());
+//                        amountInfo.setUpdateById(userDTO.getId());
+//                        amountInfo.setUpdateTime(new Date());
+//                        amountInfo.setDelFlag(0);
+//                        // 保存基础表信息主键值
+//                        amountInfo.setInfoId(dto.getId());
+//                        amountInfoMapper.insert(amountInfo);
+//                    }
+//                }
+//                //清除专用发票信息
+//                LambdaQueryWrapper<CwReimbursementAmountInfo> deleteInfo = new LambdaQueryWrapper<>();
+//                deleteInfo.eq(CwReimbursementAmountInfo::getInfoId, dto.getId());
+//                deleteInfo.ne(CwReimbursementAmountInfo::getReimbursementType, "1");
+//                amountInfoMapper.delete(deleteInfo);
+//
+//
+//            }
+//        }
+        // 保存电子发票附件列表信息
+        if (CollectionUtils.isNotEmpty(dto.getInvoiceReimbursementFiles())) {
+            infoService.updateFiles(dto.getInvoiceReimbursementFiles(), userDTO, dto.getId(),"invoiceReimbursement");
+        }
         /*if (CollectionUtils.isNotEmpty(dto.getAmountInfos())) {
             for (CwReimbursementAmountInfo amountInfo : dto.getAmountInfos()) {
                 // 生成id