Răsfoiți Sursa

租户平台系统-数据根据租户进行隔离

wangrq 3 luni în urmă
părinte
comite
9f6153d7c7
29 a modificat fișierele cu 229 adăugiri și 10 ștergeri
  1. 5 0
      commons/src/main/java/com/jzg/commons/entity/account/dto/AccountAddParam.java
  2. 6 0
      commons/src/main/java/com/jzg/commons/entity/account/dto/AccountCardAddParam.java
  3. 6 0
      commons/src/main/java/com/jzg/commons/entity/account/dto/AccountCardEditParam.java
  4. 4 0
      commons/src/main/java/com/jzg/commons/entity/account/dto/AccountCardParam.java
  5. 6 0
      commons/src/main/java/com/jzg/commons/entity/account/dto/AccountEditParam.java
  6. 4 0
      commons/src/main/java/com/jzg/commons/entity/account/dto/AccountParam.java
  7. 4 1
      commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoiceRecordQueryVo.java
  8. 2 0
      commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java
  9. 3 0
      commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementQueryVo.java
  10. 3 0
      commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementReportQueryVo.java
  11. 3 0
      commons/src/main/java/com/jzg/commons/entity/po/PtlNewCarJudgeRules.java
  12. 3 0
      commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersAdd.java
  13. 2 0
      commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersEnd.java
  14. 3 0
      commons/src/main/java/com/jzg/commons/entity/vo/InsFeeOrdersVo.java
  15. 4 0
      commons/src/main/java/com/jzg/commons/entity/vo/NewCarQuery.java
  16. 2 0
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java
  17. 5 4
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java
  18. 89 0
      tenant/insurance/quotation-summary/src/main/resources/application-dev.yaml
  19. 3 0
      tenant/organization/src/main/java/com/jzg/organization/controller/AccountCardController.java
  20. 4 0
      tenant/organization/src/main/java/com/jzg/organization/controller/AccountController.java
  21. 8 0
      tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java
  22. 2 1
      tenant/organization/src/main/java/com/jzg/organization/mapper/NewCarJudgeRulesMapper.java
  23. 17 1
      tenant/organization/src/main/java/com/jzg/organization/service/impl/NewCarJudgeRulesServiceImpl.java
  24. 22 0
      tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java
  25. 0 3
      tenant/organization/src/main/resources/application.yml
  26. 1 0
      tenant/organization/src/main/resources/mapper/InvAccountCardMapper.xml
  27. 2 0
      tenant/organization/src/main/resources/mapper/InvAccountMapper.xml
  28. 1 0
      tenant/organization/src/main/resources/mapper/NewCarJudgeRulesMapper.xml
  29. 15 0
      tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

+ 5 - 0
commons/src/main/java/com/jzg/commons/entity/account/dto/AccountAddParam.java

