修改转续保查询问题

src/main/java/com/ydtech/constants/enums/dict/insurance/Renewal.java

@@ -3,9 +3,12 @@ package com.ydtech.constants.enums.dict.insurance;
 
 import com.ydtech.aop.request.DictEnum;
 import com.ydtech.constants.enums.dict.IBaseEnum;
+import com.ydtech.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Optional;
+
 
 /**
  * @description: 是否续保
@@ -30,4 +33,12 @@ public enum Renewal implements IBaseEnum {
     // 状态  0 启用  1 不启用
     private final Integer status;
 
+    public static String getRenewal(String renewal) {
+        if (StringUtils.isEmpty(renewal)) {
+            return "";
+        }
+        return Optional.of(Enum.valueOf(Renewal.class, "R_" + renewal)).map(Renewal::getDesc).orElse("");
+    }
+
+
 }

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

@@ -35,6 +35,9 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 public class InsAreaCompany implements Serializable {
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = -6827009009645748787L;
     /**
      * 主键
      */
@@ -343,17 +346,6 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "sy_adjust_rate")
     private double syAdjustRate;
 
-    /**
-     * 业务员
-     */
-    @TableField(exist = false)
-    private String userName;
-
-    /**
-     * 业务员ID
-     */
-    @TableField(exist = false)
-    private String userId;
 
     @TableField(value = "inside_order_status")
     private Integer insideOrderStatus;
@@ -361,9 +353,6 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "inside_pay_time")
     private String insidePayTime;
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
     /**
      * 紫金能源车（鼎然-车辆风险评分  add by hxl 2024-04-09
      */
@@ -412,13 +401,6 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "new_operator_name")
     private String newOperatorName;
 
-
-    /**
-     * 非车信息
-     */
-    @TableField(exist = false)
-    private InsAreaCompanyAccidentalDriving accidentalDriving;
-
     /**
      *  报价成功或者失败状态
      */
@@ -465,6 +447,24 @@ public class InsAreaCompany implements Serializable {
     @TableField("sy_claims")
     private String syClaims;
 
+    /**
+     * 非车信息
+     */
+    @TableField(exist = false)
+    private InsAreaCompanyAccidentalDriving accidentalDriving;
+
+    /**
+     * 业务员
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 业务员ID
+     */
+    @TableField(exist = false)
+    private String userId;
+
 
     public InsAreaCompany(QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
         this.id = IdGenerate.nextId();

src/main/java/com/ydtech/modules/order/entity/vo/ya/YaExtendInfoDto.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.order.entity.vo.ya;
 
+import com.ydtech.constants.enums.dict.insurance.Renewal;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,7 +36,7 @@ public class YaExtendInfoDto implements Serializable {
     private String deepPriceGradeCI;
 
     /**
-     *  临时增加
+     * 临时增加
      *
      * @author: lig
      * @date: 2023年10月10日 0010
@@ -79,11 +81,39 @@ public class YaExtendInfoDto implements Serializable {
     private String syClaims;
 
     /**
-     *  临时增加
+     * 临时增加
      *
      * @author: lig
      * @date: 2023年10月10日 0010
      */
     @ApiModelProperty("出险信息")
     private String accidentInfoStr;
+
+
+    public void setInsAreaCompany(InsAreaCompany insAreaCompany) {
+        //保费因素
+        this.accidentInfoStr = insAreaCompany.getAccidentStrInfo();
+        //评分
+        this.score = insAreaCompany.getScore();
+        this.jqScore = insAreaCompany.getJqScore();
+        this.syScore = insAreaCompany.getSyScore();
+        //赔付率
+        this.lossRation = String.valueOf(insAreaCompany.getLossRation());
+        this.jqLossRation = String.valueOf(insAreaCompany.getJqLossRation());
+        this.syLossRation = String.valueOf(insAreaCompany.getSyLossRation());
+        //折扣率
+        this.totalAdjustRate = insAreaCompany.getTotalAdjustRate();
+        this.jqAdjustRate = insAreaCompany.getJqAdjustRate();
+        this.syAdjustRate = insAreaCompany.getSyAdjustRate();
+        // 续保
+        String renewalJq = Renewal.getRenewal(insAreaCompany.getJqRenewal());
+        this.jqRenewal = renewalJq;
+        String renewalSy = Renewal.getRenewal(insAreaCompany.getSyRenewal());
+        this.syRenewal = renewalSy;
+
+        // 出险次数
+        this.jqClaims = insAreaCompany.getJqClaims();
+        this.syClaims = insAreaCompany.getSyClaims();
+    }
+
 }

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

@@ -368,26 +368,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @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;
-            }
-
-        }
         Page<InsAreaCompany> page = PageRequest.buildPageRequest(orderQueryVo.getPageRequest());
-
-        Page<InsOrders> resultOrders = new Page<>();
+        Page<InsOrders> resultOrders;
 
         //查询未审核
         if(orderQueryVo.getAuditStatus() == null)
@@ -408,100 +390,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 resultOrders.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
@@ -688,62 +576,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
         }
         InsAreaCompany iac = insAreaCompanyService.getById(companyId);
