修改协议时不需要验证登录

src/main/java/com/ydtech/modules/protocol/service/PtlAgreementService.java

@@ -182,8 +182,9 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      * @param ptlAgreement     协议信息
      * @param agreementSaveDto 协议添加实体
      * @param attribution      协议归属添加实体
+     * @param verificationLogin 验证登录
      */
-    EsmInsCompany verifyLogin(PtlAgreement ptlAgreement, PtlAgreementSaveDto agreementSaveDto, PtlAgreementAttributionDto attribution);
+    EsmInsCompany verifyLogin(PtlAgreement ptlAgreement, PtlAgreementSaveDto agreementSaveDto, PtlAgreementAttributionDto attribution, boolean verificationLogin);
 
     /**
      * 根据协议编码，归属保险公司获取非车险费用配置信息

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

@@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.config.DictEnumConfig;
 import com.ydtech.constants.enums.dict.DictionaryData;
 import com.ydtech.constants.enums.dict.DictionaryManagement;
-import com.ydtech.constants.enums.dict.agreement.AgreementType;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
@@ -84,11 +82,17 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
 
     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) {
+                                   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) {
         this.ptlAgreementProductCostsService = ptlAgreementProductCostsService;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
         this.ptlAgreementDeptService = ptlAgreementDeptService;
@@ -157,7 +161,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         PtlAgreement ptlAgreement = new PtlAgreement();
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
 
-        EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution);
+        EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution, true);
 //        ptlAgreement.setId(IdGenerate.nextId());
         ptlAgreement.setProductsCode(agreementSaveDto.getProductsCode());
         ptlAgreement.setCreator(userName);
@@ -170,16 +174,19 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         String batchNo = IdGenerate.nextId();
         //添加授权部门历史信息
         List<String> dept = agreement.getDept();
-        List<PtlAgreementDeptHistory> ptlAgreementDeptList = PtlAgreementDeptHistory.toPtlAgreementDeptHistoryList(ptlAgreement.getId(), dept, batchNo);
+        List<PtlAgreementDeptHistory> ptlAgreementDeptList = PtlAgreementDeptHistory.toPtlAgreementDeptHistoryList(ptlAgreement.getId(),
+                dept, batchNo);
         ptlAgreementDeptHistoryService.saveBatch(ptlAgreementDeptList);
-        PtlAgreementHistory ptlAgreementHistory = new PtlAgreementHistory(batchNo, userName, HistoryStatusConstants.HISTORY_TYPE_ADD, ptlAgreement);
+        PtlAgreementHistory ptlAgreementHistory = new PtlAgreementHistory(batchNo, userName, HistoryStatusConstants.HISTORY_TYPE_ADD,
+                ptlAgreement);
         ptlAgreementHistory.setStartDate(ptlAgreement.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         ptlAgreementHistory.setEndDate(ptlAgreement.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         ptlAgreementHistory.setAgreementId(ptlAgreement.getId());
         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);
@@ -192,7 +199,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Transactional
     public HttpResult<Object> saveAgreementProduct(PtlAgreementProductCosts ptlAgreementProductCosts, String userName) {
 
-        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementProductCosts.getAgreementId()));
+        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId,
+                ptlAgreementProductCosts.getAgreementId()));
         if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
@@ -204,7 +212,8 @@ 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"),
+        PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd " +
+                "HH:mm:ss"),
                 HistoryStatusConstants.HISTORY_TYPE_UPDATE, ptlAgreementProductCosts);
         ptlAgreementProductCostsHistoryService.save(history);
         return HttpResult.ok("添加成功");
@@ -212,7 +221,8 @@ 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()));
+        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId,
+                agreement.getAgreementId()));
         if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
@@ -224,7 +234,8 @@ 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"),
+        PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd " +
+                "HH:mm:ss"),
                 HistoryStatusConstants.HISTORY_TYPE_UPDATE, agreement);
         ptlAgreementProductCostsHistoryService.save(history);
         return HttpResult.ok("修改成功");
@@ -237,7 +248,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         if (ptlAg == null) {
             throw new SystemException("协议产品费用不存在");
         }
-        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAg.getAgreementId()));
+        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId,
+                ptlAg.getAgreementId()));
         if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
@@ -248,7 +260,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         baseMapper.updateById(ptlAgreement);
         //删除协议
         ptlAgreementProductCostsService.removeById(id);
-        PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
+        PtlAgreementProductCostsHistory history = new PtlAgreementProductCostsHistory(userName, DateUtil.format(new Date(), "yyyy-MM-dd " +
+                "HH:mm:ss"),
                 HistoryStatusConstants.HISTORY_TYPE_DELETE, ptlAg);
         ptlAgreementProductCostsHistoryService.save(history);
         return HttpResult.ok("删除成功");
@@ -290,7 +303,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     @Transactional
     public HttpResult<Object> saveAgreementUndwrtRules(PtlAgreementUndwrtRules ptlAgreementUndwrtRules, String userName) {
-        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementUndwrtRules.getAgreementId()));
+        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId,
+                ptlAgreementUndwrtRules.getAgreementId()));
         if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
@@ -302,7 +316,8 @@ 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("添加成功");
     }
@@ -310,7 +325,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     @Transactional
     public HttpResult<Object> updateAgreementUndwrtRules(PtlAgreementUndwrtRules ptlAgreementUndwrtRules, String userName) {
-        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementUndwrtRules.getAgreementId()));
+        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId,
+                ptlAgreementUndwrtRules.getAgreementId()));
         if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
@@ -322,7 +338,8 @@ 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("修改成功");
     }
@@ -330,11 +347,14 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     @Transactional
     public HttpResult<Object> deleteAgreementUndwrtRules(String id, String userName) {
-        PtlAgreementUndwrtRules ptlAgreementUndwrtRules = ptlAgreementUndwrtRulesService.getOne(new LambdaQueryWrapper<PtlAgreementUndwrtRules>().eq(PtlAgreementUndwrtRules::getId, id));
+        PtlAgreementUndwrtRules ptlAgreementUndwrtRules =
+                ptlAgreementUndwrtRulesService.getOne(new LambdaQueryWrapper<PtlAgreementUndwrtRules>().eq(PtlAgreementUndwrtRules::getId
+                        , id));
         if (ptlAgreementUndwrtRules == null) {
             throw new SystemException("协议承保规则不存在");
         }
-        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId, ptlAgreementUndwrtRules.getAgreementId()));
+        PtlAgreement ptlAgreement = baseMapper.selectOne(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getId,
+                ptlAgreementUndwrtRules.getAgreementId()));
         if (ptlAgreement == null) {
             throw new SystemException("协议不存在");
         }
@@ -346,37 +366,47 @@ 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("删除成功");
     }
 
     @Override
-    public Page<PtlAgreement> pageAgreement(Page page,PtlAgreementPageVo ptlAgreementPageVo) {
+    public Page<PtlAgreement> pageAgreement(Page page, PtlAgreementPageVo ptlAgreementPageVo) {
 
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
         // 获取供应商本级id 及其 下级id
         List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
         //是否有效
-        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus, ptlAgreementPageVo.getValidStatus())
+        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus,
+                        ptlAgreementPageVo.getValidStatus())
                 // 供应商类型
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType, ptlAgreementPageVo.getCompaniesType())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType,
+                        ptlAgreementPageVo.getCompaniesType())
                 // 协议类型
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementType()), PtlAgreement::getAgreementType, ptlAgreementPageVo.getAgreementType())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementType()), PtlAgreement::getAgreementType,
+                        ptlAgreementPageVo.getAgreementType())
                 // 录入人
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCreator()), PtlAgreement::getCreator, ptlAgreementPageVo.getCreator())
                 // 修改人
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedBy()), PtlAgreement::getModifiedBy, ptlAgreementPageVo.getModifiedBy())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedBy()), PtlAgreement::getModifiedBy,
+                        ptlAgreementPageVo.getModifiedBy())
                 // 修改人名字
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedName()), PtlAgreement::getModifiedName, ptlAgreementPageVo.getModifiedName())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedName()), PtlAgreement::getModifiedName,
+                        ptlAgreementPageVo.getModifiedName())
                 // 合作公司
-                .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
+                .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(),
+                        PtlAgreement::getPartnerCompaniesId, lowerId)
                 // 费用描述
-                .like(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCostsDescription()), PtlAgreement::getUnderwritingDescription, ptlAgreementPageVo.getCostsDescription())
+                .like(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCostsDescription()), PtlAgreement::getUnderwritingDescription,
+                        ptlAgreementPageVo.getCostsDescription())
                 // 协议起期
-                .le(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementStartDate()), PtlAgreement::getStartDate, ptlAgreementPageVo.getAgreementStartDate())
+                .le(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementStartDate()), PtlAgreement::getStartDate,
+                        ptlAgreementPageVo.getAgreementStartDate())
                 // 协议止期
-                .ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate, ptlAgreementPageVo.getAgreementEndDate());
+                .ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate,
+                        ptlAgreementPageVo.getAgreementEndDate());
         // 录入时间
         if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())) {
             LocalDateTime startDateTime = ptlAgreementPageVo.getStartDate().atTime(LocalTime.MIN);
@@ -388,7 +418,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateStarTime()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateEndTime())) {
             LocalDateTime startDateTime = ptlAgreementPageVo.getUpdateStarTime().atTime(LocalTime.MIN);
             LocalDateTime endDateTime = ptlAgreementPageVo.getUpdateEndTime().atTime(LocalTime.MAX);
-            wrapper.between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateStarTime()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateEndTime()), PtlAgreement::getUpdateTime, startDateTime,endDateTime);
+            wrapper.between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateStarTime()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getUpdateEndTime()), PtlAgreement::getUpdateTime, startDateTime, endDateTime);
         }
         // 省市县
         if (ptlAgreementPageVo.getAreaCode() != null && !"".equals(ptlAgreementPageVo.getAreaCode()) && ptlAgreementPageVo.getLevel() != null) {
@@ -424,15 +454,20 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 获取供应商本级id 及其 下级id
         List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
         // 审核状态
-        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus, ptlAgreementPageVo.getAuditStatus())
+        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus,
+                        ptlAgreementPageVo.getAuditStatus())
                 //是否有效
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus, ptlAgreementPageVo.getValidStatus())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus,
+                        ptlAgreementPageVo.getValidStatus())
                 // 供应商类型
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType, ptlAgreementPageVo.getCompaniesType())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType,
+                        ptlAgreementPageVo.getCompaniesType())
                 // 合作公司
-                .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
+                .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(),
+                        PtlAgreement::getPartnerCompaniesId, lowerId)
                 // 录入时间
-                .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate()), PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
+                .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())
+                        , PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
 
         List<PtlAgreement> agreementPage = list(wrapper);
         return HttpResult.ok(agreementPage);
@@ -490,9 +525,12 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             deptHistory.setBatch(batchNo);
         }
         ptlAgreementDeptHistoryService.saveBatch(histories);
-        PtlAgreementHistory ptlAgreementHistory = new PtlAgreementHistory(batchNo, userName, HistoryStatusConstants.HISTORY_TYPE_ADD, byAgreementId.getData().getAgreement());
-        ptlAgreementHistory.setStartDate(byAgreementId.getData().getAgreement().getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        ptlAgreementHistory.setEndDate(byAgreementId.getData().getAgreement().getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        PtlAgreementHistory ptlAgreementHistory = new PtlAgreementHistory(batchNo, userName, HistoryStatusConstants.HISTORY_TYPE_ADD,
+                byAgreementId.getData().getAgreement());
+        ptlAgreementHistory.setStartDate(byAgreementId.getData().getAgreement().getStartDate().format(DateTimeFormatter.ofPattern("yyyy" +
+                "-MM-dd")));
+        ptlAgreementHistory.setEndDate(byAgreementId.getData().getAgreement().getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"
+        )));
         ptlAgreementHistory.setAgreementId(ptlAgreementHistory.getId());
         ptlAgreementHistory.setId(IdGenerate.nextId());
         ptlAgreementHistory.setOperatorType("delete");
@@ -517,13 +555,12 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         PtlAgreement ptlAgreement = proxyObject.ifExistsById(agreementId);
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
 
-        EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution);
+        EsmInsCompany esmInsCompany = proxyObject.verifyLogin(ptlAgreement, agreementSaveDto, attribution, false);
 
         ptlAgreement.setProductsCode(agreementSaveDto.getProductsCode());
         ptlAgreement.setModifiedBy(userName);
         ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
-        HttpResult<PtlAgreementQueryVo> byAgreementId = this.getByAgreementId(agreementId);
         // 修改协议
         boolean b = updateById(ptlAgreement);
         AssertionUtils.isSucceed(b, "协议信息修改失败");
@@ -537,16 +574,19 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         String batchNo = IdGenerate.nextId();
         //添加授权部门历史信息
         List<String> dept = agreement.getDept();
-        List<PtlAgreementDeptHistory> ptlAgreementDeptList = PtlAgreementDeptHistory.toPtlAgreementDeptHistoryList(ptlAgreement.getId(), dept, batchNo);
+        List<PtlAgreementDeptHistory> ptlAgreementDeptList = PtlAgreementDeptHistory.toPtlAgreementDeptHistoryList(ptlAgreement.getId(),
+                dept, batchNo);
         ptlAgreementDeptHistoryService.saveBatch(ptlAgreementDeptList);
-        PtlAgreementHistory ptlAgreementHistory = new PtlAgreementHistory(batchNo, userName, HistoryStatusConstants.HISTORY_TYPE_ADD, ptlAgreement);
+        PtlAgreementHistory ptlAgreementHistory = new PtlAgreementHistory(batchNo, userName, HistoryStatusConstants.HISTORY_TYPE_ADD,
+                ptlAgreement);
         ptlAgreementHistory.setStartDate(ptlAgreement.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         ptlAgreementHistory.setEndDate(ptlAgreement.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         ptlAgreementHistory.setAgreementId(ptlAgreement.getId());
         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);
@@ -588,22 +628,14 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public EsmInsCompany verifyLogin(PtlAgreement ptlAgreement, PtlAgreementSaveDto agreementSaveDto, PtlAgreementAttributionDto attribution) {
+    public EsmInsCompany verifyLogin(PtlAgreement ptlAgreement, PtlAgreementSaveDto agreementSaveDto,
+                                     PtlAgreementAttributionDto attribution, boolean verificationLogin) {
         EsmInsCompany esmInsCompany;
 
-        // 获取保险公司
-//        if (AgreementType.AT2.getCode().equals(agreementSaveDto.getAgreementType())) {
-//            String message = String.format("协议为 %s 保险公司必须传入", AgreementType.AT2.getDesc());
-//            AssertionUtils.isStringEmpty(agreementSaveDto.getAssociationCompaniesId(), message);
-//            esmInsCompany = esmInsCompanyService.isExists(agreementSaveDto.getAssociationCompaniesId());
-//        } else {
-//            esmInsCompany = esmInsCompanyService.getBySubsidiary(agreementSaveDto.getPartnerCompaniesId());
-//        }
-
         esmInsCompany = esmInsCompanyService.getBySubsidiary(agreementSaveDto.getPartnerCompaniesId());
 
         // 验证用户名密码 python api 对接需要验证用户名
-        if (!ObjectUtils.isEmpty(attribution.getApiType()) && PtlApiType.PTL_API_2.getCode() == attribution.getApiType()) {
+        if (!ObjectUtils.isEmpty(attribution.getApiType()) && PtlApiType.PTL_API_2.getCode() == attribution.getApiType() && verificationLogin) {
             String nameSimple = esmInsCompany.getNamesimple();
             String id = esmInsCompany.getId();
             insCrawlerOrderController.isLogin(attribution, id, nameSimple);
@@ -659,7 +691,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                     //然后根据协议ID 查询所有已配置费用的产品进行赋值
                     if (agreementId != null && !"".equals(agreementId)) {
                         //使用协议ID  产品ID  获取已经配置好的信息
-                        PtlAgreementNonCarProductCosts agreementNonCarProductCosts = ptlAgreementNonCarProductCostsService.getNonCarProductCostsInfo(agreementId, tempProductDto.getProductCode());
+                        PtlAgreementNonCarProductCosts agreementNonCarProductCosts =
+                                ptlAgreementNonCarProductCostsService.getNonCarProductCostsInfo(agreementId,
+                                        tempProductDto.getProductCode());
                         //赋值已配置的费用比例
                         if (agreementNonCarProductCosts != null) {
                             costsVo.setCostsProportion(agreementNonCarProductCosts.getCostsProportion());
@@ -690,7 +724,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 }
                 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();
+                    String tempCompanyId =
+                            agreement.getAssociationCompaniesId() != null && !"".equals(agreement.getAssociationCompaniesId()) ?
+                                    agreement.getAssociationCompaniesId() : agreement.getPartnerCompaniesId();
                     EsmInsCompany tempCompany = esmInsCompanyService.getById(tempCompanyId);
                     agreement.setInsuranceCompany(tempCompany.getName());
                 }
@@ -698,6 +734,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         }
         return HttpResult.ok(resultList);
     }
+
     /**
      * @version
      * @author: hxl
@@ -718,13 +755,14 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     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));
+        List<PtlAgreement> ptlAgreements =
+                baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getInsuranceCompanyId, insuranceCompanyId));
         return ptlAgreements;
     }
 
     @Override
     public PtlAgreement getByAgreementIdNew(String agreementId) {
-        PtlAgreement   ptlAgreement= baseMapper.getByAgreementIdNew(agreementId);
+        PtlAgreement ptlAgreement = baseMapper.getByAgreementIdNew(agreementId);
         return ptlAgreement;
     }
 
@@ -735,7 +773,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     public List<HashMap<String, Object>> getDockingPersonList() {
-        return   baseMapper.getDockingPersonList();
+        return baseMapper.getDockingPersonList();
     }