@@ -65,4 +65,9 @@ public class AccountAddParam {
     private String invoicingAmount;
 
 
+    /**
+     * 租户代码
+     * */
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/account/dto/AccountCardAddParam.java

@@ -163,4 +163,10 @@ public class AccountCardAddParam {
      */
     @Schema(description = "对公单日限额剩余")
     private String pubDayLinesExcess;
+
+    /**
+     * 租户代码
+     */
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/account/dto/AccountCardEditParam.java

@@ -165,4 +165,10 @@ public class AccountCardEditParam {
      */
     @Schema(description = "对公单日限额剩余")
     private String pubDayLinesExcess;
+
+    /**
+     * 租户代码
+     */
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 4 - 0
commons/src/main/java/com/jzg/commons/entity/account/dto/AccountCardParam.java

@@ -24,4 +24,8 @@ public class AccountCardParam extends PageRequest {
     @Schema(description = "银行卡号")
     private String bankCardNum;
 
+    /** 租户代码 */
+    @Schema(description = "租户代码")
+    private String systemCode;
+
 }

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/account/dto/AccountEditParam.java

@@ -67,4 +67,10 @@ public class AccountEditParam {
      */
     @Schema(description = "开票额度")
     private String invoicingAmount;
+
+    /**
+     * 租户代码
+     * */
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 4 - 0
commons/src/main/java/com/jzg/commons/entity/account/dto/AccountParam.java

@@ -17,4 +17,8 @@ public class AccountParam  extends PageRequest {
      */
     @Schema(description = "企业类型(0内部企业 1外部企业)")
     private Integer outerFlag;
+
+    /** 租户代码 */
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 4 - 1
commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoiceRecordQueryVo.java

@@ -54,5 +54,8 @@ public class InvoiceRecordQueryVo extends PageRequest {
      */
     private String companyNameSimple;
 
-
+    /**
+     * 租户代码
+     */
+    private String systemCode;
 }

+ 2 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java

@@ -113,5 +113,7 @@ public class ReceivableQueryVo extends PageRequest {
     @Schema(description = "业务员类型 团队/渠道/电销/个代 5:团队 6:个代 7:渠道 8 :电销")
     private String typeAttr;
 
+    @Schema(description = "租户代码")
+    private String systemCode;
 
 }

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementQueryVo.java

@@ -70,4 +70,7 @@ public class SettlementQueryVo extends PageRequest {
 
     @Schema(description = "协议类型 1-平台协议 2-私有协议")
     private String agreementType;
+
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementReportQueryVo.java

@@ -51,4 +51,7 @@ public class SettlementReportQueryVo extends PageRequest {
 
     @Schema(description = "开票状态 0-未开票 1-已开票")
     private String invoiceStatus;
+
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/po/PtlNewCarJudgeRules.java

@@ -24,6 +24,9 @@ public class PtlNewCarJudgeRules{
 
     private String companyId;
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
     @TableField(exist = false)
     private String companyName;
 

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersAdd.java

@@ -37,4 +37,7 @@ public class InsOrdersAdd extends QuoteVo {
     @Schema(description = "保单信息")
     private InsOrdersExternalPolicy insOrdersExternalPolicy;
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
 }

+ 2 - 0
commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersEnd.java

@@ -35,4 +35,6 @@ public class InsOrdersEnd extends QuoteVo {
     @Schema(description = "保单信息")
     private InsOrdersExternalPolicy insOrdersExternalPolicy;
 
+    @Schema(description = "租户代码")
+    private String systemCode;
 }

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/vo/InsFeeOrdersVo.java

@@ -161,6 +161,9 @@ public class InsFeeOrdersVo {
     @Schema(description = "权益相关:剩余金额<可用金额-已使用金额>")
     private BigDecimal remainingAmount;
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
     public InsFeeOrdersVo(InsFeeOrders insFeeOrders) {
         this.orderNo = insFeeOrders.getOrderNo();
         this.agreementId = insFeeOrders.getAgreementId();

+ 4 - 0
commons/src/main/java/com/jzg/commons/entity/vo/NewCarQuery.java

@@ -13,4 +13,8 @@ public class NewCarQuery extends PageRequest {
     @Schema
     private String companyId;
 
+    /**
+     * 租户编码
+     */
+    private String systemCode;
 }

+ 2 - 0
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -69,6 +69,7 @@ public class InsOrdersController extends BaseController {
     @Operation(summary = "录入订单新增")
     @PostMapping("saveOrders")
     public HttpResult saveOrUpdate(@RequestBody InsOrdersAdd ordersAdd) {
+        ordersAdd.setSystemCode(getSystemCode());
         return insOrdersService.saveOrders(ordersAdd);
     }
 
@@ -76,6 +77,7 @@ public class InsOrdersController extends BaseController {
     @Operation(summary = "录入订单修改")
     @PostMapping("updateOrders")
     public HttpResult updateOrders(@RequestBody InsOrdersEnd ordersEnd) {
+        ordersEnd.setSystemCode(getSystemCode());
         return insOrdersService.updateOrders(ordersEnd);
     }
 

+ 5 - 4
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -183,7 +183,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrders.setProductName(ProductsType.getProductNameByCode(ordersAdd.getProductId()));
             insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode());
             insOrders.setEntryStatus(3);
-
+            insOrders.setSystemCode(ordersAdd.getSystemCode());
             // 插入订单信息,如果插入失败,则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {
@@ -231,7 +231,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersPolicyService.save(policy);
 
             //  保存订单费用
-            updateOrSaveFeeOrder(ordersAdd.getFeeOrdersVo(), quoteNo);
+            updateOrSaveFeeOrder(ordersAdd.getFeeOrdersVo(), quoteNo, ordersAdd.getSystemCode());
 
             // 保险种类信息
             List<KindInfoVo> kindInfoVo = ordersAdd.getKindInfoVo();
@@ -294,12 +294,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
     //  更新订单费用信息
-    public void updateOrSaveFeeOrder(InsFeeOrdersVo feeOrdersVo, String quoteNo) {
+    public void updateOrSaveFeeOrder(InsFeeOrdersVo feeOrdersVo, String quoteNo, String systemCode) {
         if (StringUtils.isEmpty(feeOrdersVo.getAgreementId())) {
             feeOrdersVo.setAgreementId(null);
         }
         InsFeeOrders feeOrders = BeanUtil.copyProperties(feeOrdersVo, InsFeeOrders.class);
         feeOrders.setOrderNo(quoteNo);
+        feeOrders.setSystemCode(systemCode);
         insFeeOrdersMapper.insertOrUpdate(feeOrders);
     }
 
@@ -349,7 +350,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
             //更新订单费用
-            updateOrSaveFeeOrder(ordersEnd.getFeeOrdersVo(), quoteNo);
+            updateOrSaveFeeOrder(ordersEnd.getFeeOrdersVo(), quoteNo, ordersEnd.getSystemCode());
 
             // 税费信息
             VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTaxVo();

+ 89 - 0
tenant/insurance/quotation-summary/src/main/resources/application-dev.yaml

@@ -27,6 +27,95 @@ spring:
       password: 123456  # 如果没有密码,可删除此行
       database: 0
 
+#多租户配置
+tenant:
+  enable: true
+  column: system_code
+  filterTables:
+  ignoreTables:
+    - sys_system
+    - sys_role_perms
+    - sys_area
+    - sys_dict
+    - sys_dict_type
+    - sys_user
+    - sys_user_jzg_info
+    - sys_user_jzg_info_bank_card
+    - sys_user_role
+    - sys_user_jzg_info_file
+    - sys_organization_user_link
+    - sys_upload_files
+    - sys_config
+    - sys_activity
+    - sys_activity_award
+    - sys_activity_dept
+    - sys_activity_record
+    - sys_poster_org
+    - sys_message_template
+    - sys_message_user
+    - sys_notice_user
+    - ptl_scheme_info
+    - ptl_scheme_insurance
+    - ptl_scheme_insurance_driving_intention
+    - ins_business_insurance_option
+    - ins_business_insurance
+    - ptl_agreement_attribution
+    - ptl_agreement_dept
+    - ptl_agreement_undwrt_rules_attr
+    - ptl_agreement_undwrt_rules_dict_labal
+    - ptl_area_license
+    - ptl_agreement_undwrt_rules
+    - ptl_agreement_undwrt_rules_attr_link
+    - ptl_scheme_rules_attr_link
+    - esm_ins_company
+    - qr_barcode_config
+    - jyx_config
+    - jyx_setting
+    - sys_user_jzg_app
+    - sys_dept
+    - sys_user_jzg_info_salesman
+    - dept_tree
+    - dept_path
+    - ptl_agreement_cost_type
+    #- ins_orders
+    - ins_fee_orders
+    - ins_orders_costs
+    - ins_orders_car_info
+    - ins_orders_policy
+    - ins_orders_pdf_url
+    - ins_orders_accidental_driving
+    - ins_orders_clause
+    - ins_orders_tax
+    - ins_task_images
+    - ins_orders_qrcode
+    - ins_order_rights
+    - ins_order_rights_package
+    - ins_orders_kind
+    - sys_relation_person
+    - ins_ply_income_invoice_link
+    - ins_orders_risk
+    - ins_orders_car_user_info
+    - ins_order_adjust
+    - ins_ply_income_invoice
+    - ins_ply_income_invoice_settlement
+    - esm_user_referrer
+    - ins_ply_income_invoice_settlement_file
+    - wechat_customer_service
+    - wechat_customer_service_duty
+    - wechat_customer_service_recording
+    - ins_fee_audit
+    - sys_user_jzg_info_bank_card_record
+    - ptl_agreement_dispatch_rules_attr_link
+    - ptl_agreement_dispatch_action
+    - sys_app_manage
+    - sys_version
+    - ptl_agreement_dispatch_rules_attr_link
+    - ptl_agreement_dispatch_action
+    - ptl_new_car_judge_rules
+    - ptl_new_car_judge_rules
+    - ins_orders_external_policy
+    - t
+
 
 #百度图片识别API
 baidu:

+ 3 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/AccountCardController.java

@@ -38,6 +38,7 @@ public class AccountCardController extends BaseController {
     @PostMapping("/cardList")
     @Operation(summary = "账户列表分页")
     public HttpResult<Page<AccountCardVo>> cardList(@RequestBody AccountCardParam param){
+        param.setSystemCode(getSystemCode());
         Page<AccountCardVo> result = accountCardService.queryPage(param);
         return HttpResult.ok(result);
     }
@@ -69,6 +70,7 @@ public class AccountCardController extends BaseController {
         if(endDate.isBefore(startDate) || startDate.isEqual(endDate)){
             AssertionUtils.isFail(false,"生效时间不能大于失效时间!");
         }
+        param.setSystemCode(getSystemCode());
         accountCardService.cardAdd(param);
         return HttpResult.ok("新增成功");
     }
@@ -89,6 +91,7 @@ public class AccountCardController extends BaseController {
         if(endDate.isBefore(startDate) || startDate.isEqual(endDate)){
             AssertionUtils.isFail(false,"生效时间不能大于失效时间!");
         }
+        param.setSystemCode(getSystemCode());
         accountCardService.cardEdit(param);
         return HttpResult.ok("修改成功");
     }

+ 4 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/AccountController.java

@@ -29,6 +29,7 @@ public class AccountController extends BaseController {
     @PostMapping("/accountPage")
     @Operation(summary = "企业管理列表分页")
     public HttpResult<Page<AccountVo>> accountPage(@RequestBody AccountParam param){
+        param.setSystemCode(getSystemCode());
         Page<AccountVo> result = accountService.queryPage(param);
         return HttpResult.ok(result);
     }
@@ -40,6 +41,7 @@ public class AccountController extends BaseController {
     @PostMapping("/accountList")
     @Operation(summary = "企业管理列表")
     public HttpResult accountList(@RequestBody AccountParam param){
+        param.setSystemCode(getSystemCode());
         List<AccountVo> result = accountService.queryList(param);
         return HttpResult.ok(result);
     }
@@ -65,6 +67,7 @@ public class AccountController extends BaseController {
     @Operation(summary = "来往企业添加")
     @PostMapping("/accountAdd")
     public HttpResult<String> accountAdd(@Validated @RequestBody AccountAddParam param) {
+        param.setSystemCode(getSystemCode());
         accountService.cardAdd(param);
         return HttpResult.ok("新增成功");
     }
@@ -77,6 +80,7 @@ public class AccountController extends BaseController {
     @Operation(summary = "来往企业修改")
     @PostMapping("/accountEdit")
     public HttpResult accountEdit(@Validated @RequestBody AccountEditParam param) {
+        param.setSystemCode(getSystemCode());
         accountService.accountEdit(param);
         return HttpResult.ok("修改成功");
     }

+ 8 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -91,6 +91,7 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
             receivableQueryVo.setAgreementType("2");
         }
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
         Page<InsPlyIncome> data = ok.getData();
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
@@ -107,6 +108,7 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
             receivableQueryVo.setAgreementType("2");
         }
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
         Page<InsPlyIncome> data = ok.getData();
         if (null == data || CollUtil.isEmpty(data.getRecords())){
@@ -167,6 +169,7 @@ public class ReceivableController {
             receivableQueryVo.setAgreementType("2");
         }
         //return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
         Page<InsPlyIncome> data = ok.getData();
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
@@ -182,6 +185,7 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())) {
             receivableQueryVo.setAgreementType("2");
         }
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
         Page<InsPlyIncome> data = ok.getData();
         if (null == data || CollUtil.isEmpty(data.getRecords())){
@@ -197,6 +201,7 @@ public class ReceivableController {
     public HttpResult<InsPlyIncomeVO> getJyCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("3");
         receivableQueryVo.setAgreementType("2");
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
         Page<InsPlyIncome> data = ok.getData();
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
@@ -208,6 +213,7 @@ public class ReceivableController {
     public HttpResult<InsPlyIncomeVO> getJyOtherReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         receivableQueryVo.setQueryType("2");
         receivableQueryVo.setAgreementType("2");
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         HttpResult<Page<InsPlyIncome>> ok = HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
         Page<InsPlyIncome> data = ok.getData();
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
@@ -432,6 +438,7 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
             receivableQueryVo.setAgreementType("1");
         }
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         Page<InsPlyIncome> data = receivableService.getPlatFormReceivableList(receivableQueryVo);
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
         //满足条件的的总的应收
@@ -458,6 +465,7 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
             receivableQueryVo.setAgreementType("1");
         }
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         Page<InsPlyIncome> data = receivableService.getPlatFormReceivableList(receivableQueryVo);
         if (null == data || CollUtil.isEmpty(data.getRecords())){
             return HttpResult.ok(BigDecimal.ZERO);

+ 2 - 1
tenant/organization/src/main/java/com/jzg/organization/mapper/NewCarJudgeRulesMapper.java

@@ -6,8 +6,9 @@ import com.jzg.commons.entity.po.PtlAgreementCostRule;
 import com.jzg.commons.entity.po.PtlNewCarJudgeRules;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface NewCarJudgeRulesMapper extends BaseMapper<PtlNewCarJudgeRules> {
-    public Page<PtlNewCarJudgeRules> getNewCarList(Page page);
+    public Page<PtlNewCarJudgeRules> getNewCarList(Page page,  @Param("systemCode") String systemCode);
 }

+ 17 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/NewCarJudgeRulesServiceImpl.java

@@ -23,12 +23,16 @@ import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
 import com.thoughtworks.xstream.mapper.LambdaMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -40,8 +44,12 @@ import static java.util.Objects.nonNull;
 
 
 @Service
+@RequiredArgsConstructor
 public class NewCarJudgeRulesServiceImpl extends ServiceImpl<NewCarJudgeRulesMapper, PtlNewCarJudgeRules>
     implements NewCarJudgeRulesService {
+
+    private final BaseController baseController;
+
     /**
      * 根据保险公司查询新旧车规则
      * @param companyId
@@ -107,7 +115,15 @@ public class NewCarJudgeRulesServiceImpl extends ServiceImpl<NewCarJudgeRulesMap
 //                        .eq(nonNull(newCarQuery.getCompanyId()),
 //                                PtlNewCarJudgeRules::getCompanyId,
 //                                newCarQuery.getCompanyId()));
-        Page<PtlNewCarJudgeRules> newCarList = baseMapper.getNewCarList(newCarQuery.getPage());
+        String systemCode = "";
+        //如果是APP登录的话 则传递SystemCode的头部字段
+        if (baseController.getUserSystemCode().equals("APP")) {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            systemCode = request.getHeader("system_code");
+        } else {
+            systemCode = baseController.getUserSystemCode();
+        }
+        Page<PtlNewCarJudgeRules> newCarList = baseMapper.getNewCarList(newCarQuery.getPage(), systemCode);
         return newCarList;
     }
 

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

@@ -589,6 +589,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public List<InsPlyIncome> getReceivableList(ReceivableQueryVo receivableQueryVo) {
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         // modify by lipf, 和查询调用同一个查询mapper,并且将分页参数进行调整 2026年6月9日10:03:13
         receivableQueryVo.setPages(1);
         receivableQueryVo.setSize(Integer.MAX_VALUE);
@@ -2576,6 +2577,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if("30".equals(invoiceRecordQueryVo.getSettlementStatus())){
             invoiceRecordQueryVo.setSettlementStatus(null);
         }
+        invoiceRecordQueryVo.setSystemCode(baseController.getSystemCode());
         Page<InvoiceRecordResult> invoiceRecordList = baseMapper.getInvoiceRecordList(invoiceRecordQueryVo.getPage(), invoiceRecordQueryVo);
         List<InvoiceRecordResult> records = invoiceRecordList.getRecords();
         if(CollUtil.isNotEmpty(records)){
@@ -2669,6 +2671,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportSuperviseJyExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
         verifyUploadPath();
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         List<ExportSuperviseJyExcelDto> exportSuperviseJyExcelDtos = baseMapper.getSuperviseJyExcelDtos(receivableQueryVo);
         exportSuperviseJyExcelDtos.forEach(dto -> {
             switch (dto.getEntryStatus()) {
@@ -2691,6 +2694,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         log.info("查询结算手续费结算记录:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
         // 设置空条件
         setNoneCondition(settlementQueryVo);
+        // 设置租户
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.superviseSettlementExcelDtos(page, settlementQueryVo);
         // 补充、转换列表的数据
         supplementaryListData(exportSuperviseSettlementExcelDtos);
@@ -2708,6 +2713,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         log.info("查询平台结算记录:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
         // 设置空条件
         setNoneCondition(settlementQueryVo);
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.platformSettlementExcelDtos(page, settlementQueryVo);
         // 补充、转换列表的数据
         supplementaryListData(exportSuperviseSettlementExcelDtos);
@@ -2725,6 +2731,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         log.info("查询平台结算记录:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
         // 设置空条件
         setNoneCondition(settlementQueryVo);
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.followSettlementExcelDtos(page, settlementQueryVo);
         // 补充、转换列表的数据
         supplementaryListData(exportSuperviseSettlementExcelDtos);
@@ -2796,6 +2803,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportSuperviseSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.superviseSettlementExcelDtos(page, settlementQueryVo);
         // 补充、转换列表的数据
         supplementaryListData(exportSuperviseSettlementExcelDtos);
@@ -2812,6 +2820,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportPlatformSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.platformSettlementExcelDtos(page, settlementQueryVo);
         // 补充、转换列表的数据
         supplementaryListData(exportSuperviseSettlementExcelDtos);
@@ -2843,6 +2852,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      */
     @Override
     public String exportPlatFormReceivable(ReceivableQueryVo receivableQueryVo) {
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         List<InsPlyIncome> receivableList = baseMapper.getReceivableList(receivableQueryVo);
 
         // 调用动态导出
@@ -2856,6 +2866,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public Page<ExportSuperviseSettlementDetailExcelDto> superviseSettlementDetailExcel(Page page, SettlementQueryVo settlementQueryVo) {
         log.info("superviseSettlementDetailExcel:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportSuperviseSettlementDetailExcelDto> exportSuperviseSettlementDetailExcelDtos = baseMapper.getSuperviseSettlementDetailExcelDtos(page, settlementQueryVo);
         exportSuperviseSettlementDetailExcelDtos.getRecords().forEach(dto -> {
             if (dto.getInvoiceParty().equals("1")) {
@@ -2881,6 +2892,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     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")) {
@@ -2907,6 +2919,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     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")) {
@@ -2930,6 +2943,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportOtherExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
         verifyUploadPath();
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         // modify by lipf, 2026年6月9日11:57:39 调用和查询相同的接口,保证数据一致性
         //List<ExportOtherExcelDto> exportOtherExcelDtos = baseMapper.getOtherExcelDtos(receivableQueryVo);
         receivableQueryVo.setSize(Integer.MAX_VALUE);
@@ -2960,6 +2974,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportOtherJyExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
         verifyUploadPath();
+        receivableQueryVo.setSystemCode(baseController.getSystemCode());
         List<ExportOtherJyExcelDto> exportOtherJyExcelDtos = baseMapper.getOtherJyExcelDtos(receivableQueryVo);
         exportOtherJyExcelDtos.forEach(dto -> {
             switch (dto.getEntryStatus()) {
@@ -2973,6 +2988,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public Page<ExportOtherSettlementExcelDto> exportOtherSettlement(Page page, SettlementQueryVo settlementQueryVo) {
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportOtherSettlementExcelDto> exportOtherSettlementExcelDtos = baseMapper.getOtherSettlementExcelDtos(page, settlementQueryVo);
         exportOtherSettlementExcelDtos.getRecords().forEach(dto -> {
             if (dto.getInvoiceParty().equals("1")) {
@@ -3000,6 +3016,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportOtherSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportOtherSettlementExcelDto> exportOtherSettlementExcelDtos = baseMapper.getOtherSettlementExcelDtos(page, settlementQueryVo);
         exportOtherSettlementExcelDtos.getRecords().forEach(dto -> {
             if (dto.getInvoiceParty().equals("1")) {
@@ -3020,6 +3037,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public Page<ExportOtherSettlementDetailExcelDto> otherSettlementDetail(Page page, SettlementQueryVo settlementQueryVo) {
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportOtherSettlementDetailExcelDto> otherSettlementDetail = baseMapper.getOtherSettlementDetailExcelDtos(page, settlementQueryVo);
         otherSettlementDetail.getRecords().forEach(dto -> {
             if (dto.getInvoiceParty().equals("1")) {
@@ -3042,6 +3060,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportOtherSettlementDetailExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportOtherSettlementDetailExcelDto> exportOtherSettlementDetailExcelDtos = baseMapper.getOtherSettlementDetailExcelDtos(page, settlementQueryVo);
         exportOtherSettlementDetailExcelDtos.getRecords().forEach(dto -> {
             if (dto.getInvoiceParty().equals("1")) {
@@ -3069,6 +3088,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public void exportOtherSettlementDetailJyExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
         verifyUploadPath();
+        settlementQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ExportOtherSettlementDetailJyExcelDto> exportOtherSettlementDetailJyExcelDtos = baseMapper.getOtherSettlementDetailJyExcelDtos(page, settlementQueryVo);
         exportOtherSettlementDetailJyExcelDtos.getRecords().forEach(dto -> {
             if (dto.getInvoiceParty().equals("1")) {
@@ -3400,6 +3420,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public Page<ReceiverSettlementReportDto> receiverSettlementReport(Page page, SettlementReportQueryVo settlementReportQueryVo) {
         log.info("平台协议应收-结算报表-对接人结算报表查询。 settlementReportQueryVo=[{}]", JSONUtil.toJsonStr(settlementReportQueryVo));
+        settlementReportQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ReceiverSettlementReportDto> receiverSettlementReport = baseMapper.getReceiverSettlementReport(page, settlementReportQueryVo);
         List<ReceiverSettlementReportDto> records = receiverSettlementReport.getRecords();
         if(CollUtil.isNotEmpty(records)) {
@@ -3425,6 +3446,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public void exportReceiverSettlementReportExcel(Page page, SettlementReportQueryVo settlementReportQueryVo) {
+        settlementReportQueryVo.setSystemCode(baseController.getSystemCode());
         Page<ReceiverSettlementReportDto> receiverSettlementReport = baseMapper.getReceiverSettlementReport(page, settlementReportQueryVo);
         List<ReceiverSettlementReportDto> receiverSettlementReportDtos = receiverSettlementReport.getRecords();
         EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ReceiverSettlementReportDto.class, receiverSettlementReportDtos, "对接人结算报表");

+ 0 - 3
tenant/organization/src/main/resources/application.yml

@@ -84,9 +84,6 @@ tenant:
     - ins_ply_income_invoice_link
     - ins_orders_risk
     - ins_orders_car_user_info
-    - ins_ply_income
-    - ins_ply_income_invoice
-    - ins_ply_income_invoice_settlement
     - esm_user_referrer
     - ins_ply_income_invoice_settlement_file
     - wechat_customer_service

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

@@ -54,6 +54,7 @@
         LEFT JOIN inv_account ia on ia.id = iac.account_id AND ia.is_delete = 0
         <where>
             iac.is_delete = 0
+            and iac.system_code = #{param.systemCode}
             <if test="param.accountName != null and param.accountName != ''">
                 and ia.account_name like CONCAT('%',#{param.accountName}, '%')
             </if>

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

@@ -38,6 +38,7 @@
         FROM inv_account ia
         <where>
             ia.is_delete = 0
+            and ia.system_code = #{param.systemCode}
             <if test="param.outerFlag != null ">
                 and ia.outer_flag = #{param.outerFlag}
             </if>
@@ -53,6 +54,7 @@
         FROM inv_account ia
         <where>
             ia.is_delete = 0
+            and ia.system_code = #{param.systemCode}
             <if test="param.outerFlag != null ">
                 and ia.outer_flag = #{param.outerFlag}
             </if>

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

@@ -12,6 +12,7 @@
         <where>
             pncjr.is_delete = 0
         </where>
+        and pncjr.system_code = #{systemCode}
     </select>
 
 </mapper>

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

@@ -290,6 +290,7 @@
     </select>
     <select id="getReceivablePage" resultType="com.jzg.commons.entity.finance.po.InsPlyIncome">
         <include refid="query"/>
+        and ipi.system_code = #{receivableQueryVo.systemCode}
         <if test="receivableQueryVo.invoiceId != null and receivableQueryVo.invoiceId != ''" >
             AND ipi.id  in (
             select ipiil.income_id  from ins_ply_income_invoice_link ipiil where ipiil.invoice_id  = #{receivableQueryVo.invoiceId} and ipiil.is_delete = 0
@@ -404,6 +405,7 @@
         <where>
             ipi.is_delete  = 0
             AND ipi.settlement_status = '0'
+            AND ipi.system_code = #{receivableQueryVo.systemCode}
             <if test="receivableQueryVo.queryType != null and receivableQueryVo.queryType == 1">
                 AND ipi.supervise_settlement = 0
             </if>
@@ -480,6 +482,7 @@
         LEFT JOIN ins_orders_risk ior2 ON ipi.order_no = ior2.order_no and ior2.risk_code = '0510' AND ior2.is_delete = 0
         <where>
             ipi.is_delete = 0
+            AND ipi.system_code = #{receivableQueryVo.systemCode}
             AND NOT EXISTS ( SELECT 1 FROM ins_ply_income_invoice_link ipil WHERE ipil.income_id = ipi.id AND ipil.is_delete = 0 )
             <if test="receivableQueryVo.queryType != null and receivableQueryVo.queryType == 1">
                 AND ipi.supervise_settlement = 0
@@ -547,6 +550,7 @@
         left join ptl_agreement agree on io.agreement_id = agree.id AND agree.is_delete = 0
         <where>
             ipiis.is_delete = 0
+            AND ipiis.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -628,6 +632,7 @@
         LEFT JOIN ptl_agreement agree ON io.agreement_id = agree.id AND agree.is_delete = 0
         <where>
             ipiis.is_delete = 0
+            AND ipiis.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -695,6 +700,7 @@
         LEFT JOIN esm_ins_company eic ON ipii.company_id = eic.id  AND eic.is_delete = 0
         <where>
             ipiis.is_delete = 0
+            AND ipiis.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -774,6 +780,7 @@
         LEFT JOIN ins_orders io ON ipi.order_no = io.id AND io.is_delete = 0
         <where>
             ipii.is_delete = 0
+            AND ipii.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementId != null and settlementQueryVo.settlementId != ''">
                 AND ipiis.id = #{settlementQueryVo.settlementId}
             </if>
@@ -839,6 +846,7 @@
         LEFT JOIN ins_orders io ON ipi.order_no = io.id AND io.is_delete = 0
         <where>
             ipii.is_delete = 0
+            AND ipii.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -903,6 +911,7 @@
         LEFT JOIN ins_orders_risk ior2 ON ipi.order_no = ior2.order_no and ior2.risk_code = '0510' AND ior2.is_delete = 0
         <where>
             ipi.is_delete = 0
+            AND ipi.system_code = #{receivableQueryVo.systemCode}
             <if test="receivableQueryVo.queryType != null and receivableQueryVo.queryType == 1">
                 AND ipi.supervise_settlement = 0
             </if>
@@ -959,6 +968,7 @@
         LEFT JOIN ins_orders_risk ior2 ON ipi.order_no = ior2.order_no and ior2.risk_code = '0510' AND ior2.is_delete = 0
         <where>
             ipi.is_delete = 0
+            AND ipi.system_code = #{receivableQueryVo.systemCode}
             <if test="receivableQueryVo.queryType != null and receivableQueryVo.queryType == 1">
                 AND ipi.supervise_settlement = 0
             </if>
@@ -1009,6 +1019,7 @@
         LEFT JOIN ins_ply_income ipi ON ipi.id = ipil.income_id AND ipi.is_delete = 0
         <where>
             ipiis.is_delete = 0
+            AND ipiis.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -1059,6 +1070,7 @@
         LEFT JOIN ins_orders io ON ipi.order_no = io.id AND io.is_delete = 0
         <where>
             ipii.is_delete = 0
+            AND ipii.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -1121,6 +1133,7 @@
         LEFT JOIN ins_orders io ON ipi.order_no = io.id AND io.is_delete = 0
         <where>
             ipii.is_delete = 0
+            AND ipii.system_code = #{settlementQueryVo.systemCode}
             <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
                 AND ipiis.id IN
                 <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">
@@ -1266,6 +1279,7 @@
         LEFT JOIN esm_ins_company eic on eic.id = ipii.company_id AND eic.is_delete = 0
         <where>
             ipii.is_delete = 0
+            AND ipii.system_code = #{invoiceRecordQueryVo.systemCode}
             <if test="invoiceRecordQueryVo.invoiceType != null and invoiceRecordQueryVo.invoiceType != ''">
                 AND ipii.invoice_type = #{invoiceRecordQueryVo.invoiceType}
             </if>
@@ -1583,6 +1597,7 @@
         <where>
             ipi.is_delete = 0
             AND ipi.agreement_type = '1'
+            AND ipi.system_code = #{settlementReportQueryVo.systemCode}
             <if test="settlementReportQueryVo.companyId != null and settlementReportQueryVo.companyId != ''">
                 AND ipi.company_id = #{settlementReportQueryVo.companyId}
             </if>