报价费用审核 接口异常，无数据

订单审核	订单轨迹中操作人手机号改成操作人名称
订单审核	订单轨迹点开明细又出现英文了
平台应收	保险公司筛选项用分公司搜索保司没有筛出来

commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java

@@ -47,6 +47,9 @@ public class ReceivableQueryVo extends PageRequest {
     @Schema(description = "保险公司")
     private String companyId;
 
+    @Schema(description = "保险公司和保险机构列表")
+    private List<String> companyIds;
+
     @Schema(description = "签单时间开始时间")
     private String signingTimeStart;
 

commons/src/main/java/com/jzg/commons/entity/vo/OrdersTrackVo.java

@@ -1,15 +1,24 @@
 package com.jzg.commons.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
+
 @Data
 @Schema(description = "订单轨迹列表VO")
 public class OrdersTrackVo extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = 2737229802683155236L;
+
+    @Schema(description = "创建人姓名")
+    private String createByName;
+
+    @Schema(description = "更新人姓名")
+    private String updateByName;
+
     @Schema(description = "轨迹ID")
     private String id;
 

commons/src/main/java/com/jzg/commons/util/OrderComponents.java

@@ -14,6 +14,11 @@ public class OrderComponents {
         nameMap.put("costRatio.jqInletRatio","交强入口比例");
         nameMap.put("costRatio.jqKeepPointRatio","交强留点比例");
 
+
+        nameMap.put("insFeeOrders.jqExportRatio","交强出口比例");
+        nameMap.put("insFeeOrders.syExportRatio","商业出口比例");
+        nameMap.put("insFeeOrders.jyExportRatio","驾意出口比例");
+
         nameMap.put("costRatio.syExportRatio","商业出口比例");
         nameMap.put("costRatio.syFollowRatio","商业跟单比例");
         nameMap.put("costRatio.syInletRatio","商业入口比例");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -49,6 +49,7 @@ import com.jzg.quotation.summary.mapper.InsFeeAuditMapper;
 import com.jzg.quotation.summary.mapper.InsOrderRightsMapper;
 import com.jzg.quotation.summary.mapper.InsOrderRightsPackageMapper;
 import com.jzg.quotation.summary.service.*;
+import com.jzg.quotation.summary.service.userinfo.UserInfoService;
 import com.jzg.quotation.summary.state.AuditState;
 import com.jzg.quotation.summary.state.listener.AuditStateListener;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -121,6 +122,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     @Autowired
     InsOrdersCarInfoService insOrdersCarInfoService;
+    @Autowired
+    private UserInfoService userInfoService;
 
     @Autowired
     private AuditStateListener auditStateListener;
@@ -177,8 +180,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 //            feeAuditVo.setPartnerCompanySimplyName(allCompanyHierarchyPaths.get(Objects.toString(feeAuditVo.getPartnerCompanyId(),"")));
             feeAuditVo.setPartnerCompanySimplyName(feeAuditVo.getPartnerCompanyName());
             // auditUser 非空时，判断是名称还是手机号
-            feeAuditVo.setAuditUser(getUserNameByMobile(feeAuditVo.getAuditUser()));
-            feeAuditVo.setCreateBy(getUserNameByMobile(feeAuditVo.getCreateBy()));
+            feeAuditVo.setAuditUser(userInfoService.getUserNameByMobile(feeAuditVo.getAuditUser()));
+            feeAuditVo.setCreateBy(userInfoService.getUserNameByMobile(feeAuditVo.getCreateBy()));
 
             // 循环每条数据，查询 ins_fee_orders 并计算权益金额
             // 查询订单的 ins_fee_orders 数据
@@ -1220,36 +1223,4 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         return res.getRecords();
     }
 
-
-    /**
-     * 根据用户手机号查询名称
-     * @param mobile
-     * @return
-     */
-    private String getUserNameByMobile(String mobile) {
-        if (StringUtils.isNotBlank(mobile)) {
-            // 国内手机号正则：1开头，第二位3-9，共11位数字
-            String mobileRegex = "^1[3-9]\\d{9}$";
-            if (ReUtil.contains(mobileRegex, mobile)) {
-                // auditUser 是手机号：先从 sys_user 表根据 mobile 查询数据
-                HttpResult<SysUser> sysUserResult = orgClient.getUserOnlyIdByMobile(mobile);
-                if (sysUserResult != null && sysUserResult.isSuccess() && sysUserResult.getData() != null) {
-                    SysUser sysUser = sysUserResult.getData();
-                    String userName = sysUser.getUsername();
-                    // 如果 sys_user 的 username 字段是手机号，则再去 sys_user_jzg_info 根据 user_id 查询数据，展示 name
-                    if (StringUtils.isNotBlank(userName) && userName.matches(mobileRegex)) {
-                        HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfo(sysUser.getId());
-                        if (jzgInfoResult != null && jzgInfoResult.isSuccess() && jzgInfoResult.getData() != null
-                                && StringUtils.isNotBlank(jzgInfoResult.getData().getName())) {
-                            return jzgInfoResult.getData().getName();
-                        }
-                    } else if (StringUtils.isNotBlank(userName)) {
-                        // 如果 sys_user 的 username 是名称，则直接展示
-                        return userName;
-                    }
-                }
-            }
-        }
-        return StrUtil.EMPTY;
-    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersTrackServiceImpl.java → tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/orderstrack/InsOrdersTrackServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.summary.service.impl;
+package com.jzg.quotation.summary.service.impl.orderstrack;
 
 
 import cn.hutool.json.JSONUtil;
@@ -8,8 +8,10 @@ import com.jzg.commons.entity.orders.po.InsOrdersTrack;
 import com.jzg.commons.entity.vo.OrdersTrackVo;
 import com.jzg.quotation.summary.mapper.InsOrdersTrackMapper;
 import com.jzg.quotation.summary.service.InsOrdersTrackService;
+import com.jzg.quotation.summary.service.userinfo.UserInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,10 +27,21 @@ public class InsOrdersTrackServiceImpl extends ServiceImpl<InsOrdersTrackMapper,
 
     private static final Logger log = LoggerFactory.getLogger(InsOrdersTrackServiceImpl.class);
 
+    @Autowired
+    private UserInfoService userInfoService;
+
     @Override
     public List<OrdersTrackVo> list(OrdersTrackParam param) {
         log.info("查询订单轨迹：param=[{}]", JSONUtil.toJsonStr(param));
         List<OrdersTrackVo> ordersTrackVos = baseMapper.queryList(param);
+        for (OrdersTrackVo ordersTrackVo : ordersTrackVos) {
+            String createBy = ordersTrackVo.getCreateBy();
+            String updateBy =  ordersTrackVo.getUpdateBy();
+            String createByName = userInfoService.getUserNameByMobile(createBy);
+            String updateByName = userInfoService.getUserNameByMobile(updateBy);
+            ordersTrackVo.setCreateByName(createByName);
+            ordersTrackVo.setUpdateByName(updateByName);
+        }
         return ordersTrackVos;
     }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/userinfo/UserInfoServiceImpl.java

@@ -0,0 +1,52 @@
+package com.jzg.quotation.summary.service.impl.userinfo;
+
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.quotation.commons.client.OrgClient;
+import com.jzg.quotation.summary.service.userinfo.UserInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserInfoServiceImpl implements UserInfoService {
+
+
+    @Autowired
+    private OrgClient orgClient;
+
+    /**
+     * 根据用户手机号查询名称
+     * @param mobile
+     * @return
+     */
+    public String getUserNameByMobile(String mobile) {
+        if (StringUtils.isNotBlank(mobile)) {
+            // 国内手机号正则：1开头，第二位3-9，共11位数字
+            String mobileRegex = "^1[3-9]\\d{9}$";
+            if (ReUtil.contains(mobileRegex, mobile)) {
+                // auditUser 是手机号：先从 sys_user 表根据 mobile 查询数据
+                HttpResult<SysUser> sysUserResult = orgClient.getUserOnlyIdByMobile(mobile);
+                if (sysUserResult != null && sysUserResult.isSuccess() && sysUserResult.getData() != null) {
+                    SysUser sysUser = sysUserResult.getData();
+                    String userName = sysUser.getUsername();
+                    // 如果 sys_user 的 username 字段是手机号，则再去 sys_user_jzg_info 根据 user_id 查询数据，展示 name
+                    if (StringUtils.isNotBlank(userName) && userName.matches(mobileRegex)) {
+                        HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfo(sysUser.getId());
+                        if (jzgInfoResult != null && jzgInfoResult.isSuccess() && jzgInfoResult.getData() != null
+                                && StringUtils.isNotBlank(jzgInfoResult.getData().getName())) {
+                            return jzgInfoResult.getData().getName();
+                        }
+                    } else if (StringUtils.isNotBlank(userName)) {
+                        // 如果 sys_user 的 username 是名称，则直接展示
+                        return userName;
+                    }
+                }
+            }
+        }
+        return StrUtil.EMPTY;
+    }
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/userinfo/UserInfoService.java

@@ -0,0 +1,13 @@
+package com.jzg.quotation.summary.service.userinfo;
+
+public interface UserInfoService {
+
+
+    /**
+     * 根据用户手机号查询名称
+     *
+     * @param mobile
+     * @return
+     */
+     String getUserNameByMobile(String mobile);
+}

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -17,6 +17,7 @@ import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.commons.util.AssertionUtils;
+import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.service.ReceivableService;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
 import com.jzg.quotation.summary.constants.QuoteNumberConstant;
@@ -55,6 +56,8 @@ public class ReceivableController {
     private ReceivableService receivableService;
     @Autowired
     private BaseController baseController;
+    @Autowired
+    private EsmInsCompanyClient esmInsCompanyClient;
 
     // 拉取已审核订单
 //    @PostMapping("pullAuditedOrder")
@@ -484,7 +487,10 @@ public class ReceivableController {
             receivableQueryVo.setSigningTimeStart(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[0], DateTimeFormatter.ISO_DATE).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
             receivableQueryVo.setSigningTimeEnd(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[1], DateTimeFormatter.ISO_DATE).plusDays(1).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
         }
-
+        if(StrUtil.isNotEmpty(receivableQueryVo.getCompanyId())){
+            HttpResult<List<String>> listHttpResult = esmInsCompanyClient.queryOwnAndSubCompandyIds(receivableQueryVo.getCompanyId());
+            receivableQueryVo.setCompanyIds(listHttpResult.getData());
+        }
         receivableQueryVo.setSystemCode(baseController.getSystemCode());
         Page<InsPlyIncome> data = receivableService.getPlatFormReceivableList(receivableQueryVo);
         InsPlyIncomeVO vo = receivableService.getReceivablePageIds(receivableQueryVo);

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -377,9 +377,19 @@
         <if test="receivableQueryVo.licenseNo != null and receivableQueryVo.licenseNo != ''">
             AND ipi.license_no LIKE CONCAT('%', #{receivableQueryVo.licenseNo}, '%')
         </if>
-        <if test="receivableQueryVo.companyId != null and receivableQueryVo.companyId != ''">
-            AND (ipi.partner_company_id = #{receivableQueryVo.companyId} or ipi.company_id = #{receivableQueryVo.companyId})
-        </if>
+        <choose>
+            <when  test="receivableQueryVo.companyIds != null and receivableQueryVo.companyIds.size() > 0">
+                AND ipi.partner_company_id in
+                <foreach collection="receivableQueryVo.companyIds" item="companyId" open="(" close=")" separator=",">
+                    #{companyId}
+                </foreach>
+            </when>
+            <otherwise>
+                <if test="receivableQueryVo.companyId != null and receivableQueryVo.companyId != ''">
+                    AND (ipi.partner_company_id = #{receivableQueryVo.companyId} or ipi.company_id = #{receivableQueryVo.companyId})
+                </if>
+            </otherwise>
+        </choose>
         <if test="receivableQueryVo.businessSource != null and receivableQueryVo.businessSource != ''">
             AND ipi.business_source = #{receivableQueryVo.businessSource}
         </if>