调整协议起止时间查询

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -77,15 +77,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     private final PtlAgreementAttributionHistoryService ptlAgreementAttributionHistoryService;
 
     @Autowired
-    private  PtlAgreementDeptHistoryService ptlAgreementDeptHistoryService;
+    private PtlAgreementDeptHistoryService ptlAgreementDeptHistoryService;
 
 
     public PtlAgreementServiceImpl(PtlAgreementProductCostsService ptlAgreementProductCostsService,
                                    PtlAgreementAttributionService ptlAgreementAttributionService, PtlAgreementDeptService ptlAgreementDeptService,
                                    EsmInsCompanyService esmInsCompanyService, PtlAgreementNonCarProductCostsService ptlAgreementNonCarProductCostsService,
-                                   @Lazy InsCrawlerOrderService insCrawlerOrderController, @Lazy PtlAgreementService proxyObject,PtlNonCarInsuranceProductService ptlNonCarInsuranceProductService,@Lazy PtlAgreementUndwrtRulesService ptlAgreementUndwrtRulesService,
-                                   PtlAgreementHistoryService ptlAgreementHistoryService,PtlAgreementProductCostsHistoryService ptlAgreementProductCostsHistoryService,
-                                   PtlAgreementUndwrtRulesHistoryService ptlAgreementUndwrtRulesHistoryService,PtlAgreementAttributionHistoryService ptlAgreementAttributionHistoryService) {
+                                   @Lazy InsCrawlerOrderService insCrawlerOrderController, @Lazy PtlAgreementService proxyObject, PtlNonCarInsuranceProductService ptlNonCarInsuranceProductService, @Lazy PtlAgreementUndwrtRulesService ptlAgreementUndwrtRulesService,
+                                   PtlAgreementHistoryService ptlAgreementHistoryService, PtlAgreementProductCostsHistoryService ptlAgreementProductCostsHistoryService,
+                                   PtlAgreementUndwrtRulesHistoryService ptlAgreementUndwrtRulesHistoryService, PtlAgreementAttributionHistoryService ptlAgreementAttributionHistoryService) {
         this.ptlAgreementProductCostsService = ptlAgreementProductCostsService;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
         this.ptlAgreementDeptService = ptlAgreementDeptService;
@@ -93,12 +93,12 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         this.ptlAgreementNonCarProductCostsService = ptlAgreementNonCarProductCostsService;
         this.insCrawlerOrderController = insCrawlerOrderController;
         this.proxyObject = proxyObject;
-        this.ptlNonCarInsuranceProductService=ptlNonCarInsuranceProductService;
-        this.ptlAgreementUndwrtRulesService=ptlAgreementUndwrtRulesService;
+        this.ptlNonCarInsuranceProductService = ptlNonCarInsuranceProductService;
+        this.ptlAgreementUndwrtRulesService = ptlAgreementUndwrtRulesService;
         this.ptlAgreementHistoryService = ptlAgreementHistoryService;
         this.ptlAgreementProductCostsHistoryService = ptlAgreementProductCostsHistoryService;
         this.ptlAgreementUndwrtRulesHistoryService = ptlAgreementUndwrtRulesHistoryService;
-        this.ptlAgreementAttributionHistoryService=ptlAgreementAttributionHistoryService;
+        this.ptlAgreementAttributionHistoryService = ptlAgreementAttributionHistoryService;
     }
 
 
