Просмотр исходного кода

保险公司列表按照中文名称进行排序

lipf 5 месяцев назад
Родитель
Сommit
5f4a4c3833

+ 8 - 4
platform/src/main/java/com/jzg/controller/EsmInsCompanyController.java

@@ -33,10 +33,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.text.Collator;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -333,6 +331,12 @@ public class EsmInsCompanyController extends BaseController {
             }
         }
         List<EsmInsCompanyResVo> esmInsCompanyResVos = BeanUtil.copyToList(list, EsmInsCompanyResVo.class);
+        // modify by lipf, 2026年4月16日17:44:27 对结果进行优化,按照中文进行排序
+        // 1. 获取中文 Collator 实例
+        Collator collator = Collator.getInstance(Locale.CHINA);
+        // 2. 使用 Comparator.comparing 进行排序
+        // 升序 (A-Z)
+        esmInsCompanyResVos.sort(Comparator.comparing(EsmInsCompanyResVo::getNameSimple, collator));
         return HttpResult.ok(esmInsCompanyResVos);
     }
 

+ 5 - 4
platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -585,8 +585,10 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         SysSystemBusPerms sysSystemBusPerms = sysSystemBusPermsMapper.selectOne(new LambdaQueryWrapper<SysSystemBusPerms>()
                 .eq(SysSystemBusPerms::getSystemCode, systemCode));
 
+        if(Objects.isNull(sysSystemBusPerms)){
+            log.info("租户[{}]不存在租户功能配置,请到【平台系统】-【租户管理】-【租户权限】页面进行配置-",systemCode);
+        }
         AssertionUtils.isFail(Objects.isNull(sysSystemBusPerms),"该租户不存在租户功能配置");
-
         List<SysSystemBusPermsLink> sysSystemBusPermsLinks = sysSystemBusPermsLinkMapper.selectList(new LambdaQueryWrapper<SysSystemBusPermsLink>()
                 .eq(SysSystemBusPermsLink::getPermsId, sysSystemBusPerms.getId()));
         return new SysSystemBusPermsVo(sysSystemBusPerms,sysSystemBusPermsLinks);
@@ -608,9 +610,8 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         if(busPerms.getQuoteCompany() == 2){
             companyIds = busPerms.getQuoteCompanyList();
         }
-        List<EsmInsCompany> companyList = new ArrayList<>();
-        companyList = baseMapper.getCompanyList(companyIds);
-        log.info("租户代码[{}]匹配到保险公司[{}]个。",systemCode, CollUtil.size(companyList));
+        List<EsmInsCompany> companyList = baseMapper.getCompanyList(companyIds);
+        log.info("租户代码[{}]匹配到有报价权限的保险公司[{}]个。",systemCode, CollUtil.size(companyList));
         //log.debug("匹配到的保险公司分别是[{}]", JSONUtil.toJsonStr(companyList));
         // 根据用户权限获取 可使用的协议
         List<String> companyIdList = companyList.stream().map(EsmInsCompany::getId).collect(Collectors.toList());

+ 4 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -347,7 +347,10 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         AssertionUtils.isFail(companyListResult.getCode() != 200, companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
         log.info("根据权限获取到的保司个数是[{}].systemCode=[{}],systemCode=[{}]", CollUtil.size(companyList),systemCode,systemCode);
-        AssertionUtils.isFail(companyList.isEmpty(), "没有可报价的保险公司");
+        if(CollUtil.isEmpty(companyList)){
+            log.info("租户[{}]没有可报价的保险公司,请到平台系统的【租户管理】-【功能配置】页面进行配置并且查看对应公司的协议,费用是否维护好",systemCode);
+            AssertionUtils.isFail(companyList.isEmpty(), "没有可报价的保险公司");
+        }
         //根据基本规则 能源、车辆类型、使用性质获取方案
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
                 .eq(PtlScheme::getEnergyType, schemeRuleFilterVo.getCarInfo().getEnergyTypeCode())