Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -63,7 +63,12 @@ public class CarSettleController extends BaseController {
         //查询已承保的子订单号
         List<InsAreaCompany> areaList =insAreaCompanyService.query()
                 .eq(StringUtils.isNotEmpty(orderNo),"orderno",orderNo)
-                .eq("orderstatus","3").list();//3已承保
+                .eq("orderstatus","2").list();//3已承保
+
+//        List<InsAreaCompany> areaList = insAreaCompanyService.query()
+//                .eq("orderno", orderNo)
+//                .and(wrapper -> wrapper.eq("orderstatus", "3").or().eq("orderstatus", "2"))
+//                .list();//3已承保
         if(areaList!=null && areaList.size()>0){
             return insOrdersService.getByCompanyId(areaList.get(0).getId(),"accountingUser");
         }else{

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -127,6 +127,10 @@ public class QuoteRespVo {
     @ApiModelProperty("核心返回车型")
     private CoreModelsVo coreModels;
 
+
+    //add by hxl 添加紫金能源车返回的鼎然-车辆风险评分
+    @ApiModelProperty("紫金能源车（鼎然-车辆风险评分）")
+    private String ubiPredictedInfoScore;
     /**
      * 预核保信息
      */

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

@@ -1,8 +1,11 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
+import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -43,6 +46,10 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
 
     List<InsAreaCompany> getorDerIds();
 
+    /**
+     * 获取待审核的订单
+     */
+    Page<InsOrders> getPendingAuditOrders(Page page, @Param("params") OrderQueryVo orderQueryVo);
 
 }
 

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -362,6 +362,12 @@ public class InsAreaCompany implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 紫金能源车（鼎然-车辆风险评分  add by hxl 2024-04-09
+     */
+    @TableField(exist = false)
+    private String ubiPredictedInfoScore;
+
     public InsAreaCompany(QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
         this.id = IdGenerate.nextId();
         this.orderno = quoteRespVo.getOrderno();

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -213,6 +213,12 @@ public class InsOrders implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 紫金能源车（鼎然-车辆风险评分  add by hxl 2024-04-09
+     */
+    @TableField(value = "ubi_predicted_info_score")
+    private String ubiPredictedInfoScore;
+
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单
         this.setQuoteno(String.valueOf(quoteInfoVo.getQuoteno()));

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

@@ -1,10 +1,10 @@
 package com.ydtech.modules.order.entity.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ydtech.modules.ins.model.vo.AccidentResponseVo;
 import com.ydtech.modules.ins.model.vo.QuoteKindRespVo;
 import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
@@ -133,6 +133,13 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("商业赔付率")
         private double syLossRation;
 
+
+        /**
+         * 紫金能源车（鼎然-车辆风险评分  add by hxl 2024-04-09
+         */
+        @TableField(value = "紫金能源车（鼎然-车辆风险评分)")
+        private String ubiPredictedInfoScore;
+
         public InsAreaCompanyEditingDto(InsAreaCompanyQueryDto insAreaCompany) {
             this.orderno = insAreaCompany.getOrderno();
             this.orderstatus = insAreaCompany.getOrderstatus();

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -68,4 +69,11 @@ public class OrderQueryVo {
         }
         return endDate.plusDays(1);
     }
+
+    public PageRequest getPageRequest() {
+        PageRequest pageRequest = new PageRequest();
+        pageRequest.setPageNum(pageNum);
+        pageRequest.setPageSize(pageSize);
+        return pageRequest;
+    }
 }

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

@@ -360,4 +360,10 @@ public class OrderVo implements Serializable {
      */
     private List<DistributionLevelVo>  distributionLevelVoList;
 
+    /**
+     * 紫金能源车（鼎然-车辆风险评分  add by hxl 2024-04-09
+     */
+    @TableField(value = "ubi_predicted_info_score")
+    private String ubiPredictedInfoScore;
+
 }

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java

@@ -1,8 +1,11 @@
 package com.ydtech.modules.order.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
+import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 
 import java.util.List;
 
@@ -69,5 +72,11 @@ public interface InsAreaCompanyService extends IService<InsAreaCompany> {
 
     List<InsAreaCompany> getorDerIds();
 
+    /**
+     * 查询待审核的订单
+     * @return
+     */
+    Page<InsOrders> getPendingAuditOrders(Page page, OrderQueryVo orderQueryVo);
+
 
 }

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

@@ -1,11 +1,14 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.dao.InsAreaCompanyMapper;
 import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
+import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsOrdersTrackService;
@@ -99,6 +102,11 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         return  baseMapper.getorDerIds();
     }
 
+    @Override
+    public Page<InsOrders> getPendingAuditOrders(Page page, OrderQueryVo orderQueryVo) {
+        return baseMapper.getPendingAuditOrders(page,orderQueryVo);
+    }
+
 }
 
 

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