@@ -131,9 +131,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public PtlAgreementInsCompanyDto getAgreementCompany(String deptId,String companyId) {
+    public PtlAgreementInsCompanyDto getAgreementCompany(String deptId, String companyId) {
         LocalDate localDate = LocalDate.now();
-        PtlAgreementInsCompanyDto agreementCompany = baseMapper.getAgreementCompanyByCompanyId(localDate, deptId,companyId);
+        PtlAgreementInsCompanyDto agreementCompany = baseMapper.getAgreementCompanyByCompanyId(localDate, deptId, companyId);
         return agreementCompany;
     }
 
@@ -161,7 +161,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreement.setCreateTime(LocalDateTime.now());
         save(ptlAgreement);
         // 提交  账号信息 授权部门
-        proxyObject.saveAssociationInformation(ptlAgreement.getId(), esmInsCompany,agreement);
+        proxyObject.saveAssociationInformation(ptlAgreement.getId(), esmInsCompany, agreement);
         // 添加 历史记录表
         //生成批次号
         String batchNo = IdGenerate.nextId();
@@ -176,7 +176,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreementHistory.setId(IdGenerate.nextId());
         ptlAgreementHistory.setOperatorType("add");
         ptlAgreementHistoryService.saveAgreementHistory(ptlAgreementHistory);
-        PtlAgreementAttributionHistory ptlAgreementAttributionHistory = new PtlAgreementAttributionHistory(batchNo,ptlAgreement.getId(),esmInsCompany.getId(),esmInsCompany.getName(),agreement.getAttribution());
+        PtlAgreementAttributionHistory ptlAgreementAttributionHistory = new PtlAgreementAttributionHistory(batchNo, ptlAgreement.getId(), esmInsCompany.getId(), esmInsCompany.getName(), agreement.getAttribution());
         ptlAgreementAttributionHistory.setId(IdGenerate.nextId());
         if (StringUtils.isNotEmpty(attribution.getTemplateId())) {
             ptlAgreementAttributionHistoryService.save(ptlAgreementAttributionHistory);
@@ -190,7 +190,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     public HttpResult<Object> saveAgreementProduct(PtlAgreementProductCosts ptlAgreementProductCosts, String userName) {
 
         PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementProductCosts.getAgreementId()));
-        if(ptlAgreement==null){
+        if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
@@ -201,7 +201,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreementProductCostsService.save(ptlAgreementProductCosts);
         // 添加 历史记录表
         PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
-                HistoryStatusConstants.HISTORY_TYPE_UPDATE,ptlAgreementProductCosts);
+                HistoryStatusConstants.HISTORY_TYPE_UPDATE, ptlAgreementProductCosts);
         ptlAgreementProductCostsHistoryService.save(history);
         return HttpResult.ok("添加成功");
     }
@@ -209,7 +209,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     public HttpResult<Object> updateAgreementProduct(PtlAgreementProductCosts agreement, String userName) {
         PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, agreement.getAgreementId()));
-        if(ptlAgreement==null){
+        if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
@@ -220,20 +220,20 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreementProductCostsService.updateById(agreement);
         // 添加 历史记录表
         PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
-                HistoryStatusConstants.HISTORY_TYPE_UPDATE,agreement);
+                HistoryStatusConstants.HISTORY_TYPE_UPDATE, agreement);
         ptlAgreementProductCostsHistoryService.save(history);
         return HttpResult.ok("修改成功");
     }
 
     @Override
     @Transactional
-    public HttpResult<Object> deleteAgreementProduct(String id,String userName) {
-        PtlAgreementProductCosts ptlAg=ptlAgreementProductCostsService.getById(id);
-        if(ptlAg==null){
+    public HttpResult<Object> deleteAgreementProduct(String id, String userName) {
+        PtlAgreementProductCosts ptlAg = ptlAgreementProductCostsService.getById(id);
+        if (ptlAg == null) {
             throw new SystemException("协议产品费用不存在");
         }
         PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAg.getAgreementId()));
-        if(ptlAgreement==null){
+        if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
@@ -243,7 +243,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         //删除协议
         ptlAgreementProductCostsService.removeById(id);
         PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
-                HistoryStatusConstants.HISTORY_TYPE_DELETE,ptlAg);
+                HistoryStatusConstants.HISTORY_TYPE_DELETE, ptlAg);
         ptlAgreementProductCostsHistoryService.save(history);
         return HttpResult.ok("删除成功");
     }
