Explorar el Código

修改bug:
bug表909,私有应收-结算报表 点了那三个明细跳转到的界面显示的公司不对,导致明细都出不来

jiakai hace 1 mes
padre
commit
11b34fec31

+ 6 - 30
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -5496,21 +5496,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     public void exportSuperviseSettlementDetailExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
         settlementQueryVo.setSystemCode(baseController.getSystemCode());
-        Page<ExportSuperviseSettlementDetailExcelDto> exportSuperviseSettlementDetailExcelDtos = baseMapper.getSuperviseSettlementDetailExcelDtos(page, settlementQueryVo);
-        exportSuperviseSettlementDetailExcelDtos.getRecords().forEach(dto -> {
-            if (dto.getInvoiceParty().equals("1")) {
-                dto.setInvoiceParty("我方开票");
-            } else if (dto.getInvoiceParty().equals("2")) {
-                dto.setInvoiceParty("保司开票");
-            }
-            if (dto.getStatus().equals("1")) {
-                dto.setStatus("已结算");
-            } else if (dto.getStatus().equals("0")) {
-                dto.setStatus("未结算");
-            }
-        });
-        List<ExportSuperviseSettlementDetailExcelDto> list = exportSuperviseSettlementDetailExcelDtos.getRecords();
-        EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ExportSuperviseSettlementDetailExcelDto.class, list, "车险手续费结算明细");
+        Page<ExportSuperviseSettlementDetailExcelDto> exportSuperviseSettlementDetailExcelDtoPage = this.superviseSettlementDetailExcel(page, settlementQueryVo);
+        List<ExportSuperviseSettlementDetailExcelDto> records = exportSuperviseSettlementDetailExcelDtoPage.getRecords();
+        EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ExportSuperviseSettlementDetailExcelDto.class, records, "车险手续费结算明细");
     }
 
     /**
@@ -5523,21 +5511,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     public void exportSuperviseSettlementDetailJyExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
         settlementQueryVo.setSystemCode(baseController.getSystemCode());
-        Page<ExportSuperviseSettlementDetailJyExcelDto> exportSuperviseSettlementDetailJyExcelDtos = baseMapper.getSuperviseSettlementDetailJyExcelDtos(page, settlementQueryVo);
-        exportSuperviseSettlementDetailJyExcelDtos.getRecords().forEach(dto -> {
-            if (dto.getInvoiceParty().equals("1")) {
-                dto.setInvoiceParty("我方开票");
-            } else if (dto.getInvoiceParty().equals("2")) {
-                dto.setInvoiceParty("保司开票");
-            }
-            if (dto.getStatus().equals("1")) {
-                dto.setStatus("已结算");
-            } else if (dto.getStatus().equals("0")) {
-                dto.setStatus("未结算");
-            }
-        });
-        List<ExportSuperviseSettlementDetailJyExcelDto> list = exportSuperviseSettlementDetailJyExcelDtos.getRecords();
-        EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ExportSuperviseSettlementDetailJyExcelDto.class, list, "车险手续费结算明细(非车)");
+        Page<ExportSuperviseSettlementDetailExcelDto> exportSuperviseSettlementDetailExcelDtoPage = this.superviseSettlementDetailExcel(page, settlementQueryVo);
+        List<ExportSuperviseSettlementDetailExcelDto> records = exportSuperviseSettlementDetailExcelDtoPage.getRecords();
+        EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ExportSuperviseSettlementDetailExcelDto.class, records, "车险手续费结算明细(非车)");
     }
 
     /**

+ 2 - 2
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -635,7 +635,7 @@
                 </foreach>
             </if>
             <if test="settlementQueryVo.companyId != null and settlementQueryVo.companyId != ''">
-                AND io.company_id = #{settlementQueryVo.companyId}
+                AND ipi.partner_company_id = #{settlementQueryVo.companyId}
             </if>
             <if test="settlementQueryVo.invoiceParty != null and settlementQueryVo.invoiceParty != ''">
                 AND ipii.invoice_party = #{settlementQueryVo.invoiceParty}
@@ -950,7 +950,7 @@
                 AND ipii.id = #{settlementQueryVo.invoiceId}
             </if>
             <if test="settlementQueryVo.companyId != null and settlementQueryVo.companyId != ''">
-                AND ipi.company_id = #{settlementQueryVo.companyId}
+                AND ipi.partner_company_id = #{settlementQueryVo.companyId}
             </if>
             <if test="settlementQueryVo.invoiceParty != null and settlementQueryVo.invoiceParty != ''">
                 AND ipii.invoice_party = #{settlementQueryVo.invoiceParty}