获取协议信息、 录入来源

src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocols.entity.vo.AgreementProductCostsSave;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -113,8 +114,8 @@ public class OrderVo implements Serializable {
     /**
      * 协议id
      */
-    @TableField(value = "agreeid")
-    private String agreeid;
+    @TableField(value = "agreement_id")
+    private String agreementId;
 
     /**
      * 产品id
@@ -520,4 +521,10 @@ public class OrderVo implements Serializable {
     @ApiModelProperty("驾意险份数")
     private String jyQuantity;
 
+    @ApiModelProperty("协议信息")
+    private PtlAgreement ptlAgreement;
+
+    @ApiModelProperty("录入来源")
+    private String entryStatus;
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -64,6 +64,7 @@ import com.ydtech.modules.order.entity.vo.zj.ZjQuoteAccidentVo;
 import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
@@ -821,6 +822,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         } else {
             orderAndAreaCompany.setJqInsuranceType(new JSONArray());
         }
+        // 获取协议信息、 录入来源
+        PtlAgreement ptlAgreement = ptlAgreementService.getById(orderAndAreaCompany.getAgreementId());
+        orderAndAreaCompany.setPtlAgreement(ptlAgreement);
+        orderAndAreaCompany.setEntryStatus(orderAndAreaCompany.getEntryStatus());
 
         String insOrdersUnderwritingReason = insOrdersUnderwritingReasonService.getInsOrdersUnderwritingReason(orderAndAreaCompany.getId(), orderAndAreaCompany.getOrderstatus());
         orderAndAreaCompany.setUnderwritingReason(insOrdersUnderwritingReason);

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -73,7 +73,8 @@
         <result property="insureinfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"
                 jdbcType="VARCHAR"/>
-        <result property="agreeid" column="agreeid" jdbcType="VARCHAR"/>
+        <result property="agreementId" column="agreement_id" jdbcType="VARCHAR"/>
+        <result property="entryStatus" column="entry_status" jdbcType="VARCHAR"/>
         <result property="productid" column="productid" jdbcType="VARCHAR"/>
         <result property="product" column="product" jdbcType="VARCHAR"/>
         <result property="frameno" column="frameno" jdbcType="VARCHAR"/>
@@ -238,6 +239,8 @@
                iac.ubi_predicted_info_score,
                iac.signing_time as signingTime,
                iac.pay_date  as payDate,
+               iac.agreement_id,
+               iac.entry_status,
                eic.namesimple as partnerCompaniesName
         from ins_orders as o
                  join ins_area_company iac on o.orderno = iac.orderno