1.协议复制代码修改

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

@@ -1161,7 +1161,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<PtlAgreementProductCostsNew> ptlAgreementProductCostsNews = new ArrayList<>();
         // 判断是否选择全部
         if (cost.isAll()) {
-            ptlAgreementProductCostsNews = ptlAgreementProductCostsNewService.getByAgreementId(ptlAgreement.getId());
+            ptlAgreementProductCostsNews = ptlAgreementProductCostsNewService.getByAgreementId(agreementAllInformationCopyVo.getAgreementId());
         } else if (!cost.getInformationId().isEmpty()) {
             ptlAgreementProductCostsNews = ptlAgreementProductCostsNewService.getByCostsIdList(cost.getInformationId());
         }
@@ -1172,7 +1172,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 判断是否选择全部
         List<PtlAgreementUndwrtRulesNew> ptlAgreementUndwrtRulesNews = new ArrayList<>();
         if (underwritingRules.isAll()) {
-            ptlAgreementUndwrtRulesNews = ptlAgreementUndwrtRulesNewService.getByAgreementId(ptlAgreement.getId());
+            ptlAgreementUndwrtRulesNews = ptlAgreementUndwrtRulesNewService.getByAgreementId(agreementAllInformationCopyVo.getAgreementId());
         } else if (!underwritingRules.getInformationId().isEmpty())  {
             ptlAgreementUndwrtRulesNews = ptlAgreementUndwrtRulesNewService.getByRulesIdList(underwritingRules.getInformationId());
         }

src/main/java/com/ydtech/modules/protocols/controller/PtlNewAgreementController.java

@@ -252,7 +252,7 @@ public class PtlNewAgreementController extends BaseController {
 
     @ApiOperation("复制协议费用承保规则")
     @PostMapping("/copyAgreementAllInformation")
-    public HttpResult<Object> copyAgreementAllInformation(AgreementAllInformationCopyVo agreementAllInformationCopyVo) {
+    public HttpResult<Object> copyAgreementAllInformation(@RequestBody AgreementAllInformationCopyVo agreementAllInformationCopyVo) {
         ptlAgreementService.agreementAllInformationCopyVo(agreementAllInformationCopyVo);
         return HttpResult.ok("复制成功");
     }

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementAllInformationCopyVo.java

@@ -34,7 +34,7 @@ public class AgreementAllInformationCopyVo implements Serializable {
     public static class InformationDTO{
 
         @ApiModelProperty("是否全部")
-        private boolean isAll;
+        private boolean all;
 
         @ApiModelProperty("承保规则id列表 和 费用id列表")
         private List<String> informationId;

src/main/java/com/ydtech/modules/protocols/service/PtlAgreementProductCostsNewService.java

@@ -49,7 +49,7 @@ public interface PtlAgreementProductCostsNewService extends IService<PtlAgreemen
      * @return 费用列表
      */
     default List<PtlAgreementProductCostsNew> getByCostsIdList(List<String> costsIdList) {
-        return lambdaQuery().eq(PtlAgreementProductCostsNew::getId, costsIdList).list();
+        return lambdaQuery().in(PtlAgreementProductCostsNew::getId, costsIdList).list();
     }
 
     /**

src/main/java/com/ydtech/modules/protocols/service/PtlAgreementUndwrtRulesNewService.java

@@ -66,7 +66,7 @@ public interface PtlAgreementUndwrtRulesNewService extends IService<PtlAgreement
      * @return 承保规则列表
      */
     default List<PtlAgreementUndwrtRulesNew> getByRulesIdList(List<String> rulesList) {
-        return lambdaQuery().eq(PtlAgreementUndwrtRulesNew::getAgreementId, rulesList).list();
+        return lambdaQuery().in(PtlAgreementUndwrtRulesNew::getId, rulesList).list();
     }
 
     /**

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

@@ -2536,19 +2536,21 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
         ptlAgreementProductCostsNewService.saveBatch(ptlAgreementProductCostsNews);
         // 映射新增之后的id 和 原先的数据
-        Map<String, PtlAgreementProductCostsNew> costsMapping = ptlAgreementProductCostsNews.stream()
-                .collect(Collectors.toMap(PtlAgreementProductCostsNew::getSaveBeforeId, x -> x));
+        Map<String, String> costsMapping = ptlAgreementProductCostsNews.stream()
+                .collect(Collectors.toMap(PtlAgreementProductCostsNew::getSaveBeforeId, PtlAgreementProductCostsNew::getId));
         // 协议费用出口比例
         ptlAgreementProductCostsExportList.forEach(x -> {
             x.setId(null);
-            x.setCostsId(costsMapping.get(x.getCostsId()).getId());
+            x.setCostsId(costsMapping.get(x.getCostsId()));
         });
         ptlAgreementProductCostsExportService.saveBatch(ptlAgreementProductCostsExportList);
 
         // 将出口和入口合并
+        Map<String, PtlAgreementProductCostsNew> costsMappingNew = ptlAgreementProductCostsNews.stream()
+                .collect(Collectors.toMap(PtlAgreementProductCostsNew::getId, x-> x));
         List<PtlAgreementProductCostsNewHistory> ptlAgreementProductCostsNewHistories = ptlAgreementProductCostsExportList.stream()
                 .map(x -> {
-                    PtlAgreementProductCostsNew ptlAgreementProductCostsNew = costsMapping.get(x.getCostsId());
+                    PtlAgreementProductCostsNew ptlAgreementProductCostsNew = costsMappingNew.get(x.getCostsId());
                     return new PtlAgreementProductCostsNewHistory(ptlAgreementProductCostsNew, x, OperatorType.ADD, batchId, userId);
                 })
                 .collect(Collectors.toList());
@@ -2557,7 +2559,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         // 费用因子规则
         ptlAgreementProductCostsAttrLinkList.forEach(x -> {
             x.setId(null);
-            x.setCostsId(costsMapping.get(x.getCostsId()).getId());
+            x.setCostsId(costsMapping.get(x.getCostsId()));
         });
         ptlAgreementProductCostsAttrLinkService.saveBatch(ptlAgreementProductCostsAttrLinkList);