Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -37,14 +37,20 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     private String remark;
 
     @Schema(description = "业务员类型")
-    private String attrType;
+    private String typeAttr;
 
     @Schema(description = "银行卡照片文件")
-    private String cardFile;
+    private String fileId;
+
+    @Schema(description = "银行卡照片文件url")
+    private String cardFileUrl;
 
     @Schema(description = "租户编码")
     private String systemCode;
 
     @Schema(description = "租户名称")
     private String systemName;
+
+    @Schema(description = "申请时间")
+    private String applyTime;
 }

commons/src/main/java/com/jzg/commons/entity/po/InsFeeOrders.java

@@ -100,4 +100,58 @@ public class InsFeeOrders {
 
     @Schema(description = "驾意险留点费用")
     private BigDecimal jyKeepPointPremium;
+
+    @Schema(description = "交强险入口比例")
+    private BigDecimal jqInletRatio;
+
+    @Schema(description = "商业险入口比例")
+    private BigDecimal syInletRatio;
+
+    @Schema(description = "驾意险入口比例")
+    private BigDecimal jyInletRatio;
+
+    @Schema(description = "交强险手续费比例")
+    private BigDecimal jqCommissionRatio;
+
+    @Schema(description = "商业险手续费比例")
+    private BigDecimal syCommissionRatio;
+
+    @Schema(description = "驾意险手续费比例")
+    private BigDecimal jyCommissionRatio;
+
+    @Schema(description = "交强险跟单费比例")
+    private BigDecimal jqFollowRatio;
+
+    @Schema(description = "商业险跟单费比例")
+    private BigDecimal syFollowRatio;
+
+    @Schema(description = "驾意险跟单费比例")
+    private BigDecimal jyFollowRatio;
+
+    @Schema(description = "交强险加投费费比例")
+    private BigDecimal jqAdditionalRatio;
+
+    @Schema(description = "商业险加投费费比例")
+    private BigDecimal syAdditionalRatio;
+
+    @Schema(description = "驾意险加投费费比例")
+    private BigDecimal jyAdditionalRatio;
+
+    @Schema(description = "交强险留点比例")
+    private BigDecimal jqKeepPointRatio;
+
+    @Schema(description = "商业险留点比例")
+    private BigDecimal syKeepPointRatio;
+
+    @Schema(description = "驾意险留点比例")
+    private BigDecimal jyKeepPointRatio;
+
+    @Schema(description = "交强出口比例")
+    private BigDecimal jqExportRatio;
+
+    @Schema(description = "商业险出口比例")
+    private BigDecimal syExportRatio;
+
+    @Schema(description = "驾意险出口比例")
+    private BigDecimal jyExportRatio;
 }