@@ -252,29 +252,29 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Transactional
     public HttpResult<Object> saveAgreementNonCarProductCosts(PtlAgreementNonVehicleProductCostsVo agreement, String userName) {
         //同步刷新其他协议非车产品费用信息(有待同步协议时，进行同步)
-        if(agreement.getSyncAgreementIds()!=null&&agreement.getSyncAgreementIds().size()>0){
-            for(int i=0;i<agreement.getSyncAgreementIds().size();i++){
-                String tempAgreementId=agreement.getSyncAgreementIds().get(i);
-                PtlAgreement destAgreement= getById(tempAgreementId);
+        if (agreement.getSyncAgreementIds() != null && agreement.getSyncAgreementIds().size() > 0) {
+            for (int i = 0; i < agreement.getSyncAgreementIds().size(); i++) {
+                String tempAgreementId = agreement.getSyncAgreementIds().get(i);
+                PtlAgreement destAgreement = getById(tempAgreementId);
                 //根据归属保司，找出本级和上级 所有产品代码
                 //先获取相关保险公司列表
-                String companyId=destAgreement.getPartnerCompaniesId();
-                if(destAgreement.getAssociationCompaniesId()!=null&&!"".equals(destAgreement.getAssociationCompaniesId())){
-                    companyId=destAgreement.getAssociationCompaniesId();
+                String companyId = destAgreement.getPartnerCompaniesId();
+                if (destAgreement.getAssociationCompaniesId() != null && !"".equals(destAgreement.getAssociationCompaniesId())) {
+                    companyId = destAgreement.getAssociationCompaniesId();
                 }
-                List<String> companyIdList=esmInsCompanyService.getAllRelationCompanyId(companyId);
+                List<String> companyIdList = esmInsCompanyService.getAllRelationCompanyId(companyId);
                 //再根据保险公司列表获取所有非车产品列表
-                List<PtlNonCarInsuranceProduct> productList=ptlNonCarInsuranceProductService.findProductListByCompangIds(companyIdList);
-                List<PtlAgreementNonCarProductCostsSaveVo> finalList=new ArrayList<>();
+                List<PtlNonCarInsuranceProduct> productList = ptlNonCarInsuranceProductService.findProductListByCompangIds(companyIdList);
+                List<PtlAgreementNonCarProductCostsSaveVo> finalList = new ArrayList<>();
                 //按找出的产品过滤传进来的 费用方案列表
-                for(PtlNonCarInsuranceProduct tempProductDto:productList){
-                    for(PtlAgreementNonCarProductCostsSaveVo productCostDto:agreement.getNonCarProductCosts()){
-                        if(productCostDto.getProductId().equals(tempProductDto.getProductCode())){
+                for (PtlNonCarInsuranceProduct tempProductDto : productList) {
+                    for (PtlAgreementNonCarProductCostsSaveVo productCostDto : agreement.getNonCarProductCosts()) {
+                        if (productCostDto.getProductId().equals(tempProductDto.getProductCode())) {
                             finalList.add(productCostDto);
                         }
                     }
                 }
-                ptlAgreementNonCarProductCostsService.synNonCarProductCosts(destAgreement,finalList);
+                ptlAgreementNonCarProductCostsService.synNonCarProductCosts(destAgreement, finalList);
             }
         }
 
@@ -285,7 +285,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Transactional
     public HttpResult<Object> saveAgreementUndwrtRules(PtlAgreementUndwrtRules ptlAgreementUndwrtRules, String userName) {
         PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementUndwrtRules.getAgreementId()));
-        if(ptlAgreement==null){
+        if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
@@ -295,7 +295,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         //添加承保规则
         ptlAgreementUndwrtRulesService.save(ptlAgreementUndwrtRules);
         //添加历史记录
-        PtlAgreementUndwrtRulesHistory ptlAgreementUndwrtRulesHistory=new PtlAgreementUndwrtRulesHistory(userName,HistoryStatusConstants.HISTORY_TYPE_ADD,ptlAgreementUndwrtRules);
+        PtlAgreementUndwrtRulesHistory ptlAgreementUndwrtRulesHistory = new PtlAgreementUndwrtRulesHistory(userName, HistoryStatusConstants.HISTORY_TYPE_ADD, ptlAgreementUndwrtRules);
         ptlAgreementUndwrtRulesHistoryService.save(ptlAgreementUndwrtRulesHistory);
         return HttpResult.ok("添加成功");
     }
@@ -304,7 +304,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Transactional
     public HttpResult<Object> updateAgreementUndwrtRules(PtlAgreementUndwrtRules ptlAgreementUndwrtRules, String userName) {
         PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementUndwrtRules.getAgreementId()));
-        if(ptlAgreement==null){
+        if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
@@ -314,7 +314,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         //添加承保规则
         ptlAgreementUndwrtRulesService.updateById(ptlAgreementUndwrtRules);
         //添加历史记录
-        PtlAgreementUndwrtRulesHistory ptlAgreementUndwrtRulesHistory=new PtlAgreementUndwrtRulesHistory(userName,HistoryStatusConstants.HISTORY_TYPE_UPDATE,ptlAgreementUndwrtRules);
+        PtlAgreementUndwrtRulesHistory ptlAgreementUndwrtRulesHistory = new PtlAgreementUndwrtRulesHistory(userName, HistoryStatusConstants.HISTORY_TYPE_UPDATE, ptlAgreementUndwrtRules);
         ptlAgreementUndwrtRulesHistoryService.save(ptlAgreementUndwrtRulesHistory);
         return HttpResult.ok("修改成功");
     }
@@ -323,11 +323,11 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Transactional
     public HttpResult<Object> deleteAgreementUndwrtRules(String id, String userName) {
         PtlAgreementUndwrtRules ptlAgreementUndwrtRules = ptlAgreementUndwrtRulesService.getOne(new LambdaQueryWrapper<PtlAgreementUndwrtRules>().eq(PtlAgreementUndwrtRules::getId, id));
-        if(ptlAgreementUndwrtRules==null){
+        if (ptlAgreementUndwrtRules == null) {
             throw new SystemException("协议承保规则不存在");
         }
         PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementUndwrtRules.getAgreementId()));
-        if(ptlAgreement==null){
+        if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
@@ -337,7 +337,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         //删除承保规则
         ptlAgreementUndwrtRulesService.removeById(id);
         //添加历史记录
-        PtlAgreementUndwrtRulesHistory ptlAgreementUndwrtRulesHistory=new PtlAgreementUndwrtRulesHistory(userName,HistoryStatusConstants.HISTORY_TYPE_DELETE,ptlAgreementUndwrtRules);
+        PtlAgreementUndwrtRulesHistory ptlAgreementUndwrtRulesHistory = new PtlAgreementUndwrtRulesHistory(userName, HistoryStatusConstants.HISTORY_TYPE_DELETE, ptlAgreementUndwrtRules);
         ptlAgreementUndwrtRulesHistoryService.save(ptlAgreementUndwrtRulesHistory);
         return HttpResult.ok("删除成功");
     }
@@ -368,56 +368,40 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 // 修改时间
                 .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateStarTime()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateEndTime()), PtlAgreement::getUpdateTime, ptlAgreementPageVo.getUpdateStarTime(), ptlAgreementPageVo.getUpdateEndTime())
                 // 协议起期
-                .ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementStartDate()), PtlAgreement::getStartDate, ptlAgreementPageVo.getAgreementStartDate())
+                .le(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementStartDate()), PtlAgreement::getStartDate, ptlAgreementPageVo.getAgreementStartDate())
                 // 协议止期
