Просмотр исходного кода

私有协议开票的时候,问题调整

lipf 1 месяц назад
Родитель
Сommit
ead1a8b80a

+ 2 - 1
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -12,6 +12,7 @@ import com.jzg.commons.entity.finance.dto.ReceiverSettlementReportDto;
 import com.jzg.commons.entity.finance.po.*;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.organization.service.ReceivableService;
@@ -366,7 +367,7 @@ public class ReceivableController {
 
     @PostMapping("getReceivableCompany")
     @Operation(summary = "获取保险公司")
-    public HttpResult getReceivableCompany(@RequestBody InvoicingVo invoicingVo){
+    public HttpResult<List<EsmInsCompany>> getReceivableCompany(@RequestBody InvoicingVo invoicingVo){
         return HttpResult.ok(receivableService.getReceivableCompany(invoicingVo));
     }
 

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

@@ -1396,7 +1396,16 @@
         eic.`name`
         FROM
         ins_ply_income ipi
-        LEFT JOIN esm_ins_company eic ON ipi.company_id = eic.id AND eic.is_delete = 0
+        left join ins_orders io
+        on
+        ipi.order_no = io.id
+        left join ptl_agreement pa
+        on
+        io.agreement_id = pa.id
+        LEFT JOIN esm_ins_company eic
+        ON
+        pa.partner_company_id = eic.id
+        AND eic.is_delete = 0
         <where>
             ipi.is_delete = 0
             AND ipi.id IN