@@ -14,6 +14,7 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.insurance.NatureOfVehicleUse;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.RoleConstants;
 import com.ydtech.modules.admin.model.SysDept;
@@ -174,7 +175,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {
                 return;
             }
-
+            //add by hxl  2024-04-09  添加赋值紫金能源车 鼎然-车辆风险评分
+            if (insAreaCompany.getUbiPredictedInfoScore()!=null && !"".equals(insAreaCompany.getUbiPredictedInfoScore())) {
+                insOrders.setUbiPredictedInfoScore(insAreaCompany.getUbiPredictedInfoScore());
+            }
             insOrders.setOrderstatus(orderStatus);
             LambdaQueryWrapper<InsOrders> insOrdersLambdaQueryWrapper = new LambdaQueryWrapper<>();
             insOrdersLambdaQueryWrapper.ne(InsOrders::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
@@ -348,82 +352,109 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
 
         }
+        Page<InsAreaCompany> page = PageRequest.buildPageRequest(orderQueryVo.getPageRequest());
+        Page<InsOrders> pendingAuditOrders = insAreaCompanyService.getPendingAuditOrders(page,orderQueryVo);
 
-        // 构造查询条件
-        LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotEmpty(orderQueryVo.getOrderNo()), InsOrders::getOrderno, orderQueryVo.getOrderNo())
-                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getDeptId()) && isTeamLeader, InsOrders::getDeptid,
-                        orderQueryVo.getDeptId())
-                .eq(StringUtils.isNotEmpty(orderQueryVo.getOrderStatus()), InsOrders::getOrderstatus,
-                        orderQueryVo.getOrderStatus())
-                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getFrameNo()), InsOrders::getFrameno,
-                        orderQueryVo.getFrameNo())
-                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getLicenseNo()), InsOrders::getLicenseno,
-                        orderQueryVo.getLicenseNo())
-                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getInsuredName()), InsOrders::getInsuredname,
-                        orderQueryVo.getInsuredName())
-                .between(!ObjectUtils.isEmpty(orderQueryVo.getStartDate()) && !ObjectUtils.isEmpty(orderQueryVo.getEndDate()),
-                        InsOrders::getCreatetime, orderQueryVo.getStartDate(), orderQueryVo.getEndDatePlusOneDay())
-                .orderBy(true, false, InsOrders::getCreatetime);
-
-
-        if (isCdy) {//如果是出单员查询时，只查自己的  与代客录单一致，查operatorid （手机前端userid传过来是出单用户，直接用该字段查询查operatorid）
-            wrapper.eq(StringUtils.isNotEmpty(orderQueryVo.getUserId()), InsOrders::getOperatorid,
-                    orderQueryVo.getUserId());
-        } else {
-            wrapper.eq(!isTeamLeader && StringUtils.isNotEmpty(orderQueryVo.getUserId()), InsOrders::getUserid,
-                    orderQueryVo.getUserId());
-        }
-
-        Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
-
-        if (StringUtils.isNotEmpty(orderQueryVo.getCompanyId())) {
-            List<InsAreaCompany> list = insAreaCompanyService.query().select("DISTINCT orderno").eq("company_id",
-                    orderQueryVo.getCompanyId()).list();
-            List<String> collect =
-                    list.stream().map(InsAreaCompany::getOrderno).distinct().collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                wrapper.in(InsOrders::getOrderno, collect);
-            }
-
-        }
-
-        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus()) && orderQueryVo.getAuditStatus().equals("1")) {
-            List<InsFeeAudit> list = insFeeAuditService.query().select("DISTINCT orderno").eq("auditstatus",
-                    orderQueryVo.getAuditStatus()).list();
-            List<String> collect = list.stream().map(InsFeeAudit::getOrderno).distinct().collect(Collectors.toList());
-            collect.add("");
-            wrapper.in(InsOrders::getOrderno, collect);
-        }
-
-        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus()) && orderQueryVo.getAuditStatus().equals("0")) {
-            List<InsFeeAudit> list =
-                    insFeeAuditService.query().select("DISTINCT orderno").eq("auditstatus", "1").list();
-            List<String> collect = list.stream().map(InsFeeAudit::getOrderno).distinct().collect(Collectors.toList());
-
-            if (!collect.isEmpty()) {
-                wrapper.notIn(InsOrders::getOrderno, collect);
-            }
-        }
-
-        //查出报价状态为 3
-        List<InsAreaCompany> insAreaCompanies = insAreaCompanyService.getorDerIds();
-//      新的费用订单表
-        if (insAreaCompanies.size() > 0) {
-            List<String> collect =
-                    insAreaCompanies.stream().map(insAreaCompany -> insAreaCompany.getOrderno()).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                wrapper.in(InsOrders::getOrderno, collect);
-            }
-        }
-
-        Page<InsOrders> insOrdersPage = page(page, wrapper);
-
-        return new BasePageResult<>(orderQueryVo.getPageNum(), page.getSize(), insOrdersPage.getTotal(),
-                page.getPages(),
-                insOrdersPage.getRecords());
+        return new BasePageResult<>(pendingAuditOrders.getCurrent(), page.getSize(), pendingAuditOrders.getTotal(),
+                pendingAuditOrders.getPages(),
+                pendingAuditOrders.getRecords());
     }
 