-                .le(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate, ptlAgreementPageVo.getAgreementEndDate());
-
-//        Page<PtlAgreement> ptlAgreementPage = new Page<>(pageNum, pageSize);
-        List<PtlAgreement> records = list(wrapper);
-//        Page<PtlAgreement> agreementPage = page(ptlAgreementPage, wrapper);
-//        List<PtlAgreement> records = agreementPage.getRecords();
+                .ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate, ptlAgreementPageVo.getAgreementEndDate());
+        // 省市县
         if (ptlAgreementPageVo.getAreaCode() != null && !"".equals(ptlAgreementPageVo.getAreaCode()) && ptlAgreementPageVo.getLevel() != null) {
             String area = ptlAgreementPageVo.getAreaCode();
             String prefix = null;
             Integer sign = 0;
             switch (ptlAgreementPageVo.getLevel()) {
                 case "1": { // 省级查询逻辑
-                    sign = 7;
+                    sign = 2;
                     prefix = area.substring(0, 2);
                     break;
                 }
                 case "2": {  // 市级查询逻辑
-                    sign = 9;
+                    sign = 4;
                     prefix = area.substring(0, 4);
                     break;
                 }
                 case "3": {  // 区县级查询逻辑
-                    sign = 11;
+                    sign = 6;
                     prefix = area.substring(0, 6);
                     break;
                 }
             }
-
-            if (records.size() != 0) {
-                List<PtlAgreement> ptlAgreements = new ArrayList<>();
-                for (PtlAgreement record : records) {
-                    String substring = record.getPartnerCompaniesId().substring(5, sign);
-                    if (substring.equals(prefix)) {
-                        ptlAgreements.add(record);
-                    }
-                }
-                records.clear();
-                records.addAll(ptlAgreements);
-            }
+            wrapper.apply("SUBSTRING(partner_companies_id, 6, " + sign + ") =" + prefix);
         }
