数电发票添加排序

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

@@ -99,4 +99,9 @@ public class ReimbursementAmountInfo extends BaseEntity {
      */
     private String fileSize;
 
+
+    /**
+     * 文件大小
+     */
+    private Integer sort;
 }

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

@@ -896,6 +896,12 @@ public class ReimbursementInfoService {
             }
             dto.setFiles(files);
             List<ReimAmountAndFileDto> uniqueFilesList = new ArrayList<>(invoiceReimbursementFiles);
+            uniqueFilesList.sort(
+                    Comparator.comparing(
+                            ReimAmountAndFileDto::getSort,
+                            Comparator.nullsLast(Integer::compareTo) // null 放到最后
+                    )
+            );
             dto.setInvoiceReimbursementFiles(uniqueFilesList);
         }
         return dto;

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

@@ -98,5 +98,9 @@ public class CcpmReimbursementAmountInfo extends BaseEntity {
      * 文件大小
      */
     private String fileSize;
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 }

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

@@ -854,6 +854,12 @@ public class CcpmReimbursementInfoService {
             dto.setFiles(files);
             // 将 Set 转换回 List
             List<CcpmReimAmountAndFileDto> uniqueFilesList = new ArrayList<>(invoiceReimbursementFiles);
+            uniqueFilesList.sort(
+                    Comparator.comparing(
+                            CcpmReimAmountAndFileDto::getSort,
+                            Comparator.nullsLast(Integer::compareTo) // null 放到最后
+                    )
+            );
             dto.setInvoiceReimbursementFiles(uniqueFilesList);
         }
         return dto;

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

@@ -99,5 +99,9 @@ public class ZsReimbursementAmountInfo extends BaseEntity {
      * 文件大小
      */
     private String fileSize;
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 }

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

@@ -661,6 +661,7 @@ public class ZsReimbursementInfoService {
                             // 保存基础表信息主键值
                             reimbursementAmountInfo.setInfoId(dto.getId());
                             reimbursementAmountInfo.setFileUrl(amountInfo.getUrl());
+
                             //文件类型处理
                             List<String> strings = Arrays.asList(amountInfo.getName().split("\\."));
                             if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(strings)) {
@@ -881,33 +882,10 @@ public class ZsReimbursementInfoService {
                 for (WorkAttachmentInfo i : fileList) {
                     if ("invoiceReimbursement".equals(i.getAttachmentFlag())) {
                         ZsReimbursementAmountInfo invoiceReimbursement = reimbursementMap.get(i.getUrl());
-
                         if (invoiceReimbursement != null) {
                             // 处理有 URL 匹配的文件
                             processMatchingFiles(i, invoiceReimbursement, invoiceReimbursementFiles);
                         }
-//                        else {
-//                            if (map !=null){
-//                                for (Map.Entry<String, String> entry : map.entrySet()) {
-//                                    for (ZsReimbursementAmountInfo reimbursement : invoiceReimbursements) {
-//                                        String key = entry.getKey();
-//                                        String value = entry.getValue();
-//                                        if (reimbursement.getNumber().equals(key) && i.getUrl().equals(value)){
-//                                            ZsReimAmountAndFileDto ccpmReimAmountAndFileDto = new ZsReimAmountAndFileDto();
-//                                            BeanUtils.copyProperties(i, ccpmReimAmountAndFileDto);
-//                                            BeanUtils.copyProperties(reimbursement, ccpmReimAmountAndFileDto);
-//                                            String[] split = reimbursement.getInvoiceDate().split(" ");
-//                                            ccpmReimAmountAndFileDto.setInvoiceDate(split[0]);
-//                                            ccpmReimAmountAndFileDto.setId(i.getId());
-//                                            ccpmReimAmountAndFileDto.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
-//                                            invoiceReimbursementFiles.add(ccpmReimAmountAndFileDto);
-//                                        }
-//                                    }
-//
-//                                }
-//
-//                            }
-//                        }
                     } else {
                         // 处理其他文件
                         processNonInvoiceFiles(i, files);
@@ -916,6 +894,13 @@ public class ZsReimbursementInfoService {
             }
             dto.setFiles(files);
             List<ZsReimAmountAndFileDto> uniqueFilesList = new ArrayList<>(invoiceReimbursementFiles);
+            // 按 sort 升序排序
+            uniqueFilesList.sort(
+                    Comparator.comparing(
+                            ZsReimAmountAndFileDto::getSort,
+                            Comparator.nullsLast(Integer::compareTo) // null 放到最后
+                    )
+            );
             dto.setInvoiceReimbursementFiles(uniqueFilesList);
         }
         return dto;

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

@@ -99,5 +99,9 @@ public class ConsultancyReimbursementAmountInfo extends BaseEntity {
      * 文件大小
      */
     private String fileSize;
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 }

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

@@ -856,6 +856,12 @@ public class ConsultancyReimbursementInfoService {
             }
             dto.setFiles(files);
             List<ConsultancyReimAmountAndFileDto> uniqueFilesList = new ArrayList<>(invoiceReimbursementFiles);
+            uniqueFilesList.sort(
+                    Comparator.comparing(
+                            ConsultancyReimAmountAndFileDto::getSort,
+                            Comparator.nullsLast(Integer::compareTo) // null 放到最后
+                    )
+            );
             dto.setInvoiceReimbursementFiles(uniqueFilesList);
         }
         return dto;

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

@@ -98,4 +98,9 @@ public class CwReimbursementAmountInfo extends BaseEntity {
      * 文件大小
      */
     private String fileSize;
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }

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

@@ -1146,6 +1146,12 @@ public class CwReimbursementInfoService {
             }
             dto.setFiles(files);
             List<CwReimAmountAndFileDto> uniqueFilesList = new ArrayList<>(invoiceReimbursementFiles);
+            uniqueFilesList.sort(
+                    Comparator.comparing(
+                            CwReimAmountAndFileDto::getSort,
+                            Comparator.nullsLast(Integer::compareTo) // null 放到最后
+                    )
+            );
             dto.setInvoiceReimbursementFiles(uniqueFilesList);
         }
         return dto;