-        //保费因素
-        yaExtendInfoDto.setAccidentInfoStr(iac.getAccidentStrInfo());
-        //评分
-        yaExtendInfoDto.setScore(iac.getScore());
-        yaExtendInfoDto.setJqScore(iac.getJqScore());
-        yaExtendInfoDto.setSyScore(iac.getSyScore());
-        //赔付率
-        yaExtendInfoDto.setLossRation(String.valueOf(iac.getLossRation()));
-        yaExtendInfoDto.setJqLossRation(String.valueOf(iac.getJqLossRation()));
-        yaExtendInfoDto.setSyLossRation(String.valueOf(iac.getSyLossRation()));
-        //折扣率
-        yaExtendInfoDto.setTotalAdjustRate(iac.getTotalAdjustRate());
-        yaExtendInfoDto.setJqAdjustRate(iac.getJqAdjustRate());
-        yaExtendInfoDto.setSyAdjustRate(iac.getSyAdjustRate());
-        // 续保
-        yaExtendInfoDto.setJqRenewal(iac.getJqRenewal());
-        yaExtendInfoDto.setSyRenewal(iac.getSyRenewal());
-        // 出险次数
-        yaExtendInfoDto.setJqClaims(iac.getJqClaims());
-        yaExtendInfoDto.setSyClaims(iac.getSyClaims());
-
+        yaExtendInfoDto.setInsAreaCompany(iac);
         orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
-
         orderAndAreaCompany.setReptxt(null);
 
-        //新增费用明细信息
-//        QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
         //查询费用信息
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
                 .eq(InsFeeOrderNew::getInsOrderNo, companyId));
-//        orderAndAreaCompany.setOrderCommissionVo(queryOrderFeeVo.getOrderCommissionVo());
-//        orderAndAreaCompany.setAdjustFeeDescVo(queryOrderFeeVo.getAdjustFeeDescVo());
-        boolean isShowOrderFee = false;
-        //如果是财务菜单进入的，不再进行权限控制，所有都可查看
-//        if ("accountingUser".equals(userId)) {
-//            isShowOrderFee = true;
-//        } else {
-//            //判断当前登录人员是否为后线人员，来决定是否返回总费用详情信息
-//            List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId, "22");
-//            if (userList != null && !userList.isEmpty()) {
-//                isShowOrderFee = true;
-//            }
-//        }
-//        if (isShowOrderFee) {
-//            List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(queryOrderFeeVo);
-//            if (!orderFeeVoList.isEmpty()) {
-//                orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-//            }
-//        }
+
         if (!Objects.isNull(insFeeOrderNew)) {
             PtlAgreementProductCostsNew ptlAgreementProductCostsNew =
                     ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-//            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
-//            orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
             FeeOrderNewVo feeOrderNewVo = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew, ptlAgreementProductCostsNew);
             feeOrderNewVo.setFeeId(insFeeOrderNew.getId());
             orderAndAreaCompany.setFeeOrderNewVo(feeOrderNewVo);
