1.app开关

2.方案配置驾意险按照座位数排序

src/main/java/com/ydtech/modules/admin/constants/SwitchConfig.java

@@ -34,7 +34,9 @@ public enum SwitchConfig {
     WCQCA_02("weComQRCodeChannel", "企业微信二维码显示（渠道）"),
     WCQCA_03("weComQRCodeOther", "企业微信二维码显示（其他）"),
     //余额提现控制
-    YETX_01("balanceExtract","提现控制（线上或线下）")
+    YETX_01("balanceExtract","提现控制（线上或线下）"),
+
+    APP_UNDEVELOPED("appUndeveloped", "app未开发完功能隐藏"),
     ;
 
 

src/main/java/com/ydtech/modules/admin/controller/SysSwitchConfigController.java

@@ -50,5 +50,11 @@ public class SysSwitchConfigController {
         return HttpResult.ok();
     }
 
+    @GetMapping("/appUndeveloped/display")
+    @ApiOperation(value = "app未开发完功能隐藏")
+    public HttpResult<Boolean> appUndeveloped() {
+        boolean display = sysSwitchConfigService.appUndeveloped();
+        return HttpResult.ok(display);
+    }
 
 }

src/main/java/com/ydtech/modules/admin/service/SysSwitchConfigService.java

@@ -105,5 +105,9 @@ public interface SysSwitchConfigService extends BaseIService<SysSwitchConfig> {
      */
     boolean getBalanceExtractStatus();
 
-
+    /**
+     * app未开发完功能隐藏
+     * @return
+     */
+    boolean appUndeveloped();
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysSwitchConfigServiceImpl.java

@@ -197,6 +197,12 @@ public class SysSwitchConfigServiceImpl extends ServiceImpl<SysSwitchConfigMappe
         }
         return false;
     }
+
+    @Override
+    public boolean appUndeveloped() {
+        return isEnabled(SwitchConfig.APP_UNDEVELOPED.getCode());
+    }
+
 }
 
 

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

@@ -11,6 +11,7 @@ import org.springframework.util.ObjectUtils;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @ApiModel("订单查询Vo")
@@ -130,8 +131,11 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "起保结束时间")
     private String attachEndDateStr;
 
+    /**
+     * @see com.ydtech.modules.admin.constants.ManagementSource
+     */
     @ApiModelProperty(value = "机构来源")
-    private String managementSource;
+    private List<String> managementSource;
 
     @ApiModelProperty(value = "签单开始时间")
     private String signStartDateStr;

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

@@ -2387,9 +2387,6 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 records.get(i).setNoCarExportRadioLevel5(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5().toString());
             }
         }
-        pages.getRecords().stream().forEach(x -> {
-
-        });
         return pages;
     }
 

src/main/java/com/ydtech/modules/scheme/service/impl/PtlSchemeServiceImpl.java

@@ -20,6 +20,7 @@ import com.ydtech.modules.scheme.dao.PtlSchemeMapper;
 import com.ydtech.modules.scheme.entity.po.*;
 import com.ydtech.modules.scheme.entity.vo.*;
 import com.ydtech.modules.scheme.service.*;
+import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,26 +62,29 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     /**
      * 获取所有不是外部订单的保险公司
+     *
      * @param page
      * @return
      */