-        List<PtlAgreement> paginate = paginate(records, pageNum, pageSize);
-
-        PageResult<PtlAgreement> ptlAgreementPageResult = new PageResult<>(pageNum, pageSize, records.size(), paginate);
+        List<PtlAgreement> records = list(wrapper);
+        PageResult<PtlAgreement> ptlAgreementPageResult = new PageResult<>(pageNum, pageSize, records.size(), records);
         return HttpResult.ok(ptlAgreementPageResult);
     }
 
     @Override
-    public HttpResult<List<PtlAgreement>> listAgreement(PtlAgreementPageVo ptlAgreementPageVo){
+    public HttpResult<List<PtlAgreement>> listAgreement(PtlAgreementPageVo ptlAgreementPageVo) {
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
         // 获取供应商本级id 及其 下级id
         List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
@@ -462,13 +446,13 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         }
         // 授权查询
         List<PtlAgreementDept> deptList = ptlAgreementDeptService.getByAgreementId(agreementId);
-        PtlAgreementQueryVo ptlAgreementQueryVo = new PtlAgreementQueryVo(ptlAgreement,ptlAgreementAttribution, deptList);
+        PtlAgreementQueryVo ptlAgreementQueryVo = new PtlAgreementQueryVo(ptlAgreement, ptlAgreementAttribution, deptList);
         return HttpResult.ok(ptlAgreementQueryVo);
     }
 
     @Override
     @Transactional
