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

src/main/java/com/ydtech/modules/admin/controller/kzt/KZTRoleController.java

@@ -147,7 +147,7 @@ public class KZTRoleController extends BaseController {
     @PostMapping(value = "/saveBatchRoleMenus")
     @ApiOperation(value = "批量角色关联菜单保存")
     public HttpResult saveBatchRoleMenus(@RequestBody KZTRoleAndMenuDto kZTRoleAndMenuDto) {
-        if (!kZTRoleAndMenuDto.getRoleIdIds().isEmpty()) {
+        if (kZTRoleAndMenuDto.getRoleIdIds().isEmpty()) {
            throw new SystemException("角色id不能为空！！");
         }
         if (kZTRoleAndMenuDto.getSysType()==null) {

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -511,6 +511,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> getLeadListDeptId(@Param("deptId") String deptId);
 
     List<SysUser> selectByLeadId(String userId);
+
+    List<SysUser> querySourceId(String id);
 }
 
 

src/main/java/com/ydtech/modules/admin/model/dto/KZTRoleAndMenuDto.java

@@ -24,7 +24,7 @@ public class KZTRoleAndMenuDto {
     @ApiModelProperty(value = "菜单id")
     private List<Long> menuIds=new ArrayList<>();
 
-    @ApiModelProperty(value = "菜单id")
+    @ApiModelProperty(value = "角色ids")
     private List<Long> roleIdIds;
 
     @ApiModelProperty(value = "系統类型  传2  控制台")

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

@@ -91,15 +91,14 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
             sysGeographyPositionVo.setList(sysGeographyPositionList);
 
         }else if (type == 2){
+            //查询人员下属管理所有人员
+            List<String> ids = new ArrayList<>();
             List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                     .eq(SysUser::getLeaderId, sysGeographyPositionDto.getQueryId()).ne(SysUser::getStatus, 0));
             List<String> collect = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
-            List<String> ids = new ArrayList<>();
+            if (collect.size() == 0) return sysGeographyPositionVo;
             List<String> idList = queryList(collect, ids);
             collect.addAll(idList);
-            if (collect.size() == 0) {
-                return sysGeographyPositionVo;
-            }
 
             List<SysGeographyPosition> list = sysGeographyPositionMapper.selectList(new LambdaQueryWrapper<SysGeographyPosition>()
                     .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
@@ -165,14 +164,20 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
     }
 
     private List<String> queryList(List<String> collect, List<String> ids) {
-        if (collect.size() > 0) {
+        int size = collect.size();
+        if (size > 0) {
+            List<String> strings = new ArrayList<>();
             for (String id : collect) {
                 List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                         .eq(SysUser::getLeaderId, id).ne(SysUser::getStatus, 0));
+//                List<SysUser> sysUsers = sysUserMapper.querySourceId(id);
                 if (sysUsers.size() > 0) {
                     List<String> list = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
+                    strings.addAll(list);
                     ids.addAll(list);
-                    queryList(list, ids);
+                    if (collect.indexOf(id) + 1 == size) {
+                        queryList(strings, ids);
+                    }
 
                 }
             }
@@ -188,27 +193,73 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
                 .eq(SysDept::getId, deptId).eq(SysDept::getDelFlag, 0));
         if (StringUtils.isEmpty(sysDept.getComlevel())) {
             SysDept sysDept5 = sysDeptMapper.selectById(sysDept.getParentId());
-            SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
-            SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
-            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
-            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
-                    .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+            if (sysDept5 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
+                if (sysDept4 == null) {
+                    stringBuilder.append(sysDept5.getName()).append("-").append(sysDept.getName());
+                }else {
+                    SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+                    if (sysDept3 == null) {
+                        stringBuilder.append(sysDept4.getName())
+                                .append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+                    }else {
+                        SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+                        if (sysDept2 == null) {
+                            stringBuilder.append(sysDept3.getName()).append("-").append(sysDept4.getName())
+                                    .append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+                        }else {
+                            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
+                                    .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+                        }
+                    }
+                }
+            }
         }else if (sysDept.getComlevel().equals("5")) {
             SysDept sysDept4 = sysDeptMapper.selectById(sysDept.getParentId());
-            SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
-            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
-            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+            if (sysDept4 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+                if (sysDept3 == null) {
+                    stringBuilder.append(sysDept4.getName()).append("-").append(sysDept.getName());
+                }else {
+                    SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+                    if (sysDept2 == null) {
+                        stringBuilder.append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+                    }else {
+                        stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+                    }
+                }
+            }
         }else if (sysDept.getComlevel().equals("4")) {
             SysDept sysDept3 = sysDeptMapper.selectById(sysDept.getParentId());
-            SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
-            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
+            if (sysDept3 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+                if (sysDept2 == null) {
+                    stringBuilder.append(sysDept3.getName()).append("-").append(sysDept.getName());
+                }else {
+                    stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
+                }
+            }
         }else if (sysDept.getComlevel().equals("3")) {
             SysDept sysDept2 = sysDeptMapper.selectById(sysDept.getParentId());
-            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
+            if (sysDept2 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
+            }
 
         }else if (sysDept.getComlevel().equals("2")) {
             stringBuilder.append(sysDept.getName());
         }
+        String s = stringBuilder.toString();
+        if (s.contains("总部-")) {
+            stringBuilder.replace(0,3,"");
+        }
 
 
         return stringBuilder.toString();

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

@@ -148,14 +148,33 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
     }
 
     private List<String> queryList(List<String> collect, List<String> ids) {
-        if (collect.size() > 0) {
+//        if (collect.size() > 0) {
+//            for (String id : collect) {
+//                List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+//                        .eq(SysUser::getLeaderId, id).ne(SysUser::getStatus, 0));
+//                if (sysUsers.size() > 0) {
+//                    List<String> list = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
+//                    ids.addAll(list);
+//                    queryList(list, ids);
+//
+//                }
+//            }
+//
+//        }
+        int size = collect.size();
+        if (size > 0) {
+            List<String> strings = new ArrayList<>();
             for (String id : collect) {
                 List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                         .eq(SysUser::getLeaderId, id).ne(SysUser::getStatus, 0));
+//                List<SysUser> sysUsers = sysUserMapper.querySourceId(id);
                 if (sysUsers.size() > 0) {
                     List<String> list = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
+                    strings.addAll(list);
                     ids.addAll(list);
-                    queryList(list, ids);
+                    if (collect.indexOf(id) + 1 == size) {
+                        queryList(strings, ids);
+                    }
 
                 }
             }
@@ -272,16 +291,15 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
             insOrdersPage = page(page, wrapper);
 
         } else if (addressInfoDto.getType() == 2) {
+            List<String> ids = new ArrayList<>();
             List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                     .eq(SysUser::getLeaderId, addressInfoDto.getQueryId()).ne(SysUser::getStatus, 0));
             List<String> collect = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
-            List<String> ids = new ArrayList<>();
+            if (collect.size() == 0) return new BasePageResult<>(addressInfoDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
+                        insOrdersPage.getRecords());
+
             List<String> idList = queryList(collect, ids);
             collect.addAll(idList);
-            if (collect.size() == 0) {
-                return new BasePageResult<>(addressInfoDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
-                        insOrdersPage.getRecords());
-            }
 
             LambdaQueryWrapper<SysPcAddress> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getLng()), SysPcAddress::getLongitude, addressInfoDto.getLng());
@@ -526,9 +544,18 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
         //获取领导字段不为空的人的ID
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.isNotNull("leader_id");
-
+        List<SysUser> userList = null;
         List<SysUser> users = sysUserMapper.selectList(queryWrapper);
-        List<SysUser> userList = users.stream().filter(SysUser -> !SysUser.getId().contains("M")).collect(Collectors.toList());
+        if (users.size()>0) {
+            //排除前线员工
+            userList = users.stream().filter(SysUser -> !SysUser.getId().contains("M")).collect(Collectors.toList());
+            //填充所属机构名称
+            for (SysUser user : userList) {
+                String deptName = getDeptName(user.getDeptId());
+                user.setDeptName(deptName);
+            }
+        }
+
         if (users == null || users.size() == 0) {
             return new ArrayList<>();
         }
@@ -545,6 +572,8 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
         return topUsers;
     }
 
+
+
     private void buildUserTree(List<SysUser> topUsers, List<SysUser> users) {
         for (SysUser user : topUsers) {
             List<SysUser> children = new ArrayList<>();
@@ -559,6 +588,84 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
         }
     }
 
+    private String getDeptName(String deptId) {
+        StringBuilder stringBuilder = new StringBuilder();
+        SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                .eq(SysDept::getId, deptId).eq(SysDept::getDelFlag, 0));
+        if (StringUtils.isEmpty(sysDept.getComlevel())) {
+            SysDept sysDept5 = sysDeptMapper.selectById(sysDept.getParentId());
+            if (sysDept5 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                SysDept sysDept4 = sysDeptMapper.selectById(sysDept5.getParentId());
+                if (sysDept4 == null) {
+                    stringBuilder.append(sysDept5.getName()).append("-").append(sysDept.getName());
+                }else {
+                    SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+                    if (sysDept3 == null) {
+                        stringBuilder.append(sysDept4.getName())
+                                .append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+                    }else {
+                        SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+                        if (sysDept2 == null) {
+                            stringBuilder.append(sysDept3.getName()).append("-").append(sysDept4.getName())
+                                    .append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+                        }else {
+                            stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName())
+                                    .append("-").append(sysDept4.getName()).append("-").append(sysDept5.getName()).append("-").append(sysDept.getName());
+                        }
+                    }
+                }
+            }
+        }else if (sysDept.getComlevel().equals("5")) {
+            SysDept sysDept4 = sysDeptMapper.selectById(sysDept.getParentId());
+            if (sysDept4 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                SysDept sysDept3 = sysDeptMapper.selectById(sysDept4.getParentId());
+                if (sysDept3 == null) {
+                    stringBuilder.append(sysDept4.getName()).append("-").append(sysDept.getName());
+                }else {
+                    SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+                    if (sysDept2 == null) {
+                        stringBuilder.append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+                    }else {
+                        stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept4.getName()).append("-").append(sysDept.getName());
+                    }
+                }
+            }
+        }else if (sysDept.getComlevel().equals("4")) {
+            SysDept sysDept3 = sysDeptMapper.selectById(sysDept.getParentId());
+            if (sysDept3 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                SysDept sysDept2 = sysDeptMapper.selectById(sysDept3.getParentId());
+                if (sysDept2 == null) {
+                    stringBuilder.append(sysDept3.getName()).append("-").append(sysDept.getName());
+                }else {
+                    stringBuilder.append(sysDept2.getName()).append("-").append(sysDept3.getName()).append("-").append(sysDept.getName());
+                }
+            }
+        }else if (sysDept.getComlevel().equals("3")) {
+            SysDept sysDept2 = sysDeptMapper.selectById(sysDept.getParentId());
+            if (sysDept2 == null) {
+                stringBuilder.append(sysDept.getName());
+            }else {
+                stringBuilder.append(sysDept2.getName()).append("-").append(sysDept.getName());
+            }
+
+        }else if (sysDept.getComlevel().equals("2")) {
+            stringBuilder.append(sysDept.getName());
+        }
+        String s = stringBuilder.toString();
+        if (s.contains("总部-")) {
+            stringBuilder.replace(0,3,"");
+        }
+
+
+        return stringBuilder.toString();
+    }
+
 
 }
 

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

