解决上传凭证多个时，导致查出来的结算记录多条的bug

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -144,7 +144,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     public InsPlyIncome getUnauditedOrder(ReceivableQueryVo receivableQueryVo) {
         InsPlyIncome auditedOrder = baseMapper.getAuditedOrder(receivableQueryVo.getOrderNo(), receivableQueryVo.getQueryType(), InsOrderStatusEnum.UNDERWRITED.getCode(), receivableQueryVo.getAgreementType());
         if (receivableQueryVo.getQueryType().equals("3") || receivableQueryVo.getQueryType().equals("4")) {
-            if (Objects.isNull(auditedOrder.getJyPolicyNo()) && auditedOrder.getJyPolicyNo().equals("")) {
+            if (Objects.isNull(auditedOrder.getJyPolicyNo()) && auditedOrder.getJyPolicyNo().isEmpty()) {
                 return null;
             }
         }
@@ -1321,19 +1321,14 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if("30".equals(settlementQueryVo.getStatus())){
             settlementQueryVo.setStatus(null);
         }
-//        if("30".equals(settlementQueryVo.getAccountsReceivable())){
-//            settlementQueryVo.setAccountsReceivable(null);
-//        }
-//        if("accountsReceivable"){
-//
-//        }
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.superviseSettlementExcelDtos(page, settlementQueryVo);
         exportSuperviseSettlementExcelDtos.getRecords().forEach(dto -> {
-            if (dto.getInvoiceParty().equals("1")) {
+            if ("1".equals(dto.getInvoiceParty())) {
                 dto.setInvoiceParty("我方开票");
-            } else if (dto.getInvoiceParty().equals("2")) {
+            } else if ("2".equals(dto.getInvoiceParty())) {
                 dto.setInvoiceParty("保司开票");
             }
+            dto.setInvoiceType(Objects.toString(dto.getInvoiceType(),""));
             switch (dto.getInvoiceType()) {
                 case "1" -> dto.setInvoiceType("手续费");
                 case "2" -> dto.setInvoiceType("跟单费");
@@ -1341,9 +1336,21 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 case "4" -> dto.setInvoiceType("驾意险跟单费");
             }
             dto.setInvoiceTypeName(Constant.invoiceRiskTypeMap.get(Objects.toString(dto.getInvoiceType())));
-            SysUploadFiles file = sysUploadFilesMapper.selectById(dto.getFileId());
-            if (file != null) {
-                dto.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", file.getFileName()));
+            LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile> wrapper = new LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile>();
+            List<InsPlyIncomeInvoiceSettlementFile> insPlyIncomeInvoiceSettlementFiles = insPlyIncomeInvoiceSettlementFileMapper.selectList(wrapper.eq(InsPlyIncomeInvoiceSettlementFile::getSettlementId, dto.getSettlementId()));
+            if(CollUtil.isNotEmpty(insPlyIncomeInvoiceSettlementFiles)){
+                String fileIds = insPlyIncomeInvoiceSettlementFiles.stream().map(InsPlyIncomeInvoiceSettlementFile::getFileId).collect(Collectors.joining(","));
+                dto.setFileId(fileIds);
+                String fileUrls = insPlyIncomeInvoiceSettlementFiles.stream().map(InsPlyIncomeInvoiceSettlementFile::getFileId).map(fileId -> {
+                    SysUploadFiles file = sysUploadFilesMapper.selectById(dto.getFileId());
+                    if (file != null) {
+                        return MinioUtils.getPresignedObjectUrl("jzg", file.getFileName());
+                    }
+                    return null;
+                }).filter(Objects::nonNull).collect(Collectors.joining(","));
+                if(StrUtil.isNotEmpty(fileUrls)){
+                    dto.setFileUrl(fileUrls);
+                }
             }
         });
         return exportSuperviseSettlementExcelDtos;

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -509,11 +509,9 @@
         ipiis.actual_received_amount as actualReceivedAmount,
         ipiis.receive_payment_date as receivePaymentDate,
         ipiis.create_by as createBy,
-        ipiis.create_time as createTime,
-        ipiisf.file_id as fileId
+        ipiis.create_time as createTime
         FROM
         ins_ply_income_invoice_settlement ipiis
-        LEFT JOIN ins_ply_income_invoice_settlement_file ipiisf ON ipiisf.settlement_id = ipiis.id
         LEFT JOIN ins_ply_income_invoice ipii ON ipii.id = ipiis.invoice_id
         LEFT JOIN ins_ply_income_invoice_link ipil ON ipil.invoice_id = ipiis.invoice_id
         LEFT JOIN ins_ply_income ipi ON ipi.id = ipil.income_id