复制订单，协议查询修改

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -52,7 +52,7 @@ public class PtlAgreementController extends BaseController {
     private final PtlAgreementNonCarProductCostsService ptlAgreementNonCarProductCostsService;
 
     public PtlAgreementController(PtlAgreementService ptlAgreementService, PtlAgreementUndwrtRulesService ptlAgreementUndwrtRulesService,
-                                  PtlAgreementProductCostsService ptlAgreementProductCostsService,PtlAgreementNonCarProductCostsService ptlAgreementNonCarProductCostsService) {
+                                  PtlAgreementProductCostsService ptlAgreementProductCostsService, PtlAgreementNonCarProductCostsService ptlAgreementNonCarProductCostsService) {
         this.ptlAgreementService = ptlAgreementService;
         this.ptlAgreementProductCostsService = ptlAgreementProductCostsService;
         this.ptlAgreementUndwrtRulesService = ptlAgreementUndwrtRulesService;
@@ -67,10 +67,10 @@ public class PtlAgreementController extends BaseController {
         return HttpResult.ok(buildPageResponse(pageResultHttpResult));
     }
 
-    @GetMapping("getAllAgreement")
-    @ApiOperation("获取所有协议")
-    public HttpResult<List<PtlAgreement>>  getAllAgreement(){
-        return HttpResult.ok(ptlAgreementService.getAllAgreement());
+    @GetMapping("/getAllAgreement")
+    @ApiOperation("复制费用查询同保险公司协议")
+    public HttpResult<List<PtlAgreement>> getAllAgreement(@RequestParam String agreementId) {
+        return HttpResult.ok(ptlAgreementService.getAllAgreement(agreementId));
     }
 
     @PostMapping("/list")
@@ -125,7 +125,7 @@ public class PtlAgreementController extends BaseController {
     @ApiOperation("查询协议产品费用")
     public PageResult getProductSav(@RequestBody PtlAgreementProductQueryVo ptlAgreementProductQueryVo) {
         Page<T> page = buildPageRequest(ptlAgreementProductQueryVo.getPageDto());
-        Page<PtlAgreementProductCosts> schemeQueryDto = ptlAgreementProductCostsService.getByAgreementId(page,ptlAgreementProductQueryVo);
+        Page<PtlAgreementProductCosts> schemeQueryDto = ptlAgreementProductCostsService.getByAgreementId(page, ptlAgreementProductQueryVo);
         return buildPageResponse(schemeQueryDto);
     }
 
@@ -145,9 +145,9 @@ public class PtlAgreementController extends BaseController {
 
     @GetMapping("productDelete")
     @ApiOperation("删除协议产品费用")
-    public HttpResult<Object> productDelete(String id){
+    public HttpResult<Object> productDelete(String id) {
         String userName = getUserName();
-        return ptlAgreementService.deleteAgreementProduct(id,userName);
+        return ptlAgreementService.deleteAgreementProduct(id, userName);
     }
 
 
@@ -169,7 +169,7 @@ public class PtlAgreementController extends BaseController {
     @ApiOperation("查询承保规则")
     public PageResult getUndwrtRules(@RequestBody PtlAgreementUndwrtRulesQueryVo ptlAgreementUndwrtRulesQueryVo) {
         Page<T> page = buildPageRequest(ptlAgreementUndwrtRulesQueryVo.getPageDto());
-        Page<PtlAgreementUndwrtRules> underwritingRules = ptlAgreementUndwrtRulesService.getByAgreementId(page,ptlAgreementUndwrtRulesQueryVo.getAgreementId());
+        Page<PtlAgreementUndwrtRules> underwritingRules = ptlAgreementUndwrtRulesService.getByAgreementId(page, ptlAgreementUndwrtRulesQueryVo.getAgreementId());
         return buildPageResponse(underwritingRules);
     }
 
@@ -189,13 +189,12 @@ public class PtlAgreementController extends BaseController {
 
     @GetMapping("undwrtRulesDelete")
     @ApiModelProperty("删除承保规则")
-    public HttpResult<Object> underwritingRulesDelete(String id){
+    public HttpResult<Object> underwritingRulesDelete(String id) {
         String userName = getUserName();
-        return ptlAgreementService.deleteAgreementUndwrtRules(id,userName);
+        return ptlAgreementService.deleteAgreementUndwrtRules(id, userName);
     }
 
 
-
     @PostMapping("/audit/{agreementId}")
     @ApiOperation("审核协议")
     public HttpResult<Object> audit(@PathVariable String agreementId, @RequestBody PtlAgreementAuditVo ptlAgreementAuditVo) {
@@ -210,19 +209,20 @@ public class PtlAgreementController extends BaseController {
 
     @PostMapping("/noncarcost")
     @ApiOperation("获取非车险费用配置列表")
-    public HttpResult<List<PtlAgreementNonCarProductCostsVo>> getAgreementNonCarCosts(@RequestBody PtlAgreement ptlAgreement){
-        return ptlAgreementService.getNonCarCostsInfo(ptlAgreement.getAgreementCode(),ptlAgreement.getAssociationCompaniesId());
+    public HttpResult<List<PtlAgreementNonCarProductCostsVo>> getAgreementNonCarCosts(@RequestBody PtlAgreement ptlAgreement) {
+        return ptlAgreementService.getNonCarCostsInfo(ptlAgreement.getAgreementCode(), ptlAgreement.getAssociationCompaniesId());
     }
 
     @PostMapping("/findrelationagree")
     @ApiOperation("获取可同步协议列表")
-    public HttpResult<List<PtlAgreement>> findRelationAgreement(@RequestBody PtlAgreement ptlAgreement){
+    public HttpResult<List<PtlAgreement>> findRelationAgreement(@RequestBody PtlAgreement ptlAgreement) {
         return ptlAgreementService.findRelationAgreement(ptlAgreement.getAssociationCompaniesId());
     }
+
     @GetMapping("getDockingPersonList")
     @ApiOperation("获取对接人列表")
-    public HttpResult getDockingPersonList(){
-        List<HashMap<String,Object>>list = ptlAgreementService.getDockingPersonList();
+    public HttpResult getDockingPersonList() {
+        List<HashMap<String, Object>> list = ptlAgreementService.getDockingPersonList();
         return HttpResult.ok(list);
     }
 

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

@@ -32,12 +32,13 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 获取可以报价的 可录入外部订单的协议
+     *
      * @param deptId
      * @return
      */
     List<PtlAgreementInsCompanyDto> getAgreementCompanyExternal(String deptId);
 
-    PtlAgreementInsCompanyDto getAgreementCompany(String deptId,String companyId);
+    PtlAgreementInsCompanyDto getAgreementCompany(String deptId, String companyId);
 
 
     /**
@@ -59,6 +60,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 添加协议产品费用
+     *
      * @param agreement
      * @param userName
      * @return
@@ -68,6 +70,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 修改协议产品费用
+     *
      * @param agreement
      * @param userName
      * @return
@@ -76,7 +79,6 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
 
     /**
-     *
      * @param id
      * @return
      */
@@ -84,6 +86,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 添加非车产品协议
+     *
      * @param agreement
      * @param userName
      * @return
@@ -92,6 +95,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 添加承保规则
+     *
      * @param ptlAgreementUndwrtRules
      * @param userName
      * @return
@@ -100,6 +104,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 修改承保规则
+     *
      * @param ptlAgreementUndwrtRules
      * @param userName
      * @return
@@ -108,25 +113,28 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 删除承保规则
+     *
      * @param id
      * @param userName
      * @return
      */
     HttpResult<Object> deleteAgreementUndwrtRules(String id, String userName);
+
     /**
      * 分页查询协议
      *
      * @param ptlAgreementPageVo 分页查询参数
      * @return HttpResult
      */
-    Page<PtlAgreement> pageAgreement(Page page,PtlAgreementPageVo ptlAgreementPageVo);
+    Page<PtlAgreement> pageAgreement(Page page, PtlAgreementPageVo ptlAgreementPageVo);
 
     /**
      * 根据保险公司查询协议
+     *
      * @param ptlAgreementPageVo
      * @return
      */
-    HttpResult<List<PtlAgreement>> listAgreement( PtlAgreementPageVo ptlAgreementPageVo);
+    HttpResult<List<PtlAgreement>> listAgreement(PtlAgreementPageVo ptlAgreementPageVo);
 
     /**
      * 通过协议id查询
@@ -142,7 +150,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      * @param agreementId 协议id
      * @return HttpResult
      */
-    HttpResult<Object> deleteAgreement(String agreementId,String userName);
+    HttpResult<Object> deleteAgreement(String agreementId, String userName);
 
     /**
      * 修改协议
@@ -186,15 +194,16 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
     /**
      * 校验登录
      *
-     * @param ptlAgreement     协议信息
-     * @param agreementSaveDto 协议添加实体
-     * @param attribution      协议归属添加实体
+     * @param ptlAgreement      协议信息
+     * @param agreementSaveDto  协议添加实体
+     * @param attribution       协议归属添加实体
      * @param verificationLogin 验证登录
      */
     EsmInsCompany verifyLogin(PtlAgreement ptlAgreement, PtlAgreementSaveDto agreementSaveDto, PtlAgreementAttributionDto attribution, boolean verificationLogin);
 
     /**
      * 根据协议编码，归属保险公司获取非车险费用配置信息
+     *
      * @param agreementId
      * @param companyId
      * @return
@@ -203,6 +212,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     /**
      * 根据归属保司，查询上级以及本级相关协议集合
+     *
      * @param associationCompaniesId
      * @return
      */
@@ -210,15 +220,16 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/15 18:04
-     *  @Description: 查询所有审核的协议
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/15 18:04
+     * @Description: 查询所有审核的协议
      */
     List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement);
 
     /**
      * 获取当前费用的保险公司所有协议
+     *
      * @param agreementId
      * @return
      */
@@ -239,6 +250,12 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     List<PtlAgreementInsCompanyDto> getExternalAgreement();
 
-    List<PtlAgreement> getAllAgreement();
+    /**
+     * 复制费用协议查询
+     *
+     * @param agreementId
+     * @return
+     */
+    List<PtlAgreement> getAllAgreement(String agreementId);
 
 }

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

@@ -832,7 +832,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<PtlAgreementInsCompanyDto> result = new ArrayList<>();
 
 
-        companyList.forEach(item->{
+        companyList.forEach(item -> {
             PtlAgreementInsCompanyDto ptlAgreementInsCompanyDto = new PtlAgreementInsCompanyDto();
             ptlAgreementInsCompanyDto.setId(item.getId());
             ptlAgreementInsCompanyDto.setCnName(item.getCnName());
@@ -841,9 +841,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             ptlAgreementInsCompanyDto.setNamesimple(item.getNamesimple());
             List<PtlAgreement> collect = list.stream().filter(x -> x.getInsuranceCompanyId().equals(item.getId())).collect(Collectors.toList());
             List<PtlAgreementDto> agreementDtos = new ArrayList<>();
-            collect.forEach(x->{
+            collect.forEach(x -> {
                 PtlAgreementDto ptlAgreementDto = new PtlAgreementDto();
-                BeanUtils.copyProperties(x,ptlAgreementDto);
+                BeanUtils.copyProperties(x, ptlAgreementDto);
                 agreementDtos.add(ptlAgreementDto);
             });
             ptlAgreementInsCompanyDto.setAgreement(agreementDtos);
@@ -853,18 +853,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public List<PtlAgreement> getAllAgreement() {
-        LocalDateTime now = LocalDateTime.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String currentTime = now.format(formatter);
-
-        List<PtlAgreement> ptlAgreements = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>()                // 协议起期
-                .le(PtlAgreement::getStartDate, currentTime)
-                // 协议止期
-                .ge(PtlAgreement::getEndDate, currentTime)
-                .eq(PtlAgreement::getValidStatus, "1"));
-        return ptlAgreements;
+    public List<PtlAgreement> getAllAgreement(String agreementId) {
+        PtlAgreement ptlAgreement = getById(agreementId);
+        return baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>()
+                .eq(PtlAgreement::getAssociationCompaniesId, ptlAgreement.getAssociationCompaniesId()));
     }
 
-
-}
+}