1. 车险导出添加 交强险业务类型 商业险业务类型

2. 修改协议费用查询 不查询删除协议的费用信息

src/main/java/com/ydtech/modules/ins/model/InsOrdersExcel.java

@@ -37,6 +37,12 @@ public class InsOrdersExcel {
     @ExcelProperty(value = "险种")
     private String product;
 
+    @ExcelProperty(value = "交强险业务类型")
+    private String jqBusinessType;
+
+    @ExcelProperty(value = "商业险业务类型")
+    private String syBusinessType;
+
     @ExcelProperty(value = "车架号")
     private String fraMeno;
 

src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -26,11 +26,18 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
     InsOrders getByUseridAndLicenseNo(VerifyOrdersVo verifyOrdersVo);
 
     Long queryPageOrderCount(@Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                             @Param("isTeamLeader") Boolean isTeamLeader, @Param("isCdy") Boolean isCdy, @Param("deptId") String deptId,@Param("isDxFlag") Boolean isDxFlag);
+                             @Param("isTeamLeader") Boolean isTeamLeader, @Param("isCdy") Boolean isCdy, @Param("deptId") String deptId, @Param("isDxFlag") Boolean isDxFlag);
 
     Page<InsOrders> queryPageOrder(@Param("page") Page page, @Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                                   @Param("isTeamLeader") Boolean isTeamLeader, @Param("isCdy") Boolean isCdy, @Param("deptId") String deptId,@Param("isDxFlag") Boolean isDxFlag);
+                                   @Param("isTeamLeader") Boolean isTeamLeader, @Param("isCdy") Boolean isCdy, @Param("deptId") String deptId, @Param("isDxFlag") Boolean isDxFlag);
 
+    /**
+     * @param insOrdersExcelVo 查询条件
+     * @description: 查询承保导出数据
+     * @author: wenks
+     * @date: 2024/11/5 11:11
+     * @return: List<InsOrdersExcel> 数据列表
+     **/
     List<InsOrdersExcel> queryOrderList(InsOrdersExcelVo insOrdersExcelVo);
 
     Page<PolicyInsuranceReportResVo> getPolicyInsuranceReport(@Param("page") Page page, @Param("policyReqVo") PolicyInsuranceReportReqVo policyInsuranceReportReqVo);
@@ -130,15 +137,15 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
     List<QueryHxOrdersCountExcel> queryHxOrdersCount(@Param("queryHxOrdersCountVo") QueryHxOrdersCountVo queryHxOrdersCountVo);
 
     /**
-     *
      * @param telemarketingAuditOrderQueryVo 电销审核状态查询实体
-     * @param userId 用户id
+     * @param userId                         用户id
      * @return
      */
     List<TelemarketingAuditOrderDTO> getTelemarketingAudit(@Param("telemarketingAuditOrderQueryVo") TelemarketingAuditOrderQueryVo telemarketingAuditOrderQueryVo, @Param("userId") String userId);
 
     /**
      * 查询某个时间段的车牌号
+     *
      * @param queryLicenseInOrderVo 查询车牌实体
      * @return 车牌号列表
      */
@@ -146,8 +153,9 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
 
     /**
      * 查询某个时间段的被保人
+     *
      * @param queryInsuredInOrderVo 查询被保人实体
-     * @param userId 用户id
+     * @param userId                用户id
      * @return 被保人列表
      */
     List<String> queryInsured(@Param("queryInsuredInOrderVo") QueryLicenseInOrderVo queryInsuredInOrderVo, String userId);
@@ -155,5 +163,5 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
     /**
      * 推送服务查询客户信息
      */
-    SendProjectInfo getOrderByCompanyId(@Param("companyId")String companyId);
+    SendProjectInfo getOrderByCompanyId(@Param("companyId") String companyId);
 }

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

@@ -174,7 +174,8 @@
         <result property="crossInsurance" column="cross_insurance" javaType="com.alibaba.fastjson.JSONArray"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
         <result property="product" column="product" jdbcType="VARCHAR"/>
-
+        <result property="jqBusinessType" column="jq_business_type" jdbcType="VARCHAR"/>
+        <result property="syBusinessType" column="sy_business_type" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -468,7 +469,10 @@
         b.pay_date,
         b.signing_time,
         b.cross_insurance,
-        b.product
+        b.product,
+        b.jq_renewal,
+        CASE WHEN b.jq_renewal = '0'THEN '转保' WHEN b.jq_renewal = '1'THEN '续保'  END AS jq_business_type,
+        CASE WHEN b.sy_renewal = '0'THEN '转保' WHEN b.jq_renewal = '1'THEN '续保'  END AS sy_business_type
         FROM ins_orders a LEFT JOIN ins_area_company b on a.orderno = b.orderno
         WHERE
         1 = 1

src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -13,6 +13,7 @@
         ptl_agreement_product_costs_new papcn
         LEFT JOIN ptl_agreement pa ON papcn.agreement_id = pa.id
         where 1=1
+        and pa.deleted = 0
         <if test="params.agreementIds != null and params.agreementIds != ''">
             AND pa.id in (${params.agreementIds})
         </if>