-    public Page<EsmInsCompany> getAllCompany(Page page, SchemeQueryVo schemeQueryVo){
-        return baseMapper.getAllCompany(page,schemeQueryVo);
+    public Page<EsmInsCompany> getAllCompany(Page page, SchemeQueryVo schemeQueryVo) {
+        return baseMapper.getAllCompany(page, schemeQueryVo);
     }
 
     /**
      * 获取方案列表
+     *
      * @param page
      * @param schemeQueryVo
      * @return
      */
     @Override
     public Page<PtlScheme> getSchemeList(Page page, SchemeQueryVo schemeQueryVo) {
-        return  baseMapper.getSchemeList(page,schemeQueryVo);
+        return baseMapper.getSchemeList(page, schemeQueryVo);
     }
 
     /**
      * 添加方案
+     *
      * @param schemeSaveVo
      * @return
      */
@@ -106,8 +110,8 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 List<PtlSchemeInsurance> insurances = new ArrayList<>();
                 List<KindInfoVo> kinds = new ArrayList<>();
                 item.getKinds().forEach(kindInfoVo -> {
-                    if(kindInfoVo.getKindCode().equals("TY2") || kindInfoVo.getKindCode().equals("TY3") || kindInfoVo.getKindCode().equals("TY4")){
-                        if(((int)kindInfoVo.getAmount()) != 0) {
+                    if (kindInfoVo.getKindCode().equals("TY2") || kindInfoVo.getKindCode().equals("TY3") || kindInfoVo.getKindCode().equals("TY4")) {
+                        if (((int) kindInfoVo.getAmount()) != 0) {
                             PtlSchemeInsurance insurance = new PtlSchemeInsurance();
                             insurance.setId(IdGenerate.nextId());
                             insurance.setSchemeId(scheme.getId());
@@ -115,7 +119,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                             insurance.setMax((int) (kindInfoVo.getAmount()));
                             insurances.add(insurance);
                         }
-                    }else {
+                    } else {
                         InsBusinessInsuranceOption insBusinessInsuranceOption = kindInfoVo.getAmtList().stream().filter(x ->
                                 x.getValue().compareTo(kindInfoVo.getAmount()) == 0 && x.getValue().compareTo(Double.NaN) != 0
                         ).findFirst().orElse(null);
@@ -140,19 +144,19 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                     drivingIntention.getList().forEach(l -> {
                         PtlSchemeInsuranceDrivingIntention dDrvingIntention = new PtlSchemeInsuranceDrivingIntention();
                         if (l.getIsMultiple() == 0) {
-                            if(l.getDrivingIntentionId() != null && !l.getDrivingIntentionId().equals("")) {
+                            if (l.getDrivingIntentionId() != null && !l.getDrivingIntentionId().equals("")) {
                                 dDrvingIntention.setId(IdGenerate.nextId());
                                 dDrvingIntention.setSchemeId(scheme.getId());
                                 dDrvingIntention.setSeatNum(l.getSeatNum());
                                 dDrvingIntention.setQuantity(l.getQuantity());
                                 dDrvingIntention.setDrivingIntentionId(l.getDrivingIntentionId());
                                 dDrvingIntention.setGroupId(groupId);
-                                if(!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
+                                if (!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
                                     dDrvingIntention.setAlias(l.getAlias());
-                                }else{
+                                } else {
                                     List<InsDrivingIntentionInsurance> allInsurance = new ArrayList<>();
                                     l.getDrvingList().forEach(x -> {
-                                        if(!x.getInsDrivingIntentionInsurances().isEmpty()){
+                                        if (!x.getInsDrivingIntentionInsurances().isEmpty()) {
                                             allInsurance.addAll(x.getInsDrivingIntentionInsurances());
                                         }
                                         allInsurance.add(x);
@@ -163,7 +167,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                                 drivingIntentions.add(dDrvingIntention);
                             }
                         } else {
-                            if(l.getDrivingIntentionIds() != null && l.getDrivingIntentionIds().size() > 0) {
+                            if (l.getDrivingIntentionIds() != null && l.getDrivingIntentionIds().size() > 0) {
                                 l.getDrivingIntentionIds().forEach(id -> {
                                     dDrvingIntention.setId(IdGenerate.nextId());
                                     dDrvingIntention.setSchemeId(scheme.getId());
@@ -171,12 +175,12 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                                     dDrvingIntention.setGroupId(groupId);
                                     dDrvingIntention.setQuantity(l.getQuantity());
                                     dDrvingIntention.setDrivingIntentionId(l.getDrivingIntentionId());
-                                    if(!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
+                                    if (!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
                                         dDrvingIntention.setAlias(l.getAlias());
-                                    }else{
+                                    } else {
                                         List<InsDrivingIntentionInsurance> allInsurance = new ArrayList<>();
                                         l.getDrvingList().forEach(x -> {
-                                            if(!x.getInsDrivingIntentionInsurances().isEmpty()){
+                                            if (!x.getInsDrivingIntentionInsurances().isEmpty()) {
                                                 allInsurance.addAll(x.getInsDrivingIntentionInsurances());
                                             }
                                             allInsurance.add(x);
@@ -194,7 +198,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             });
 
             return true;
-        }catch (Exception e){
+        } catch (Exception e) {
             System.out.printf(e.getMessage());
             return false;
         }
@@ -202,12 +206,13 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     /**
      * 更新方案
+     *
      * @param schemeSaveVo
      * @return
      */
     @Override
     @Transactional
-    public boolean updateScheme(SchemeSaveVo schemeSaveVo){
+    public boolean updateScheme(SchemeSaveVo schemeSaveVo) {
 
         //删除方案信息
         List<String> schemeIds = schemeSaveVo.getProductList().stream().map(x -> x.getId()).collect(Collectors.toList());
@@ -221,15 +226,15 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         //删除方案
         this.remove(new LambdaQueryWrapper<PtlScheme>()
-                .in(PtlScheme::getId,list.stream().map(x->x.getId()).collect(Collectors.toList())));
+                .in(PtlScheme::getId, list.stream().map(x -> x.getId()).collect(Collectors.toList())));
 
         //删除商业险种信息
         ptlSchemeInsuranceService.remove(new LambdaQueryWrapper<PtlSchemeInsurance>()
-                .in(PtlSchemeInsurance::getSchemeId,list.stream().map(x->x.getId()).collect(Collectors.toList())));
+                .in(PtlSchemeInsurance::getSchemeId, list.stream().map(x -> x.getId()).collect(Collectors.toList())));
 
         //删除驾意险信息
         ptlSchemeInsuranceDrivingIntentionService.remove(new LambdaQueryWrapper<PtlSchemeInsuranceDrivingIntention>()
-                .in(PtlSchemeInsuranceDrivingIntention::getSchemeId,list.stream().map(x->x.getId()).collect(Collectors.toList())));
+                .in(PtlSchemeInsuranceDrivingIntention::getSchemeId, list.stream().map(x -> x.getId()).collect(Collectors.toList())));
 
 
         schemeSaveVo.getProductList().forEach(item -> {
@@ -251,7 +256,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             List<PtlSchemeInsurance> insurances = new ArrayList<>();
             List<KindInfoVo> kinds = new ArrayList<>();
             item.getKinds().forEach(kindInfoVo -> {
-                if(kindInfoVo.getAmount() != 0) {
+                if (kindInfoVo.getAmount() != 0) {
                     if (kindInfoVo.getKindCode().equals("TY2") || kindInfoVo.getKindCode().equals("TY3") || kindInfoVo.getKindCode().equals("TY4")) {
                         PtlSchemeInsurance insurance = new PtlSchemeInsurance();
                         insurance.setId(IdGenerate.nextId());
@@ -282,22 +287,22 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
                 String groupId = IdGenerate.nextId();
                 drivingIntention.getList().forEach(l -> {
-                    if(l.getDrivingIntentionId() != null && !l.getDrivingIntentionId().equals("")) {
+                    if (l.getDrivingIntentionId() != null && !l.getDrivingIntentionId().equals("")) {
                         PtlSchemeInsuranceDrivingIntention dDrvingIntention = new PtlSchemeInsuranceDrivingIntention();
                         if (l.getIsMultiple() == 0) {
-                            if(l.getDrivingIntentionId() != null && !l.getDrivingIntentionId().equals("")) {
+                            if (l.getDrivingIntentionId() != null && !l.getDrivingIntentionId().equals("")) {
                                 dDrvingIntention.setId(IdGenerate.nextId());
                                 dDrvingIntention.setSchemeId(scheme.getId());
                                 dDrvingIntention.setSeatNum(l.getSeatNum());
                                 dDrvingIntention.setQuantity(l.getQuantity());
                                 dDrvingIntention.setDrivingIntentionId(l.getDrivingIntentionId());
                                 dDrvingIntention.setGroupId(groupId);
-                                if(!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
+                                if (!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
                                     dDrvingIntention.setAlias(l.getAlias());
-                                }else{
+                                } else {
                                     List<InsDrivingIntentionInsurance> allInsurance = new ArrayList<>();
                                     l.getDrvingList().forEach(x -> {
-                                        if(x.getInsDrivingIntentionInsurances()!= null && !x.getInsDrivingIntentionInsurances().isEmpty()){
+                                        if (x.getInsDrivingIntentionInsurances() != null && !x.getInsDrivingIntentionInsurances().isEmpty()) {
                                             allInsurance.addAll(x.getInsDrivingIntentionInsurances());
                                         }
                                         allInsurance.add(x);
@@ -309,19 +314,19 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                                 drivingIntentions.add(dDrvingIntention);
                             }
                         } else {
-                            if(l.getDrivingIntentionIds()!=null && l.getDrivingIntentionIds().size()>0) {
+                            if (l.getDrivingIntentionIds() != null && l.getDrivingIntentionIds().size() > 0) {
                                 l.getDrivingIntentionIds().forEach(id -> {
                                     dDrvingIntention.setId(IdGenerate.nextId());
                                     dDrvingIntention.setSchemeId(scheme.getId());
                                     dDrvingIntention.setSeatNum(l.getSeatNum());
                                     dDrvingIntention.setGroupId(groupId);
                                     dDrvingIntention.setQuantity(l.getQuantity());
-                                    if(!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
+                                    if (!Objects.isNull(l.getAlias()) && !l.getAlias().equals("")) {
                                         dDrvingIntention.setAlias(l.getAlias());
-                                    }else{
+                                    } else {
                                         List<InsDrivingIntentionInsurance> allInsurance = new ArrayList<>();
                                         l.getDrvingList().forEach(x -> {
-                                            if(!x.getInsDrivingIntentionInsurances().isEmpty()){
+                                            if (!x.getInsDrivingIntentionInsurances().isEmpty()) {
                                                 allInsurance.addAll(x.getInsDrivingIntentionInsurances());
                                             }
                                             allInsurance.add(x);
@@ -344,18 +349,19 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     /**
      * 获取方案详情
+     *
      * @param companyId
      * @return
      */
     @Override
-    public SchemeSaveVo getSchemeInfo(String companyId,String productId,String vehicleType,String energyType,String carnature){
+    public SchemeSaveVo getSchemeInfo(String companyId, String productId, String vehicleType, String energyType, String carnature) {
         SchemeSaveVo schemeSaveVo = new SchemeSaveVo();
         LambdaQueryWrapper<PtlScheme> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PtlScheme::getCompanyId,companyId);
-        queryWrapper.eq(PtlScheme::getProductId,productId);
-        queryWrapper.eq(PtlScheme::getVehicleType,vehicleType);
-        queryWrapper.eq(PtlScheme::getEnergyType,energyType);
-        queryWrapper.eq(PtlScheme::getCarnature,carnature);
+        queryWrapper.eq(PtlScheme::getCompanyId, companyId);
+        queryWrapper.eq(PtlScheme::getProductId, productId);
+        queryWrapper.eq(PtlScheme::getVehicleType, vehicleType);
+        queryWrapper.eq(PtlScheme::getEnergyType, energyType);
+        queryWrapper.eq(PtlScheme::getCarnature, carnature);
         List<PtlScheme> ptlSchemes = baseMapper.selectList(queryWrapper);
         schemeSaveVo.setCompanyId(companyId);
         schemeSaveVo.setProductId(ptlSchemes.get(0).getProductId());
@@ -363,7 +369,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<InsDrivingIntentionInsuranceType> schemeDrivingIntentionInsuranceType = insDrivingIntentionInsuranceService.getSchemeDrivingIntentionInsuranceType(companyId);
         List<SchemeSaveVo.ProductVo> productList = new ArrayList<>();
         //方案遍历
-        ptlSchemes.forEach(scheme->{
+        ptlSchemes.forEach(scheme -> {
             SchemeSaveVo.ProductVo productVo = new SchemeSaveVo.ProductVo();
             productVo.setId(scheme.getId());
             productVo.setSchemeName(scheme.getSchemeName());
@@ -371,20 +377,20 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             List<SchemeKindInfoVo> kinds = new ArrayList<>();
             //遍历全部options
             List<InsBusinessInsurance> businessInsurance = insBusinessInsuranceService.getBusinessInsurance();
-            if(!scheme.getProductId().equals(ProductsType.PT_0330.getCode())) {
+            if (!scheme.getProductId().equals(ProductsType.PT_0330.getCode())) {
                 //查找选择的商业险种
                 List<SchemeKindInfoVo> selectKinds = ptlSchemeInsuranceService.getSelectKinds(scheme.getId());
                 businessInsurance.forEach(insurance -> {
-                    if(insurance.getKindCode().equals("TY2") || insurance.getKindCode().equals("TY3") || insurance.getKindCode().equals("TY4")){
+                    if (insurance.getKindCode().equals("TY2") || insurance.getKindCode().equals("TY3") || insurance.getKindCode().equals("TY4")) {
 //                        if(insurance.get)
                         SchemeKindInfoVo schemeKindInfoVo = selectKinds.stream().filter(x -> x.getId().equals(insurance.getId())).findFirst().orElse(null);
                         SchemeKindInfoVo vo = new SchemeKindInfoVo();
-                        if(!Objects.isNull(schemeKindInfoVo)){
+                        if (!Objects.isNull(schemeKindInfoVo)) {
                             vo.setKindCode(insurance.getKindCode());
                             vo.setKindName(insurance.getKindName());
                             vo.setId(insurance.getId());
                             vo.setAmount(Double.parseDouble(schemeKindInfoVo.getMax()));
-                        }else{
+                        } else {
                             vo.setKindCode(insurance.getKindCode());
                             vo.setKindName(insurance.getKindName());
                             vo.setId(insurance.getId());
@@ -393,7 +399,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                         vo.setAmtList(new ArrayList<>());
                         kinds.add(vo);
 
-                    }else {
+                    } else {
                         SchemeKindInfoVo vo = new SchemeKindInfoVo();
                         vo.setKindCode(insurance.getKindCode());
                         vo.setKindName(insurance.getKindName());
@@ -423,13 +429,13 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             List<InsDrivingIntentionInsuranceType> drivingType = insDrivingIntentionInsuranceTypeService.getDrivingIntentionInsuranceTypeByCompanyId(companyId);
 
 
-            List<SchemeSaveVo.DrvingIntentionVo> schemeDrivingIntentionList = ptlSchemeInsuranceService.getSchemeDrivingIntentionList(companyId,scheme.getId());
+            List<SchemeSaveVo.DrvingIntentionVo> schemeDrivingIntentionList = ptlSchemeInsuranceService.getSchemeDrivingIntentionList(companyId, scheme.getId());
             Map<String, List<SchemeSaveVo.DrvingIntentionVo>> groupedByGroupId = schemeDrivingIntentionList.stream()
                     .collect(Collectors.groupingBy(SchemeSaveVo.DrvingIntentionVo::getGroupId));
             groupedByGroupId.forEach((groupId, intentions) -> {
                 SchemeSaveVo.DrvingIntentionsVo drivingIntentionsVo = new SchemeSaveVo.DrvingIntentionsVo();
-                intentions.forEach(intention->{
-                    if(!intention.getLiabilityTerms().isEmpty()) {
+                intentions.forEach(intention -> {
+                    if (!intention.getLiabilityTerms().isEmpty()) {
                         //赋值选中的驾意险id
                         if (intention.getLiabilityTerms().size() > 1) {
                             List<String> collect = intention.getLiabilityTerms().stream().map(x -> x.getId()).collect(Collectors.toList());
@@ -492,11 +498,18 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                         drivingIntentionsVo.setDriverType(drivingType);
                     }
                 });
-                drivingIntentionsVo.setList(intentions);
+                List<SchemeSaveVo.DrvingIntentionVo> collect = intentions.stream()
+                        .sorted(Comparator.comparing(x -> StringUtils.isEmpty(x.getSeatNum()) ? 0 : Integer.parseInt(x.getSeatNum())))
+                        .collect(Collectors.toList());
+                drivingIntentionsVo.setList(collect);
                 drivingIntentions.add(drivingIntentionsVo);
-
             });
-            productVo.setDrvingIntentions(drivingIntentions);
+
+            List<SchemeSaveVo.DrvingIntentionsVo> collect = drivingIntentions.stream()
+                    .sorted(Comparator.comparing(x ->  StringUtils.isEmpty(x.getList().get(0).getSeatNum()) ? 0 : Integer.parseInt(x.getList().get(0).getSeatNum())))
+                    .collect(Collectors.toList());
+
+            productVo.setDrvingIntentions(collect);
             productList.add(productVo);
         });
         schemeSaveVo.setProductList(productList);
@@ -505,24 +518,24 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     }
 
     @Override
-    public List<SchemeResultVo> getSchemeInfoByCompanyId(String companyId,String productId,String vehicleType,String energyType,String carnature) {
-        List<SchemeResultVo> ptlSchemes = baseMapper.getSchemeResultList(companyId,productId,vehicleType,energyType,carnature);
+    public List<SchemeResultVo> getSchemeInfoByCompanyId(String companyId, String productId, String vehicleType, String energyType, String carnature) {
+        List<SchemeResultVo> ptlSchemes = baseMapper.getSchemeResultList(companyId, productId, vehicleType, energyType, carnature);
         //处理risk
-        ptlSchemes.forEach(scheme->{
+        ptlSchemes.forEach(scheme -> {
             JSONArray risks = new JSONArray();
-            if(scheme.getProductId().equals(ProductsType.PT_0330.getCode())
+            if (scheme.getProductId().equals(ProductsType.PT_0330.getCode())
                     || scheme.getProductId().equals(ProductsType.PT_0330034002.getCode())
-                    || scheme.getProductId().equals(ProductsType.PT_0330034001.getCode())){
+                    || scheme.getProductId().equals(ProductsType.PT_0330034001.getCode())) {
                 JSONObject risk = new JSONObject();
-                risk.put("riskCode","0507");
+                risk.put("riskCode", "0507");
                 risks.add(risk);
             }
-            if(scheme.getProductId().equals(ProductsType.PT_034002.getCode())
-            || scheme.getProductId().equals(ProductsType.PT_034001.getCode())
-            || scheme.getProductId().equals(ProductsType.PT_0330034002.getCode())
-            || scheme.getProductId().equals(ProductsType.PT_0330034001.getCode())){
+            if (scheme.getProductId().equals(ProductsType.PT_034002.getCode())
+                    || scheme.getProductId().equals(ProductsType.PT_034001.getCode())
+                    || scheme.getProductId().equals(ProductsType.PT_0330034002.getCode())
+                    || scheme.getProductId().equals(ProductsType.PT_0330034001.getCode())) {
                 JSONObject risk = new JSONObject();
-                risk.put("riskCode","0510");
+                risk.put("riskCode", "0510");
                 risks.add(risk);
             }
             scheme.setRisks(risks);
@@ -532,15 +545,16 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     /**
      * 删除方案
+     *
      * @param schemeQueryVo
      * @return
      */
     @Override
     @Transactional
-    public boolean deleteScheme(SchemeQueryVo schemeQueryVo){
+    public boolean deleteScheme(SchemeQueryVo schemeQueryVo) {
         List<PtlScheme> list = this.list(new LambdaQueryWrapper<PtlScheme>().eq(PtlScheme::getCompanyId, schemeQueryVo.getCompanyId())
                 .eq(PtlScheme::getProductId, schemeQueryVo.getProductId()));
-        List<String> schemeIds = list.stream().map(x->x.getId()).collect(Collectors.toList());
+        List<String> schemeIds = list.stream().map(x -> x.getId()).collect(Collectors.toList());
         this.removeBatchByIds(list);
 
         ptlSchemeInsuranceService.removeByIds(schemeIds);
@@ -552,19 +566,21 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     /**
      * 获取用户保险公司的所有方案
+     *
      * @return
      */
     @Override
-    public List<PtlSchemeRules> getUserAllSchemeByCompanyIds(String productId, List<String> companyIds,String vehicleType, boolean energyType) {
+    public List<PtlSchemeRules> getUserAllSchemeByCompanyIds(String productId, List<String> companyIds, String vehicleType, boolean energyType) {
 //        LambdaQueryWrapper<PtlSchemeRules> queryWrapper = new LambdaQueryWrapper<>();
 //        queryWrapper.eq(PtlSchemeRules::getProductId,productId);
 //        queryWrapper.in(PtlSchemeRules::getCompanyId,companyIds);
 //        return ptlSchemeRulesService.list(queryWrapper);
-        return baseMapper.getSchemeRules(companyIds,productId,vehicleType,energyType?"1":"0");
+        return baseMapper.getSchemeRules(companyIds, productId, vehicleType, energyType ? "1" : "0");
     }
 
     /**
      * 获取保险公司方案信息
+     *
      * @param schemeQueryVo
      * @return
      */
@@ -578,7 +594,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 .eq(PtlScheme::getCarnature, schemeQueryVo.getCarnature()));
 
         List<CompanySchemeVo> schemeVos = new ArrayList<>();
-        ptlSchemes.forEach(item->{
+        ptlSchemes.forEach(item -> {
             CompanySchemeVo schemeVo = new CompanySchemeVo();
             schemeVo.setSchemeId(item.getId());
             schemeVo.setSchemeName(item.getSchemeName());
@@ -587,15 +603,15 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             //险种信息
             schemeVo.setIsJq("0");
             schemeVo.setIsSy("0");
-            if(schemeQueryVo.getProductId().equals(ProductsType.PT_0330.getCode()) ||
+            if (schemeQueryVo.getProductId().equals(ProductsType.PT_0330.getCode()) ||
                     schemeQueryVo.getProductId().equals(ProductsType.PT_0330034001.getCode()) ||
-                    schemeQueryVo.getProductId().equals(ProductsType.PT_0330034002.getCode())){
+                    schemeQueryVo.getProductId().equals(ProductsType.PT_0330034002.getCode())) {
                 schemeVo.setIsJq("1");
             }
-            if(schemeQueryVo.getProductId().equals(ProductsType.PT_034002.getCode()) ||
+            if (schemeQueryVo.getProductId().equals(ProductsType.PT_034002.getCode()) ||
                     schemeQueryVo.getProductId().equals(ProductsType.PT_034001.getCode()) ||
                     schemeQueryVo.getProductId().equals(ProductsType.PT_0330034001.getCode()) ||
-                    schemeQueryVo.getProductId().equals(ProductsType.PT_0330034002.getCode())){
+                    schemeQueryVo.getProductId().equals(ProductsType.PT_0330034002.getCode())) {
                 schemeVo.setIsSy("1");
             }
 
@@ -608,19 +624,19 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                     .eq(PtlSchemeInsuranceDrivingIntention::getSeatNum, schemeQueryVo.getSeatNum())
                     .eq(PtlSchemeInsuranceDrivingIntention::getSchemeId, item.getId()));
 
-            List<String> collect = list.stream().map(x->x.getDrivingIntentionId()).collect(Collectors.toList());
-            if(collect.size() >= 1) {
+            List<String> collect = list.stream().map(x -> x.getDrivingIntentionId()).collect(Collectors.toList());
+            if (collect.size() >= 1) {
                 List<InsDrivingIntentionInsurance> schemeDrivingIntentionInsurance = ptlSchemeInsuranceDrivingIntentionService.getSchemeDrivingIntentionInsurance(collect);
                 schemeDrivingIntentionInsurance.forEach(insDrivingIntentionInsurance -> {
                     PtlSchemeInsuranceDrivingIntention insuranceDrivingIntention = list.stream().filter(x -> x.getDrivingIntentionId().equals(insDrivingIntentionInsurance.getId())).findFirst().orElse(null);
                     insDrivingIntentionInsurance.setQuantity(Integer.parseInt(insuranceDrivingIntention.getQuantity()));
                     insDrivingIntentionInsurance.setInsDrivingIntentionInsuranceSon(insDrivingIntentionInsuranceService.getInsDrivingIntentionInsuranceSon(schemeQueryVo.getCompanyId(), insDrivingIntentionInsurance.getProjectCode()));
-                    if(!Objects.isNull(insuranceDrivingIntention.getAlias()) && !insuranceDrivingIntention.getAlias().equals("")){
+                    if (!Objects.isNull(insuranceDrivingIntention.getAlias()) && !insuranceDrivingIntention.getAlias().equals("")) {
                         insDrivingIntentionInsurance.setAlias(insuranceDrivingIntention.getAlias());
                     }
                 });
                 schemeVo.setDrivingList(schemeDrivingIntentionInsurance);
-            }else{
+            } else {
                 schemeVo.setDrivingList(new ArrayList<>());
             }
 
@@ -628,14 +644,15 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         });
         return schemeVos;
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/10/15 11:29
-     *  @Description: 获取已经承包的保险公司列表
+     * @version
+     * @author: hxl
+     * @Date: 2024/10/15 11:29
+     * @Description: 获取已经承包的保险公司列表
      */
     @Override
     public Page<EsmInsCompany> allCompanyList(Page page, SchemeQueryVo schemeQueryVo) {
-        return baseMapper.allCompanyList(page,schemeQueryVo);
+        return baseMapper.allCompanyList(page, schemeQueryVo);
     }
 }

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

@@ -268,8 +268,11 @@
         <if test="params.agreeId != null and params.agreeId != ''">
             and iac.agreement_id = #{params.agreeId}
         </if>
-        <if test="params.managementSource != null and params.managementSource != ''">
-            and sd.management_source = #{params.managementSource}
+        <if test="params.managementSource != null and params.managementSource.size > 0">
+            and sd.management_source in
+            <foreach item="source" collection="params.managementSource" open="(" separator="," close=")">
+                #{source}
+            </foreach>
         </if>
         <if test="params.signStartDateStr != null and params.signStartDateStr != '' and params.signEndDateStr != null and params.signEndDateStr != ''">
             and DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{params.signStartDateStr} AND