@@ -2,6 +2,8 @@ package com.ydtech.modules.fnc.controller;
 
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.fnc.entity.ImportResult;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.service.ImportAsyncService;
@@ -10,13 +12,12 @@ import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @Api(tags = "异步导出")
 @RequestMapping("/fnc/importAsync")
@@ -33,4 +34,20 @@ public class ImportAsyncController {
         return result;
     }
 
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/27 19:01
+     *  @Description: 查询任务列表中的公司机构列表
+     */
+    @GetMapping("/queryPartnerCompaniesList")
+    @ApiOperation(value = "查询任务列表中的公司机构列表")
+    public HttpResult<List<EsmInsCompany>> queryPartnerCompaniesList(String status) {
+        if(StringUtils.isBlank(status)){
+            throw  new SystemException("类型不能为空！！！");
+        }
+
+        List<EsmInsCompany> result=importAsyncService.queryPartnerCompaniesList(status);
+        return HttpResult.ok(result);
+    }
 }

src/main/java/com/ydtech/modules/fnc/dao/ImportAsyncMapper.java

@@ -1,8 +1,10 @@
 package com.ydtech.modules.fnc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.fnc.entity.ImportResult;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
 import java.util.List;
@@ -12,4 +14,11 @@ public interface ImportAsyncMapper  extends BaseMapper<ImportResult> {
     List<ImportResult> queryNew(HashMap<String, Object> params);
 
     List<ImportResult> selectByIncomeId(String incomeId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/27 19:03
+     *  @Description:  查询任务列表中的公司机构列表
+     */
+    List<EsmInsCompany> queryPartnerCompaniesList(@Param("status")  String status);
 }

src/main/java/com/ydtech/modules/fnc/service/ImportAsyncService.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.fnc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.fnc.entity.ImportResult;
 import com.ydtech.modules.fnc.vo.ImportResultVo;
 import com.ydtech.modules.inv.model.dto.InsBxNoPlyIncomeExcelDto;
@@ -26,4 +27,11 @@ public interface ImportAsyncService   extends IService<ImportResult> {
 
 
     List<ImportResult> selectByIncomeId(String incomeId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/27 19:02
+     *  @Description: 查询任务列表中的公司机构列表
+     */
+    List<EsmInsCompany> queryPartnerCompaniesList(String status);
 }

src/main/java/com/ydtech/modules/fnc/service/impl/ImportAsyncServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.fnc.dao.ImportAsyncMapper;
 import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
 import com.ydtech.modules.fnc.entity.ImportResult;
@@ -194,6 +195,9 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
             if(StringUtils.isNotEmpty(importResultVo.getCreateTime())){
                 params.put("createTime",importResultVo.getCreateTime());
             }
+            if(StringUtils.isNotBlank(importResultVo.getPartnerCompaniesId())){
+                params.put("partnerCompaniesId",importResultVo.getPartnerCompaniesId());
+            }
             List<ImportResult> list= this.baseMapper.queryNew(params);
 
             pageHelper=new PageInfo(list);
@@ -583,4 +587,15 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
     public List<ImportResult> selectByIncomeId(String incomeId) {
         return   baseMapper.selectByIncomeId(incomeId);
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/27 19:02
+     *  @Description:  查询任务列表中的公司机构列表
+     */
+    @Override
+    public List<EsmInsCompany> queryPartnerCompaniesList(String status) {
+        return baseMapper.queryPartnerCompaniesList(status);
+    }
 }

src/main/java/com/ydtech/modules/fnc/vo/ImportResultVo.java

@@ -55,4 +55,7 @@ public class ImportResultVo {
 
     @ApiModelProperty("创建时间")
     private String createTime;
+
+    @ApiModelProperty("保司机构id")
+    private String partnerCompaniesId;
 }

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

@@ -246,6 +246,12 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("产品id")
         private String productid;
 
+        @ApiModelProperty("驾意险份数")
+        private String jyQuantity;
+
+        @ApiModelProperty("驾意险名称")
+        private String jyName;
+
         public void feeVacant() {
             this.jqExportFee = null;
             this.syExportFee = null;

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

@@ -82,7 +82,7 @@ public class CarModelServiceImpl implements CarModelService {
 
     @Override
     public JSONObject licenseSearch(String licenseNo) {
-        String requestUrl = "http://47.92.254.66:8088/lsearch/1";
+        String requestUrl = "http://39.98.41.104:8088/lsearch/1";
         JSONObject params = new JSONObject();
         params.put("license",licenseNo);
         OkHttpClient client = new OkHttpClient().newBuilder()

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

@@ -1103,7 +1103,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         ptlAgreementInsCompanyDtos.forEach(companyDto -> {
             InsOrdersEditingVo.InsAreaCompanyEditingDto insAreaCompanyEditingDto = insAreaCompanyEditingDtos.stream().filter(x -> x.getInscompany().equals(companyDto.getNamesimple())).findFirst().orElse(null);
-            companyDto.setEditingDto(insAreaCompanyEditingDto);
+            if(!Objects.isNull(insAreaCompanyEditingDto)) {
+                InsAreaCompanyAccidentalDriving byCompanyId = insAreaCompanyAccidentalDrivingService.getByCompanyId(insAreaCompanyEditingDto.getCompanyId());
+                if(!Objects.isNull(byCompanyId)){
+                    insAreaCompanyEditingDto.setJyQuantity(byCompanyId.getQuantity().toString());
+                    insAreaCompanyEditingDto.setJyName(byCompanyId.getRideRiskName());
+                }
+                companyDto.setEditingDto(insAreaCompanyEditingDto);
+            }
         });
 
         List<String> companyIds = insAreaCompanyEditingDtos.stream().map(x -> x.getCompanyId()).collect(Collectors.toList());

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

@@ -146,6 +146,10 @@ public class PtlSchemeRulesServiceImpl extends ServiceImpl<PtlSchemeRulesMapper,
         //用户可读取的所有保险公司id
         List<String> companyIds = agreementInsCompany.stream().map(PtlAgreementInsCompanyDto::getId).collect(Collectors.toList());
 
+        if(companyIds.isEmpty()){
+            throw new SystemException("暂无可报价公司");
+        }
+
         //获取所有规则的保险公司id
         List<PtlAgreementInsCompanyDto> ptlAgreementInsCompanyDtos = new ArrayList<>();
 

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -1796,5 +1796,15 @@
         and  su.leader_id =#{userId}
     </select>
 
+    <select id="querySourceId" resultType="com.ydtech.modules.admin.model.SysUser">
+        select *
+        from sys_user su
+        left join sys_dept sd on su.dept_id = sd.id
+        where
+            su.status != 0 and sd.management_source in (1,2)
+            and su.leader_id = #{id}
+
+    </select>
+
 
 </mapper>

src/main/resources/mapper/modules/fnc/ImportAsyncMapper.xml

@@ -49,6 +49,9 @@
             <if test="incomeId !=null  and  incomeId  !=''">
              AND    a.income_id  =#{incomeId}
             </if>
+            <if test="partnerCompaniesId !=null  and  partnerCompaniesId  !=''">
+                AND  a.partner_companies_id  =#{partnerCompaniesId}
+            </if>
         </where>
         order  by  a.create_time  desc
     </select>
@@ -87,4 +90,19 @@
         </where>
         order  by  a.create_time  desc
     </select>
+    <select id="queryPartnerCompaniesList" resultType="com.ydtech.modules.esm.model.EsmInsCompany">
+        select
+            DISTINCT
+            a.partner_companies_id as "id",
+            eic.namesimple as "name"
+        from
+            import_task  a
+         LEFT  JOIN  esm_ins_company  eic  on  eic.id  = a.partner_companies_id
+        <where>
+              IFNULL(eic.namesimple,'') != ''
+            <if test="status !=null  and  status  !=''">
+               and  a.hand_status =#{status}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1362,6 +1362,7 @@
         su.name as "userName",
         io.userid as "userId",
         sd.id as "deptId",
+        suLeader.name as "leaderName",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS qutationCount,
         COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCount,
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) AS qutationInsureCount,
@@ -1373,9 +1374,10 @@
         COUNT( CASE WHEN iac.orderstatus = 1 THEN 1 END  )   as  "auditOrder"
         FROM
         ins_area_company iac
-        left  join   ins_orders  io  on  io.orderno  = iac.orderno
-        left  join   sys_dept sd  on sd.id=io.deptid
-        left  join   sys_user su  on su.id=io.userid
+        left join ins_orders io on io.orderno = iac.orderno
+        left join sys_dept sd on sd.id=io.deptid
+        left join sys_user su on su.id=io.userid
+        left join sys_user suLeader on suLeader.id =su.leader_id
         <where>
             sd.management_source = '2'
             <if test="taskStatisticsVo.provinceId != null and taskStatisticsVo.provinceId != ''">