gateway/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ spring:
         - id: tenant_route
           uri: http://localhost:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/scheme/**,/schemeRules/**,/schemeRulesAttrLink/**,/schemeRulesAttr/**,/schemeRulesDictLable/**,/schemeRulesUndwrt/**,/schemeRulesUndwrtAttrLink/**,/schemeRulesUndwrtAttr/**,/schemeRulesUndwrtDictLable/**,/schemeRulesUndwrtRules/**,/schemeRulesUndwrtRulesAttrLink/**,/schemeRules,/ptlAgreementCost/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**,/operatorTrajectory/**,/messageTemplate/**,/message/**,/appUser/**
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/scheme/**,/schemeRules/**,/schemeRulesAttrLink/**,/schemeRulesAttr/**,/schemeRulesDictLable/**,/schemeRulesUndwrt/**,/schemeRulesUndwrtAttrLink/**,/schemeRulesUndwrtAttr/**,/schemeRulesUndwrtDictLable/**,/schemeRulesUndwrtRules/**,/schemeRulesUndwrtRulesAttrLink/**,/schemeRules,/ptlAgreementCost/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**,/operatorTrajectory/**,/messageTemplate/**,/message/**,/appUser/**,/userBankCard/**
 
         - id: summary_route
           uri: http://localhost:9898/

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -718,7 +718,8 @@ public class QuoteVerificationAspect {
                 InsFeeOrders::setJyCommissionPremium, InsFeeOrders::setJyFollowPremium, InsFeeOrders::setJyAdditionalPremium
         );
 
-        // 7. 计算总应收、总应付并保存
+        // 7. 计算总应收、总应付、保存费用比例 入库
+        saveRatio(insFeeOrders, agreementInfoVo, jqCostType, syCostType, jyCostType);
         calculateTotalPremium(insFeeOrders);
         insFeeOrdersService.save(insFeeOrders);
     }
@@ -829,6 +830,38 @@ public class QuoteVerificationAspect {
         insFeeOrders.setTotalPayablePremium(totalPayable);
     }
 
+    /**
+     * 保存比例
+     */
+    private void saveRatio(InsFeeOrders insFeeOrders, AgreementInfoVo agreementInfoVo,PtlAgreementCostTypeVo jqCostType,PtlAgreementCostTypeVo syCostType,PtlAgreementCostTypeVo jyCostType) {
+        // 手续费比例
+        insFeeOrders.setJqCommissionRatio(convertPercent(agreementInfoVo.getAgreement().getJqEntranceFeeRatio()));
+        insFeeOrders.setSyCommissionRatio(convertPercent(agreementInfoVo.getAgreement().getSyEntranceFeeRatio()));
+        insFeeOrders.setJyCommissionRatio(convertPercent(agreementInfoVo.getAgreement().getJyEntranceFeeRatio()));
+        // 入口比例
+        insFeeOrders.setJqInletRatio(convertPercent(jqCostType.getInlet()));
+        insFeeOrders.setSyInletRatio(convertPercent(syCostType.getInlet()));
+        insFeeOrders.setJyInletRatio(convertPercent(jyCostType.getInlet()));
+        // 跟单比例
+        insFeeOrders.setJqFollowRatio(calculateFollowRatio(jqCostType, agreementInfoVo.getAgreement().getJqEntranceFeeRatio()));
+        insFeeOrders.setSyFollowRatio(calculateFollowRatio(syCostType, agreementInfoVo.getAgreement().getSyEntranceFeeRatio()));
+        insFeeOrders.setJyFollowRatio(calculateFollowRatio(jyCostType, agreementInfoVo.getAgreement().getJyEntranceFeeRatio()));
+        // 加投比例
+        insFeeOrders.setJqAdditionalRatio(convertPercent(jqCostType.getAddThrow()));
+        insFeeOrders.setSyAdditionalRatio(convertPercent(syCostType.getAddThrow()));
+        insFeeOrders.setJyAdditionalRatio(convertPercent(jyCostType.getAddThrow()));
+        // 留点比例
+        insFeeOrders.setJqKeepPointRatio(convertPercent(jqCostType.getKeepPointRatio()));
+        insFeeOrders.setSyKeepPointRatio(convertPercent(syCostType.getKeepPointRatio()));
+        insFeeOrders.setJyKeepPointRatio(convertPercent(jyCostType.getKeepPointRatio()));
+        // 出口比例
+        insFeeOrders.setJqExportRatio(convertPercent(jqCostType.getExport()));
+        insFeeOrders.setSyExportRatio(convertPercent(syCostType.getExport()));
+        insFeeOrders.setJyExportRatio(convertPercent(jyCostType.getExport()));
+    }
+
+
+
     //    // 获取协议录入的 手续费比例 保留百分比
 //    BigDecimal jqEntranceFeeRatio = agreementInfoVo.getAgreement().getJqEntranceFeeRatio().divide(BigDecimal.valueOf(100), 10, RoundingMode.HALF_EVEN);
 //    BigDecimal syEntranceFeeRatio = agreementInfoVo.getAgreement().getSyEntranceFeeRatio().divide(BigDecimal.valueOf(100), 10, RoundingMode.HALF_EVEN);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -336,63 +336,66 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                               List<PtlAgreementCostTypeVo> costTypeVos,
                               InsFeeOrders feeOrders,
                               AgreementVo agreement) {
-        for (PtlAgreementCostTypeVo costTypeVo : costTypeVos) {
-            if(costTypeVo.getCostType().equals("1")){
-                AuditCostInfoVo jqInfoVo = new AuditCostInfoVo();
-                jqInfoVo.setCostType(costTypeVo.getCostType());
-                jqInfoVo.setPremium(feeOrders.getJqPremium());
-                jqInfoVo.setInletRadio(costTypeVo.getInlet());
-                jqInfoVo.setInletPremium(feeOrders.getJqReceivablePremium());
-                jqInfoVo.setEntranceFeeRatio(agreement.getJqEntranceFeeRatio());
-                jqInfoVo.setEntranceFeePremium(feeOrders.getJqCommissionPremium());
-                BigDecimal followRatio = costTypeVo.getInlet().subtract(agreement.getJqEntranceFeeRatio()); // 计算跟单比例
-                jqInfoVo.setFollowRatio(followRatio);
-                jqInfoVo.setFollowPremium(feeOrders.getJqFollowPremium());
-                jqInfoVo.setAddThrowRatio(costTypeVo.getAddThrow());
-                jqInfoVo.setAddThrowPremium(feeOrders.getJqAdditionalPremium());
-                jqInfoVo.setExportRatio(costTypeVo.getExport());
-                jqInfoVo.setExportPremium(feeOrders.getJqPayablePremium());
-                jqInfoVo.setKeepPointRatio(costTypeVo.getKeepPointRatio());
-                jqInfoVo.setKeepPointPremium(feeOrders.getJqKeepPointPremium());
-                auditCostInfoVos.add(jqInfoVo);
-            }else if(costTypeVo.getCostType().equals("2")){
-                AuditCostInfoVo syInfoVo = new AuditCostInfoVo();
-                syInfoVo.setCostType(costTypeVo.getCostType());
-                syInfoVo.setPremium(feeOrders.getSyPremium());
-                syInfoVo.setInletRadio(costTypeVo.getInlet());
-                syInfoVo.setInletPremium(feeOrders.getSyReceivablePremium());
-                syInfoVo.setEntranceFeeRatio(agreement.getSyEntranceFeeRatio());
-                syInfoVo.setEntranceFeePremium(feeOrders.getSyCommissionPremium());
-                BigDecimal followRatio = costTypeVo.getInlet().subtract(agreement.getSyEntranceFeeRatio()); // 计算跟单比例
-                syInfoVo.setFollowRatio(followRatio);
-                syInfoVo.setFollowPremium(feeOrders.getSyFollowPremium());
-                syInfoVo.setAddThrowRatio(costTypeVo.getAddThrow());
-                syInfoVo.setAddThrowPremium(feeOrders.getSyAdditionalPremium());
-                syInfoVo.setExportRatio(costTypeVo.getExport());
-                syInfoVo.setExportPremium(feeOrders.getSyPayablePremium());
-                syInfoVo.setKeepPointRatio(costTypeVo.getKeepPointRatio());
-                syInfoVo.setKeepPointPremium(feeOrders.getSyKeepPointPremium());
-                auditCostInfoVos.add(syInfoVo);
-            }else{
-                AuditCostInfoVo noInfoVo = new AuditCostInfoVo();
-                noInfoVo.setCostType(costTypeVo.getCostType());
-                noInfoVo.setPremium(feeOrders.getJyPremium());
-                noInfoVo.setInletRadio(costTypeVo.getInlet());
-                noInfoVo.setInletPremium(feeOrders.getJyReceivablePremium());
-                noInfoVo.setEntranceFeeRatio(agreement.getJyEntranceFeeRatio());
-                noInfoVo.setEntranceFeePremium(feeOrders.getJyCommissionPremium());
-                BigDecimal followRatio = costTypeVo.getInlet().subtract(agreement.getJyEntranceFeeRatio()); // 计算跟单比例
-                noInfoVo.setFollowRatio(followRatio);
-                noInfoVo.setFollowPremium(feeOrders.getJyFollowPremium());
-                noInfoVo.setAddThrowRatio(costTypeVo.getAddThrow());
-                noInfoVo.setAddThrowPremium(feeOrders.getJyAdditionalPremium());
-                noInfoVo.setExportRatio(costTypeVo.getExport());
-                noInfoVo.setExportPremium(feeOrders.getJyPayablePremium());
-                noInfoVo.setKeepPointRatio(costTypeVo.getKeepPointRatio());
-                noInfoVo.setKeepPointPremium(feeOrders.getJyKeepPointPremium());
-                auditCostInfoVos.add(noInfoVo);
+
+
+        costTypeVos.forEach(costTypeVo -> {
+            switch (costTypeVo.getCostType()) {
+                case "交强险":
+                    AuditCostInfoVo jqInfoVo = new AuditCostInfoVo();
+                    jqInfoVo.setCostType(costTypeVo.getCostType());
+                    jqInfoVo.setPremium(feeOrders.getJqPremium());
+                    jqInfoVo.setInletRadio(costTypeVo.getInlet());
+                    jqInfoVo.setInletPremium(feeOrders.getJqReceivablePremium());
+                    jqInfoVo.setEntranceFeeRatio(agreement.getJqEntranceFeeRatio());
+                    jqInfoVo.setEntranceFeePremium(feeOrders.getJqCommissionPremium());
+                    BigDecimal followRatio = costTypeVo.getInlet().subtract(agreement.getJqEntranceFeeRatio()); // 计算跟单比例
+                    jqInfoVo.setFollowRatio(followRatio);
+                    jqInfoVo.setFollowPremium(feeOrders.getJqFollowPremium());
+                    jqInfoVo.setAddThrowRatio(costTypeVo.getAddThrow());
+                    jqInfoVo.setAddThrowPremium(feeOrders.getJqAdditionalPremium());
+                    jqInfoVo.setExportRatio(costTypeVo.getExport());
+                    jqInfoVo.setExportPremium(feeOrders.getJqPayablePremium());
+                    jqInfoVo.setKeepPointRatio(costTypeVo.getKeepPointRatio());
+                    jqInfoVo.setKeepPointPremium(feeOrders.getJqKeepPointPremium());
+                    auditCostInfoVos.add(jqInfoVo);
+                case "商业险":
+                    AuditCostInfoVo syInfoVo = new AuditCostInfoVo();
+                    syInfoVo.setCostType(costTypeVo.getCostType());
+                    syInfoVo.setPremium(feeOrders.getSyPremium());
+                    syInfoVo.setInletRadio(costTypeVo.getInlet());
+                    syInfoVo.setInletPremium(feeOrders.getSyReceivablePremium());
+                    syInfoVo.setEntranceFeeRatio(agreement.getSyEntranceFeeRatio());
+                    syInfoVo.setEntranceFeePremium(feeOrders.getSyCommissionPremium());
+                    BigDecimal followRatio1 = costTypeVo.getInlet().subtract(agreement.getSyEntranceFeeRatio()); // 计算跟单比例
+                    syInfoVo.setFollowRatio(followRatio1);
+                    syInfoVo.setFollowPremium(feeOrders.getSyFollowPremium());
+                    syInfoVo.setAddThrowRatio(costTypeVo.getAddThrow());
+                    syInfoVo.setAddThrowPremium(feeOrders.getSyAdditionalPremium());
+                    syInfoVo.setExportRatio(costTypeVo.getExport());
+                    syInfoVo.setExportPremium(feeOrders.getSyPayablePremium());
+                    syInfoVo.setKeepPointRatio(costTypeVo.getKeepPointRatio());
+                    syInfoVo.setKeepPointPremium(feeOrders.getSyKeepPointPremium());
+                    auditCostInfoVos.add(syInfoVo);
+                case "驾意险":
+                    AuditCostInfoVo noInfoVo = new AuditCostInfoVo();
+                    noInfoVo.setCostType(costTypeVo.getCostType());
+                    noInfoVo.setPremium(feeOrders.getJyPremium());
+                    noInfoVo.setInletRadio(costTypeVo.getInlet());
+                    noInfoVo.setInletPremium(feeOrders.getJyReceivablePremium());
+                    noInfoVo.setEntranceFeeRatio(agreement.getJyEntranceFeeRatio());
+                    noInfoVo.setEntranceFeePremium(feeOrders.getJyCommissionPremium());
+                    BigDecimal followRatio2 = costTypeVo.getInlet().subtract(agreement.getJyEntranceFeeRatio()); // 计算跟单比例
+                    noInfoVo.setFollowRatio(followRatio2);
+                    noInfoVo.setFollowPremium(feeOrders.getJyFollowPremium());
+                    noInfoVo.setAddThrowRatio(costTypeVo.getAddThrow());
+                    noInfoVo.setAddThrowPremium(feeOrders.getJyAdditionalPremium());
+                    noInfoVo.setExportRatio(costTypeVo.getExport());
+                    noInfoVo.setExportPremium(feeOrders.getJyPayablePremium());
+                    noInfoVo.setKeepPointRatio(costTypeVo.getKeepPointRatio());
+                    noInfoVo.setKeepPointPremium(feeOrders.getJyKeepPointPremium());
+                    auditCostInfoVos.add(noInfoVo);
             }
-        }
+        });
     }
 
     /**
@@ -406,62 +409,63 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                            InsFeeOrderRecord record,
                            List<PtlAgreementCostTypeVo> costTypeVos,
                            InsFeeOrders feeOrders) {
-        for (PtlAgreementCostTypeVo costTypeVo : costTypeVos) {
-            if(costTypeVo.getCostType().equals("1")){
-                AuditCostInfoVo jqInfoVo = new AuditCostInfoVo();
-                jqInfoVo.setCostType(costTypeVo.getCostType());
-                jqInfoVo.setPremium(feeOrders.getJqPremium());
-                jqInfoVo.setInletRadio(record.getJqInletRadio());
-                jqInfoVo.setInletPremium(feeOrders.getJqReceivablePremium());
-                jqInfoVo.setEntranceFeeRatio(record.getJqEntranceFeeRatio());
-                jqInfoVo.setEntranceFeePremium(feeOrders.getJqCommissionPremium());
-                jqInfoVo.setFollowRatio(record.getJqFollowRatio());
-                jqInfoVo.setFollowPremium(feeOrders.getJqFollowPremium());
-                jqInfoVo.setAddThrowRatio(record.getJqAddThrowRadio());
-                jqInfoVo.setAddThrowPremium(feeOrders.getJqAdditionalPremium());
-                jqInfoVo.setExportRatio(costTypeVo.getExport());
-                jqInfoVo.setExportPremium(feeOrders.getJqPayablePremium());
-                jqInfoVo.setKeepPointRatio(record.getJqKeepPointRatio());
-                jqInfoVo.setKeepPointPremium(feeOrders.getJqKeepPointPremium());
-                auditCostInfoVos.add(jqInfoVo);
-            }else if(costTypeVo.getCostType().equals("2")){
-                AuditCostInfoVo syInfoVo = new AuditCostInfoVo();
-                syInfoVo.setCostType(costTypeVo.getCostType());
-                syInfoVo.setPremium(feeOrders.getSyPremium());
-                syInfoVo.setInletRadio(record.getSyInletRadio());
-                syInfoVo.setInletPremium(feeOrders.getSyReceivablePremium());
-                syInfoVo.setEntranceFeeRatio(record.getSyEntranceFeeRatio());
-                syInfoVo.setEntranceFeePremium(feeOrders.getSyCommissionPremium());
-                syInfoVo.setFollowRatio(record.getSyFollowRatio());
-                syInfoVo.setFollowPremium(feeOrders.getSyFollowPremium());
-                syInfoVo.setAddThrowRatio(record.getSyAddThrowRadio());
-                syInfoVo.setAddThrowPremium(feeOrders.getSyAdditionalPremium());
-                syInfoVo.setExportRatio(costTypeVo.getExport());
-                syInfoVo.setExportPremium(feeOrders.getSyPayablePremium());
-                syInfoVo.setKeepPointRatio(record.getSyKeepPointRatio());
-                syInfoVo.setKeepPointPremium(feeOrders.getSyKeepPointPremium());
-                auditCostInfoVos.add(syInfoVo);
-            }else{
-                AuditCostInfoVo noInfoVo = new AuditCostInfoVo();
-                noInfoVo.setCostType(costTypeVo.getCostType());
-                noInfoVo.setPremium(feeOrders.getJyPremium());
-                noInfoVo.setInletRadio(record.getNoInletRadio());
-                noInfoVo.setInletPremium(feeOrders.getJyReceivablePremium());
-                noInfoVo.setEntranceFeeRatio(record.getNoEntranceFeeRatio());
-                noInfoVo.setEntranceFeePremium(feeOrders.getJyCommissionPremium());
-                noInfoVo.setFollowRatio(record.getNoFollowRatio());
-                noInfoVo.setFollowPremium(feeOrders.getJyFollowPremium());
-                noInfoVo.setAddThrowRatio(record.getNoAddThrowRadio());
-                noInfoVo.setAddThrowPremium(feeOrders.getJyAdditionalPremium());
-                noInfoVo.setExportRatio(costTypeVo.getExport());
-                noInfoVo.setExportPremium(feeOrders.getJyPayablePremium());
-                noInfoVo.setKeepPointRatio(record.getNoKeepPointRatio());
-                noInfoVo.setKeepPointPremium(feeOrders.getJyKeepPointPremium());
-                auditCostInfoVos.add(noInfoVo);
-            }
-        }
 
 
+        costTypeVos.forEach(costTypeVo -> {
+            switch (costTypeVo.getCostType()) {
+                case "交强险":
+                    AuditCostInfoVo jqInfoVo = new AuditCostInfoVo();
+                    jqInfoVo.setCostType(costTypeVo.getCostType());
+                    jqInfoVo.setPremium(feeOrders.getJqPremium());
+                    jqInfoVo.setInletRadio(record.getJqInletRadio());
+                    jqInfoVo.setInletPremium(feeOrders.getJqReceivablePremium());
+                    jqInfoVo.setEntranceFeeRatio(record.getJqEntranceFeeRatio());
+                    jqInfoVo.setEntranceFeePremium(feeOrders.getJqCommissionPremium());
+                    jqInfoVo.setFollowRatio(record.getJqFollowRatio());
+                    jqInfoVo.setFollowPremium(feeOrders.getJqFollowPremium());
+                    jqInfoVo.setAddThrowRatio(record.getJqAddThrowRadio());
+                    jqInfoVo.setAddThrowPremium(feeOrders.getJqAdditionalPremium());
+                    jqInfoVo.setExportRatio(costTypeVo.getExport());
+                    jqInfoVo.setExportPremium(feeOrders.getJqPayablePremium());
+                    jqInfoVo.setKeepPointRatio(record.getJqKeepPointRatio());
+                    jqInfoVo.setKeepPointPremium(feeOrders.getJqKeepPointPremium());
+                    auditCostInfoVos.add(jqInfoVo);
+                case "商业险":
+                    AuditCostInfoVo syInfoVo = new AuditCostInfoVo();
+                    syInfoVo.setCostType(costTypeVo.getCostType());
+                    syInfoVo.setPremium(feeOrders.getSyPremium());
+                    syInfoVo.setInletRadio(record.getSyInletRadio());
+                    syInfoVo.setInletPremium(feeOrders.getSyReceivablePremium());
+                    syInfoVo.setEntranceFeeRatio(record.getSyEntranceFeeRatio());
+                    syInfoVo.setEntranceFeePremium(feeOrders.getSyCommissionPremium());
+                    syInfoVo.setFollowRatio(record.getSyFollowRatio());
+                    syInfoVo.setFollowPremium(feeOrders.getSyFollowPremium());
+                    syInfoVo.setAddThrowRatio(record.getSyAddThrowRadio());
+                    syInfoVo.setAddThrowPremium(feeOrders.getSyAdditionalPremium());
+                    syInfoVo.setExportRatio(costTypeVo.getExport());
+                    syInfoVo.setExportPremium(feeOrders.getSyPayablePremium());
+                    syInfoVo.setKeepPointRatio(record.getSyKeepPointRatio());
+                    syInfoVo.setKeepPointPremium(feeOrders.getSyKeepPointPremium());
+                    auditCostInfoVos.add(syInfoVo);
+                case "驾意险":
+                    AuditCostInfoVo noInfoVo = new AuditCostInfoVo();
+                    noInfoVo.setCostType(costTypeVo.getCostType());
+                    noInfoVo.setPremium(feeOrders.getJyPremium());
+                    noInfoVo.setInletRadio(record.getNoInletRadio());
+                    noInfoVo.setInletPremium(feeOrders.getJyReceivablePremium());
+                    noInfoVo.setEntranceFeeRatio(record.getNoEntranceFeeRatio());
+                    noInfoVo.setEntranceFeePremium(feeOrders.getJyCommissionPremium());
+                    noInfoVo.setFollowRatio(record.getNoFollowRatio());
+                    noInfoVo.setFollowPremium(feeOrders.getJyFollowPremium());
+                    noInfoVo.setAddThrowRatio(record.getNoAddThrowRadio());
+                    noInfoVo.setAddThrowPremium(feeOrders.getJyAdditionalPremium());
+                    noInfoVo.setExportRatio(costTypeVo.getExport());
+                    noInfoVo.setExportPremium(feeOrders.getJyPayablePremium());
+                    noInfoVo.setKeepPointRatio(record.getNoKeepPointRatio());
+                    noInfoVo.setKeepPointPremium(feeOrders.getJyKeepPointPremium());
+                    auditCostInfoVos.add(noInfoVo);
+            }
+        });
     }
 }
 

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
+import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.MinioUtils;
+import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
 import jakarta.annotation.Resource;
@@ -28,6 +31,10 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
 
     @Resource
     private BaseController baseController;
+
+    @Resource
+    private SysUploadFilesMapper sysUploadFilesMapper;
+
     @Override
     public List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode) {
         return sysUserJzgInfoBankCardMapper.getBankCardByUserId(userInfoId,systemCode);
@@ -35,8 +42,15 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
 
     @Override
     public Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
-        Page<SysUserJzgInfoBankCardDto> sysVersionPage = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
-        return sysVersionPage;
+        Page<SysUserJzgInfoBankCardDto> pageList = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
+        pageList.getRecords().forEach(sysUserJzgInfoBankCardDto -> {
+            if (sysUserJzgInfoBankCardDto.getFileId() != null) {
+                String cardFileId = sysUserJzgInfoBankCardDto.getFileId();
+                SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(cardFileId);
+                sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg",sysUploadFiles.getFileName()));
+            }
+        });
+        return pageList;
     }
 
     @Override

tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -48,6 +48,7 @@
         left join sys_system ss on ss.sys_code = sujibc.system_code
         where
         1=1
+            and sujibc.is_delete = '0'
         <if test="sysUserJzgInfoBankCardVo.salesman != null and sysUserJzgInfoBankCardVo.salesman != ''">
             and suji.name = #{sysUserJzgInfoBankCardVo.salesman}
             or su.mobile = #{sysUserJzgInfoBankCardVo.salesman}
@@ -59,12 +60,12 @@
             and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.applyTimeStart} AND #{sysUserJzgInfoBankCardVo.applyTimeEnd}
         </if>
         <if test="sysUserJzgInfoBankCardVo.auditTimeStart != null and sysUserJzgInfoBankCardVo.auditTimeEnd == null">
-            and DATE_FORMAT(sujibc.apply_time, '%Y-%m-%d') >= #{sysUserJzgInfoBankCardVo.applyTimeStart}
+            and DATE_FORMAT(sujibc.audit_time, '%Y-%m-%d') between #{sysUserJzgInfoBankCardVo.auditTimeStart} AND #{sysUserJzgInfoBankCardVo.auditTimeEnd}
         </if>
         <if test="sysUserJzgInfoBankCardVo.auditBy != null and sysUserJzgInfoBankCardVo.auditBy != ''">
             and sujibc.audit_by = #{sysUserJzgInfoBankCardVo.auditBy}
         </if>
-        <if test="sysUserJzgInfoBankCardVo.auditStatus == null and sysUserJzgInfoBankCardVo.auditStatus != ‘’">
+        <if test="sysUserJzgInfoBankCardVo.auditStatus != null and sysUserJzgInfoBankCardVo.auditStatus != ''">
             and sujibc.audit_status = #{sysUserJzgInfoBankCardVo.auditStatus}
         </if>
     </select>