@@ -915,8 +760,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public BasePageResult<InsOrders> queryPageOrderByLinkType(OrderQueryVo orderQueryVo, int type) {
-
-        //orderQueryVo.setUserId("admin");
         //添加收回按钮的操作
         Boolean flag=false;
         Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
@@ -925,33 +768,23 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         List<String> agreeIds = new ArrayList<>();
         List<String> deptIds= new ArrayList<>();
         //角色为需要查询下级的用户
-        List<String> roleIds = Arrays.asList(SystemConstant.getSysRoleTeamLeader());
         if (type == 1) {
             //渠道
             //查询用户表中的信息为领带id为用户id的数据
-            //List<SysUserBaseVO> allUsersByLeaderId = sysUserMapper.getAllUsersByLeaderId(orderQueryVo.getUserId());
             agentUserIds = sysUserService.getUserIdsByLeaderId(orderQueryVo.getUserId());
             //查询下级
-           // if (allUsersByLeaderId != null && allUsersByLeaderId.size() > 0) {
-           //     for (SysUserBaseVO sysUserBaseVO : allUsersByLeaderId) {
-            //        agentUserIds.add(sysUserBaseVO.getUserId());
-           //     }
-           // }
-            //查询团队长的机构ids
-            //deptIds= sysUserMapper.getDeptIdsByUserIds(orderQueryVo.getUserId());
         } else if (type == 2) {
             //查询所有的代理人
-            //agentUserIds = sysUserMapper.getAgentUserIds();
             //查询绑定的区域的代理人信息
             List<String> areaCodes = sysUserLinkAreaMapper.findAreaCodeByUserId(orderQueryVo.getUserId());
-            if(areaCodes!=null && areaCodes.size()>0){
+            if(areaCodes!=null && !areaCodes.isEmpty()){
                 agentUserIds =sysUserLinkAreaMapper.findAreaIdsByAgentUserId(orderQueryVo.getUserId(),areaCodes);
             }
         } else if (type == 3) {
             //查询用户关联的协议
             List<SysUserLinkPtlAgreementDto> ptlAgreementListByUserIds =
                     sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserId(orderQueryVo.getUserId());
-            if (ptlAgreementListByUserIds != null && ptlAgreementListByUserIds.size() > 0) {
+            if (ptlAgreementListByUserIds != null && !ptlAgreementListByUserIds.isEmpty()) {
                 for (SysUserLinkPtlAgreementDto sysUserLinkPtlAgreementDto : ptlAgreementListByUserIds) {
                     agreeIds.add(sysUserLinkPtlAgreementDto.getPtlAgreement().getId());
                 }
@@ -960,8 +793,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         Long total = 0l;
         Page<InsOrders> orderVoPage = new Page<>();
         //注释逻辑给前台返回数据
-        if((agentUserIds!=null && agentUserIds.size()>0) || (agreeIds!=null && agreeIds.size()>0)){
-            //List<String> deptIds= sysUserMapper.getDeptIdsByRoleIdsAndUserIds(agentUserIds,roleIds);
+        if((agentUserIds!=null && !agentUserIds.isEmpty()) || (agreeIds!=null && !agreeIds.isEmpty())){
             orderVoPage = baseMapper.queryPageOrderByLinkType(page, orderQueryVo, agentUserIds, agreeIds,deptIds,flag);
             total = baseMapper.queryPageOrderByLinkTypeCount(orderQueryVo, agentUserIds, agreeIds,deptIds,flag);
         }
@@ -1029,7 +861,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 orderAndAreaCompany.setReferrerDeptName(sysDept!=null?sysDept.getName():null);
                 orderAndAreaCompany.setReferrerDeptAreaInfo(sysDeptService.queryBelongArea(referrerUser.getDeptId()));
             }
-
         }
 
         //计算今年应缴税
@@ -1053,56 +884,20 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
         }
         InsAreaCompany iac = insAreaCompanyService.getById(companyId);
-        //保费因素
-        yaExtendInfoDto.setAccidentInfoStr(iac.getAccidentStrInfo());
-        //评分
-        yaExtendInfoDto.setScore(iac.getScore());
-        yaExtendInfoDto.setJqScore(iac.getJqScore());
-        yaExtendInfoDto.setSyScore(iac.getSyScore());
-        //赔付率
-        yaExtendInfoDto.setLossRation(String.valueOf(iac.getLossRation()));
-        yaExtendInfoDto.setJqLossRation(String.valueOf(iac.getJqLossRation()));
-        yaExtendInfoDto.setSyLossRation(String.valueOf(iac.getSyLossRation()));
-        //折扣率
-        yaExtendInfoDto.setTotalAdjustRate(iac.getTotalAdjustRate());
-        yaExtendInfoDto.setJqAdjustRate(iac.getJqAdjustRate());
-        yaExtendInfoDto.setSyAdjustRate(iac.getSyAdjustRate());
-
+        yaExtendInfoDto.setInsAreaCompany(iac);
         orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
-
         orderAndAreaCompany.setReptxt(null);
 
-        //新增费用明细信息
-//        QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
         //查询费用信息
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
                 .eq(InsFeeOrderNew::getInsOrderNo, companyId));
-//        orderAndAreaCompany.setOrderCommissionVo(queryOrderFeeVo.getOrderCommissionVo());
-//        orderAndAreaCompany.setAdjustFeeDescVo(queryOrderFeeVo.getAdjustFeeDescVo());
-        boolean isShowOrderFee = false;
         //如果是财务菜单进入的，不再进行权限控制，所有都可查看
-//        if ("accountingUser".equals(userId)) {
-//            isShowOrderFee = true;
-//        } else {
-//            //判断当前登录人员是否为后线人员，来决定是否返回总费用详情信息
-//            List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId, "22");
-//            if (userList != null && !userList.isEmpty()) {
-//                isShowOrderFee = true;
-//            }
-//        }
-//        if (isShowOrderFee) {
-//            List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(queryOrderFeeVo);
-//            if (!orderFeeVoList.isEmpty()) {
-//                orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-//            }
-//        }
+
         if (!Objects.isNull(insFeeOrderNew)) {
             PtlAgreementProductCostsNew ptlAgreementProductCostsNew =
                     ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-//            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
-//            orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
             FeeOrderNewVo feeOrderNewVo = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew, ptlAgreementProductCostsNew);
             feeOrderNewVo.setFeeId(insFeeOrderNew.getId());
             orderAndAreaCompany.setFeeOrderNewVo(feeOrderNewVo);
@@ -1123,7 +918,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
         }
         //查询费用审核状态
-        List<InsFeeAudit> feeAuditList = insFeeAuditService.query().eq("ins_order_no", companyId).list();
+        List<InsFeeAudit> feeAuditList = insFeeAuditService.lambdaQuery().eq(InsFeeAudit::getInsOrderNo, companyId).list();
         if (feeAuditList != null && !feeAuditList.isEmpty()) {
             orderAndAreaCompany.setFeeStatus(feeAuditList.get(0).getAuditstatus());
         }