-    public HttpResult<Object> deleteAgreement(String agreementId,String userName) {
+    public HttpResult<Object> deleteAgreement(String agreementId, String userName) {
         proxyObject.ifExistsById(agreementId);
         HttpResult<PtlAgreementQueryVo> byAgreementId = getByAgreementId(agreementId);
 
@@ -495,7 +479,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreementHistory.setId(IdGenerate.nextId());
         ptlAgreementHistory.setOperatorType("delete");
         ptlAgreementHistoryService.saveAgreementHistory(ptlAgreementHistory);
-        PtlAgreementAttributionHistory ptlAgreementAttributionHistory = new PtlAgreementAttributionHistory(batchNo,agreementId,
+        PtlAgreementAttributionHistory ptlAgreementAttributionHistory = new PtlAgreementAttributionHistory(batchNo, agreementId,
                 byAgreementId.getData().getAgreement().getInsuranceCompanyId(),
                 byAgreementId.getData().getAgreement().getInsuranceCompany(),
                 byAgreementId.getData().getPtlAgreementAttribution()
@@ -543,7 +527,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreementHistory.setId(IdGenerate.nextId());
         ptlAgreementHistory.setOperatorType("update");
         ptlAgreementHistoryService.saveAgreementHistory(ptlAgreementHistory);
-        PtlAgreementAttributionHistory ptlAgreementAttributionHistory = new PtlAgreementAttributionHistory(batchNo,ptlAgreement.getId(),esmInsCompany.getId(),esmInsCompany.getName(),agreement.getAttribution());
+        PtlAgreementAttributionHistory ptlAgreementAttributionHistory = new PtlAgreementAttributionHistory(batchNo, ptlAgreement.getId(), esmInsCompany.getId(), esmInsCompany.getName(), agreement.getAttribution());
         ptlAgreementAttributionHistory.setId(IdGenerate.nextId());
         if (StringUtils.isNotEmpty(attribution.getTemplateId())) {
             ptlAgreementAttributionHistoryService.save(ptlAgreementAttributionHistory);
@@ -624,69 +608,69 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public HttpResult<List<PtlAgreementNonCarProductCostsVo>> getNonCarCostsInfo(String agreementId, String companyId){
-        List<PtlAgreementNonCarProductCostsVo> result=new ArrayList<>();
+    public HttpResult<List<PtlAgreementNonCarProductCostsVo>> getNonCarCostsInfo(String agreementId, String companyId) {
+        List<PtlAgreementNonCarProductCostsVo> result = new ArrayList<>();
         //先根据传过来的保险公司代码，找上下级所有机构层级对应的非车产品列表
-        if(companyId!=null&&!"".equals(companyId)){
+        if (companyId != null && !"".equals(companyId)) {
             //先获取相关保险公司列表
-            List<String> companyIdList=esmInsCompanyService.getAllRelationCompanyId(companyId);
+            List<String> companyIdList = esmInsCompanyService.getAllRelationCompanyId(companyId);
             //再根据保险公司列表获取所有非车产品列表
-            List<PtlNonCarInsuranceProduct> productList=ptlNonCarInsuranceProductService.findProductListByCompangIds(companyIdList);
-            if(productList!=null&&productList.size()>0){
-                for(int i=0;i<productList.size();i++){
-                    PtlNonCarInsuranceProduct tempProductDto=productList.get(i);
-                    PtlAgreementNonCarProductCostsVo costsVo=new PtlAgreementNonCarProductCostsVo();
+            List<PtlNonCarInsuranceProduct> productList = ptlNonCarInsuranceProductService.findProductListByCompangIds(companyIdList);
+            if (productList != null && productList.size() > 0) {
+                for (int i = 0; i < productList.size(); i++) {
+                    PtlNonCarInsuranceProduct tempProductDto = productList.get(i);
+                    PtlAgreementNonCarProductCostsVo costsVo = new PtlAgreementNonCarProductCostsVo();
                     costsVo.setProductId(tempProductDto.getProductCode());
                     costsVo.setProductName(tempProductDto.getProductName());
                     costsVo.setCompanyId(tempProductDto.getCompanyId());
-                    EsmInsCompany tempInsCompany=esmInsCompanyService.getById(tempProductDto.getCompanyId());
+                    EsmInsCompany tempInsCompany = esmInsCompanyService.getById(tempProductDto.getCompanyId());
                     costsVo.setCompanyName(tempInsCompany.getName());
                     costsVo.setRiskCode(tempProductDto.getInsuranceCode());
                     Map<String, DictionaryManagement> m = DictEnumConfig.getDmMap();
-                    DictionaryManagement dictionaryManagement=m.get("nonCarInsuranceCode");
-                    String riskName="";
-                    for(DictionaryData data: dictionaryManagement.getDdList()){
-                        if(tempProductDto.getInsuranceCode().equals(data.getDictValue())){
-                            riskName=data.getDictTag();
+                    DictionaryManagement dictionaryManagement = m.get("nonCarInsuranceCode");
+                    String riskName = "";
+                    for (DictionaryData data : dictionaryManagement.getDdList()) {
+                        if (tempProductDto.getInsuranceCode().equals(data.getDictValue())) {
+                            riskName = data.getDictTag();
                         }
                     }
                     costsVo.setRiskName(riskName);
                     //然后根据协议ID 查询所有已配置费用的产品进行赋值
-                    if(agreementId!=null&&!"".equals(agreementId)){
+                    if (agreementId != null && !"".equals(agreementId)) {
                         //使用协议ID  产品ID  获取已经配置好的信息
-                        PtlAgreementNonCarProductCosts agreementNonCarProductCosts=ptlAgreementNonCarProductCostsService.getNonCarProductCostsInfo(agreementId,tempProductDto.getProductCode());
+                        PtlAgreementNonCarProductCosts agreementNonCarProductCosts = ptlAgreementNonCarProductCostsService.getNonCarProductCostsInfo(agreementId, tempProductDto.getProductCode());
                         //赋值已配置的费用比例
-                        if(agreementNonCarProductCosts!=null){
+                        if (agreementNonCarProductCosts != null) {
                             costsVo.setCostsProportion(agreementNonCarProductCosts.getCostsProportion());
                         }
                     }
                     result.add(costsVo);
                 }
             }
-        }else{
+        } else {
             //如果归属保司没选，则直接返回空列表，相当于没查到对应非车产品信息
         }
         return HttpResult.ok(result);
     }
 
     @Override
-    public HttpResult<List<PtlAgreement>> findRelationAgreement(String companyId){
-        List<PtlAgreement> resultList=new ArrayList<>();
-        if(companyId!=null&&!"".equals(companyId)) {
+    public HttpResult<List<PtlAgreement>> findRelationAgreement(String companyId) {
+        List<PtlAgreement> resultList = new ArrayList<>();
+        if (companyId != null && !"".equals(companyId)) {
             //先获取相关保险公司列表
             List<String> companyIdList = esmInsCompanyService.getAllRelationCompanyId(companyId);
-            if(companyIdList!=null&&companyIdList.size()>0){
-                for(int i=0;i<companyIdList.size();i++){
-                    String tempCom=companyIdList.get(i);
+            if (companyIdList != null && companyIdList.size() > 0) {
+                for (int i = 0; i < companyIdList.size(); i++) {
+                    String tempCom = companyIdList.get(i);
                     LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(PtlAgreement::getValidStatus,"1");
-                    wrapper.and(wq1->wq1.eq(PtlAgreement::getPartnerCompaniesId,tempCom).or(wq2->wq2.eq(PtlAgreement::getAssociationCompaniesId,tempCom)));
+                    wrapper.eq(PtlAgreement::getValidStatus, "1");
+                    wrapper.and(wq1 -> wq1.eq(PtlAgreement::getPartnerCompaniesId, tempCom).or(wq2 -> wq2.eq(PtlAgreement::getAssociationCompaniesId, tempCom)));
                     resultList.addAll(list(wrapper));
                 }
-                for(int j=0;j<resultList.size();j++){
-                    PtlAgreement agreement=resultList.get(j);
-                    String tempCompanyId=agreement.getAssociationCompaniesId()!=null&&!"".equals(agreement.getAssociationCompaniesId())?agreement.getAssociationCompaniesId():agreement.getPartnerCompaniesId();
-                    EsmInsCompany tempCompany= esmInsCompanyService.getById(tempCompanyId);
+                for (int j = 0; j < resultList.size(); j++) {
+                    PtlAgreement agreement = resultList.get(j);
+                    String tempCompanyId = agreement.getAssociationCompaniesId() != null && !"".equals(agreement.getAssociationCompaniesId()) ? agreement.getAssociationCompaniesId() : agreement.getPartnerCompaniesId();
+                    EsmInsCompany tempCompany = esmInsCompanyService.getById(tempCompanyId);
                     agreement.setInsuranceCompany(tempCompany.getName());
                 }
             }
@@ -694,46 +678,27 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         return HttpResult.ok(resultList);
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/15 18:02
-     *  @Description: 查询审核的协议
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/15 18:02
+     * @Description: 查询审核的协议
      */
-    public List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement){
+    public List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement) {
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
-       // wrapper.eq(PtlAgreement::getAuditStatus,"1");
+        // wrapper.eq(PtlAgreement::getAuditStatus,"1");
         //添加协议编码排序
         wrapper.orderByAsc(PtlAgreement::getAgreementCode);
         List<PtlAgreement> list = proxyObject.list(wrapper);
         return list;
     }
 
-//    @Autowired
+    //    @Autowired
 //    private PtlAgreementProductCostsNewService ptlAgreementProductCostsNewService;
-    public List<PtlAgreement> getCurrentAgreementList(String agreementId){
+    public List<PtlAgreement> getCurrentAgreementList(String agreementId) {
         PtlAgreement ptlAgreement = this.getById(agreementId);
         String insuranceCompanyId = ptlAgreement.getInsuranceCompanyId();
         List<PtlAgreement> ptlAgreements = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getInsuranceCompanyId, insuranceCompanyId));
         return ptlAgreements;
     }
 
-    /**
-     * 手动对 QuUserNum 列表进行分页
-     *
-     * @param ptlAgreements 原始 QuUserNum 数据列表
-     * @param pageNum       期望获取的页码（从 1 开始）
-     * @param pageSize      每页包含的 QuUserNum 数量
-     * @return 对应页码的 QuUserNum 子列表，若输入参数无效则返回空列表
-     */
-    public List<PtlAgreement> paginate(List<PtlAgreement> ptlAgreements, int pageNum, int pageSize) {
-        if (ptlAgreements == null || ptlAgreements.isEmpty() || pageNum < 1 || pageSize < 1) {
-            return Collections.emptyList();
-        }
-
-        int startIndex = (pageNum - 1) * pageSize;
-        int endIndex = Math.min(startIndex + pageSize, ptlAgreements.size());
-
-        return ptlAgreements.subList(startIndex, endIndex);
-    }
-
 }