Parcourir la source

修改bug:
bug表1083,订单审核 添加个协议归属吧

jiakai il y a 1 mois
Parent
commit
4c3003588c

+ 7 - 0
commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -78,6 +78,12 @@ public class QuoteEchoVo extends QuoteVo {
         private String agreementId;
         private String agreementName;
         private String agreementType;
+
+        /**
+         * 协议归属
+         */
+        private String agreementOwnership;
+
         private String createBy;
 
         /**
@@ -352,6 +358,7 @@ public class QuoteEchoVo extends QuoteVo {
         this.setOrdersNo(insOrdersVo.getId());
         this.getOrder().setAgreementId(insOrdersVo.getInsOrders().getAgreementId());
         this.getOrder().setAgreementName(insOrdersVo.getAgreementName());
+        this.getOrder().setAgreementOwnership(insOrdersVo.getAgreementOwnership());
         this.getOrder().setAgreementType(insOrdersVo.getAgreementType());
         this.getOrder().setOrdersNo(insOrdersVo.getId());
         this.getOrder().setQuoteNo(insOrdersVo.getQuoteNo());

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

@@ -52,6 +52,9 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "协议id")
     private String agreementId;
 
+    @Schema(description = "协议归属名称")
+    private String agreementOwnership;
+
     @Schema(description = "审核状态")
     private Integer auditStatus;
 

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

@@ -751,6 +751,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             if (ptlAgreement.getData() != null && ptlAgreement.getData().getAgreement() != null) {
                 insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
                 insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
+                // 根据ptlAgreement获取deptId,根据deptId查询sys_dept,然后根据sys_dept的name给agreementAttributionName赋值
+                String deptId = ptlAgreement.getData().getAgreement().getDeptId();
+                if (StringUtils.isNotEmpty(deptId)) {
+                    HttpResult<SysDeptVo> deptResult = orgClient.deptGet(deptId);
+                    if (deptResult != null && deptResult.getData() != null) {
+                        insOrdersVo.setAgreementOwnership(deptResult.getData().getName());
+                    }
+                }
             }
         }
 
@@ -910,6 +918,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             if (ptlAgreement.getData() != null && ptlAgreement.getData().getAgreement() != null) {
                 insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
                 insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
+
+                // 根据ptlAgreement获取deptId,根据deptId查询sys_dept,然后根据sys_dept的name给agreementAttributionName赋值
+                String deptId = ptlAgreement.getData().getAgreement().getDeptId();
+                if (StringUtils.isNotEmpty(deptId)) {
+                    HttpResult<SysDeptVo> deptResult = orgClient.deptGet(deptId);
+                    if (deptResult != null && deptResult.getData() != null) {
+                        insOrdersVo.setAgreementOwnership(deptResult.getData().getName());
+                    }
+                }
             }
         }
         // 2. 处理车辆用户信息列表