+//    @Override
+//    public BasePageResult<InsOrders> queryPageOrder(OrderQueryVo orderQueryVo) {
+//        // 领导标志
+//        boolean isTeamLeader = false;
+//        //是否出单员标志
+//        boolean isCdy = false;
+//        if (StringUtils.isNotEmpty(orderQueryVo.getUserId())) {
+//            SysUserRole userRole = sysUserRoleService.selectByUserId(orderQueryVo.getUserId());
+//
+//            if (Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString())) {
+//                //团队长可查询下面所有人员订单
+//                isTeamLeader = true;
+//            }
+//
+//            if (19 == userRole.getRoleId()) {
+//                isCdy = true;
+//            }
+//
+//        }
+//
+//        // 构造查询条件
+//        LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(StringUtils.isNotEmpty(orderQueryVo.getOrderNo()), InsOrders::getOrderno, orderQueryVo.getOrderNo())
+//                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getDeptId()) && isTeamLeader, InsOrders::getDeptid,
+//                        orderQueryVo.getDeptId())
+//                .eq(StringUtils.isNotEmpty(orderQueryVo.getOrderStatus()), InsOrders::getOrderstatus,
+//                        orderQueryVo.getOrderStatus())
+//                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getFrameNo()), InsOrders::getFrameno,
+//                        orderQueryVo.getFrameNo())
+//                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getLicenseNo()), InsOrders::getLicenseno,
+//                        orderQueryVo.getLicenseNo())
+//                .likeRight(StringUtils.isNotEmpty(orderQueryVo.getInsuredName()), InsOrders::getInsuredname,
+//                        orderQueryVo.getInsuredName())
+//                .between(!ObjectUtils.isEmpty(orderQueryVo.getStartDate()) && !ObjectUtils.isEmpty(orderQueryVo.getEndDate()),
+//                        InsOrders::getCreatetime, orderQueryVo.getStartDate(), orderQueryVo.getEndDatePlusOneDay())
+//                .orderBy(true, false, InsOrders::getCreatetime);
+//
+//
+//        if (isCdy) {//如果是出单员查询时，只查自己的  与代客录单一致，查operatorid （手机前端userid传过来是出单用户，直接用该字段查询查operatorid）
+//            wrapper.eq(StringUtils.isNotEmpty(orderQueryVo.getUserId()), InsOrders::getOperatorid,
+//                    orderQueryVo.getUserId());
+//        } else {
+//            wrapper.eq(!isTeamLeader && StringUtils.isNotEmpty(orderQueryVo.getUserId()), InsOrders::getUserid,
+//                    orderQueryVo.getUserId());
+//        }
+//
+//        Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
+//
+//        if (StringUtils.isNotEmpty(orderQueryVo.getCompanyId())) {
+//            List<InsAreaCompany> list = insAreaCompanyService.query().select("DISTINCT orderno").eq("company_id",
+//                    orderQueryVo.getCompanyId()).list();
+//            List<String> collect =
+//                    list.stream().map(InsAreaCompany::getOrderno).distinct().collect(Collectors.toList());
+//            if (!collect.isEmpty()) {
+//                wrapper.in(InsOrders::getOrderno, collect);
+//            }
+//
+//        }
+//
+//        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus()) && orderQueryVo.getAuditStatus().equals("1")) {
+//            List<InsFeeAudit> list = insFeeAuditService.query().select("DISTINCT orderno").eq("auditstatus",
+//                    orderQueryVo.getAuditStatus()).list();
+//            List<String> collect = list.stream().map(InsFeeAudit::getOrderno).distinct().collect(Collectors.toList());
+//            collect.add("");
+//            wrapper.in(InsOrders::getOrderno, collect);
+//        }
+//
+//        if (StringUtils.isNotEmpty(orderQueryVo.getAuditStatus()) && orderQueryVo.getAuditStatus().equals("0")) {
+//            List<InsFeeAudit> list =
+//                    insFeeAuditService.query().select("DISTINCT orderno").eq("auditstatus", "1").list();
+//            List<String> collect = list.stream().map(InsFeeAudit::getOrderno).distinct().collect(Collectors.toList());
+//
+//            if (!collect.isEmpty()) {
+//                wrapper.notIn(InsOrders::getOrderno, collect);
+//            }
+//        }
+//
+//        //查出报价状态为 3
+//        List<InsAreaCompany> insAreaCompanies = insAreaCompanyService.getorDerIds();
+////      新的费用订单表
+//        if (insAreaCompanies.size() > 0) {
+//            List<String> collect =
+//                    insAreaCompanies.stream().map(insAreaCompany -> insAreaCompany.getOrderno()).collect(Collectors.toList());
+//            if (!collect.isEmpty()) {
+//                wrapper.in(InsOrders::getOrderno, collect);
+//            }
+//        }
+//
+//        Page<InsOrders> insOrdersPage = page(page, wrapper);
+//
+//        return new BasePageResult<>(orderQueryVo.getPageNum(), page.getSize(), insOrdersPage.getTotal(),
+//                page.getPages(),
+//                insOrdersPage.getRecords());
+//    }
+
     /**
      * 订单信息导出excel
      *
@@ -645,6 +676,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         List<InsAreaCompanyQueryDto> insAreaCompanyQueryDtos = insAreaCompanyService.getByOrderNo(orderNo);
         List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos =
                 insAreaCompanyQueryDtos.stream().map(InsOrdersEditingVo.InsAreaCompanyEditingDto::new).collect(Collectors.toList());
+        //订单回显添加 紫金能源车（鼎然-车辆风险评分）
+        if(insAreaCompanyEditingDtos!=null && insAreaCompanyEditingDtos.size()>0){
+            for (InsOrdersEditingVo.InsAreaCompanyEditingDto insAreaCompanyEditingDto : insAreaCompanyEditingDtos) {
+                insAreaCompanyEditingDto.setUbiPredictedInfoScore(insOrders.getUbiPredictedInfoScore());
+            }
+        }
         insOrdersEditingVo.setInsAreaCompanyEditingDtos(insAreaCompanyEditingDtos);
         return insOrdersEditingVo;
     }

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

@@ -574,6 +574,16 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
                 Double.parseDouble(carShipTax.getLateFee()));
         List<TaxArrears> taxArrearsList = Collections.singletonList(taxArrears);
         insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(taxArrearsList)));
+        //add by hxl 2024-04-08 添加紫荆能源车的鼎然-车辆风险评分 返回前台
+        List<CalculatePremiumResponse.PriceInfoListDTO> priceInfoList = calculatePremiumResponse.getPriceInfoList();
+        if(priceInfoList!=null && priceInfoList.size()>0){
+            CalculatePremiumResponse.PriceInfoListDTO priceInfoListDTO = priceInfoList.get(0);
+            if(priceInfoListDTO.getUbiPredictedInfo()!=null && priceInfoListDTO.getUbiPredictedInfo().getScore()!=null &&  !"".equals(priceInfoListDTO.getUbiPredictedInfo().getScore())){
+                String score = priceInfoListDTO.getUbiPredictedInfo().getScore();
+                quoteRespVo.setUbiPredictedInfoScore(score);
+                insAreaCompany.setUbiPredictedInfoScore(score);
+            }
+        }
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(orderNo);
         //添加调用费用匹配功能

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -11,7 +11,6 @@ import com.ydtech.modules.protocols.entity.po.*;
 import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
 import com.ydtech.modules.protocols.entity.vo.AgreementProductCostsSave;
 import com.ydtech.modules.protocols.service.*;
-import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -128,9 +128,39 @@
             ins_area_company a
                 LEFT JOIN ins_fee_order_new b ON  a.id =b.ins_order_no
         WHERE
-            a.orderstatus = '3'
+            a.orderstatus = '3' or a.orderstatus = '2'
             and  b.id is not  null
     </select>
 
+    <select id="getPendingAuditOrders" resultType="com.ydtech.modules.order.entity.InsOrders">
+        SELECT
+            *
+        FROM
+            ins_orders
+        WHERE
+            orderno IN (
+            SELECT
+                orderno
+            FROM
+                ins_area_company
+            WHERE
+                    id IN ( SELECT ins_order_no FROM ins_fee_order_new WHERE ins_order_no IN ( SELECT id FROM ins_area_company WHERE orderstatus = 2 OR orderstatus = 3 ) UNION SELECT ins_order_no FROM ins_fee_audit )
+        )
+        <if test="params.orderNo != null and params.orderNo != ''">
+            AND orderno = #{params.orderNo}
+        </if>
+        <if test="params.licenseNo != null and params.licenseNo != ''">
+            AND license_no = #{params.licenseNo}
+        </if>
+        <if test="params.frameNo != null and params.frameNo != ''">
+            AND frame_no = #{params.frameNo}
+        </if>
+        <if test="params.insuredname != null and params.insuredname != ''">
+            AND insuredname = #{params.insuredname}
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            BETWEEN createtime = #{params.startDate} and #{params.endDate}
+        </if>
+    </select>
 
 </mapper>

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

@@ -179,6 +179,7 @@
                o.licenseno,
                o.insuredname,
                o.vehicle_and_vessel_tax,
+               o.ubi_predicted_info_score,
                iac.jq_start_date as jqstartdate,
                iac.jq_end_date   as jqenddate,
                iac.sy_start_date as systartdate,
@@ -246,7 +247,8 @@
                syenddate,
                risk,
                king,
-               vehicle_and_vessel_tax
+               vehicle_and_vessel_tax,
+               ubi_predicted_info_score
         from ins_orders
         where userid = #{userId, jdbcType=VARCHAR}
           and licenseno = #{licenseNo, jdbcType=VARCHAR}
@@ -384,7 +386,8 @@
         b.kindinfo,
         b.pay_date,
         b.signing_time,
-        b.cross_insurance
+        b.cross_insurance,
+        a.ubi_predicted_info_score
         FROM ins_orders a LEFT JOIN ins_area_company b on a.orderno = b.orderno
         WHERE
         1 = 1