Browse Source

修改bug:
私有应收 跟单结算报表-结算记录,应收项应该是车险和非车险的区分

jiakai 2 months ago
parent
commit
a83c7d4e66

+ 8 - 0
commons/src/main/java/com/jzg/commons/entity/finance/dto/ExportSuperviseSettlementExcelDto.java

@@ -44,6 +44,14 @@ public class ExportSuperviseSettlementExcelDto {
     @ExcelProperty(value = "应收项")
     @ExcelProperty(value = "应收项")
     private String invoiceType;
     private String invoiceType;
 
 
+    @Schema(description = "应收项(10车险20非车险)")
+    @ExcelProperty(value = "应收项(10车险20非车险)")
+    private String invoiceRiskType;
+
+    @Schema(description = "应收项(10车险20非车险)")
+    @ExcelProperty(value = "应收项(10车险20非车险)")
+    private String invoiceRiskTypeName;
+
     // 应收项转义
     // 应收项转义
     @Schema(description = "应收项")
     @Schema(description = "应收项")
     @ExcelProperty(value = "应收项")
     @ExcelProperty(value = "应收项")

+ 1 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -4805,6 +4805,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 case "6" -> dto.setInvoiceType("平台协议非车险应收");
                 case "6" -> dto.setInvoiceType("平台协议非车险应收");
             }
             }
             dto.setInvoiceTypeName(Constant.invoiceRiskTypeMap.get(Objects.toString(dto.getInvoiceType())));
             dto.setInvoiceTypeName(Constant.invoiceRiskTypeMap.get(Objects.toString(dto.getInvoiceType())));
+            dto.setInvoiceRiskTypeName(Constant.invoiceRiskTypeMap.get(Objects.toString(dto.getInvoiceRiskType())));
             LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile> wrapper = new LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile>();
             LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile> wrapper = new LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile>();
             List<InsPlyIncomeInvoiceSettlementFile> insPlyIncomeInvoiceSettlementFiles = insPlyIncomeInvoiceSettlementFileMapper.selectList(wrapper.eq(InsPlyIncomeInvoiceSettlementFile::getSettlementId, dto.getSettlementId()));
             List<InsPlyIncomeInvoiceSettlementFile> insPlyIncomeInvoiceSettlementFiles = insPlyIncomeInvoiceSettlementFileMapper.selectList(wrapper.eq(InsPlyIncomeInvoiceSettlementFile::getSettlementId, dto.getSettlementId()));
             if(CollUtil.isNotEmpty(insPlyIncomeInvoiceSettlementFiles)){
             if(CollUtil.isNotEmpty(insPlyIncomeInvoiceSettlementFiles)){

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

@@ -738,6 +738,7 @@
         GROUP_CONCAT(DISTINCT ipii.company_id SEPARATOR ',') AS company_id,
         GROUP_CONCAT(DISTINCT ipii.company_id SEPARATOR ',') AS company_id,
         GROUP_CONCAT(DISTINCT eic.name SEPARATOR ',') AS company_name,
         GROUP_CONCAT(DISTINCT eic.name SEPARATOR ',') AS company_name,
         GROUP_CONCAT(DISTINCT ipii.invoice_type SEPARATOR ',') AS invoice_type,
         GROUP_CONCAT(DISTINCT ipii.invoice_type SEPARATOR ',') AS invoice_type,
+        GROUP_CONCAT(DISTINCT ipii.invoice_risk_type SEPARATOR ',') AS invoice_risk_type,
         GROUP_CONCAT(DISTINCT ipii.invoice_party SEPARATOR ',') AS invoice_party,
         GROUP_CONCAT(DISTINCT ipii.invoice_party SEPARATOR ',') AS invoice_party,
         GROUP_CONCAT(DISTINCT ipii.tax_point SEPARATOR ',') AS tax_point,
         GROUP_CONCAT(DISTINCT ipii.tax_point SEPARATOR ',') AS tax_point,
         GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS settlement_payment_reason,
         GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS settlement_payment_reason,