私有协议应收-开票记录中应收项没有显示车险还是非车险

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncomeInvoice.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 @Data
 @Schema(description = "财务应收开票表")
@@ -26,11 +27,11 @@ public class InsPlyIncomeInvoice extends BaseModel {
     @Schema(description = "虚增金额")
     private BigDecimal overinflatedAmount;
 
+    @Schema(description = "应收项")
+    private String invoickRiskType;
+
     public BigDecimal getOverinflatedAmount(){
-        if(this.overinflatedAmount == null){
-            return BigDecimal.ZERO;
-        }
-        return this.overinflatedAmount;
+        return Objects.requireNonNullElse(this.overinflatedAmount, BigDecimal.ZERO);
     }
 
     @Schema(description = "应收费用")

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.finance.dto.CompanySuperviseSettlementReportDto;
+import com.jzg.commons.entity.finance.dto.ExportSuperviseSettlementExcelDto;
 import com.jzg.commons.entity.finance.po.InsPlyIncome;
 import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceSettlement;
 import com.jzg.commons.entity.finance.vo.*;
@@ -280,7 +281,7 @@ public class ReceivableController {
 
     @PostMapping("superviseSettlementExcel")
     @Operation(summary = "应收手续费结算记录")
-    public HttpResult superviseSettlementExcel(@RequestBody SettlementQueryVo settlementQueryVo) {
+    public HttpResult<Page<ExportSuperviseSettlementExcelDto>> superviseSettlementExcel(@RequestBody SettlementQueryVo settlementQueryVo) {
         Page page = settlementQueryVo.getPage();
         return HttpResult.ok(receivableService.superviseSettlementExcel(page,settlementQueryVo));
     }

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

@@ -495,6 +495,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             invoice.setId(IdGenerate.nextId());
             invoice.setCompanyId(invoicingVo.getCompanyId());
             invoice.setInvoiceType(invoicingVo.getInvoiceType());
+            // 开票类型  1 手续费  2 跟单费  3 驾意险手续费 4 驾意险跟单费
+            if("1".equals(invoicingVo.getInvoiceType()) || "2".equals(invoicingVo.getInvoiceType())){
+                invoice.setInvoickRiskType("10");
+            }else{
+                invoice.setInvoickRiskType("20");
+            }
             invoice.setInvoiceParty(invoicingVo.getInvoiceParty());
             invoice.setOverinflatedAmount(invoicingVo.getOverinflatedAmount());
             invoice.setReceivableSupervisePremium(invoicingVo.getReceivablePremium());