费用复制的参数调整

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -709,6 +709,10 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         }else if(ptlAgreementUndwrtRulesAttr.getAttrType().equals("input")){
             return inputTextEqual(ptlAgreementUndwrtRulesAttrLink,value);
         }else if(ptlAgreementUndwrtRulesAttr.getAttrType().equals("select")){
+            //截取车牌
+            if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo")){
+                value = value.substring(0,2);
+            }
             return selectEqual(ptlAgreementUndwrtRulesAttrLink,value);
         }else if(ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio")){
             return radioEqual(ptlAgreementUndwrtRulesAttrLink,value);

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

@@ -101,10 +101,10 @@ public class PtlNewAgreementController extends BaseController {
 
     @ApiOperation(value = "复制协议费用")
     @PostMapping("/costs/copy")
-    public HttpResult costsCopy(String orgCostsId,String newAgreementId){
+    public HttpResult costsCopy(@RequestBody  AgreementProductCostsCopyVo agreementProductCostsCopyVo){
         //orgCostsId:原协议费用id
         //newAgreementId:新协议id
-        return ptlAgreementProductCostsNewService.costsCopy(orgCostsId,newAgreementId) ? HttpResult.ok("复制协议费用成功") : HttpResult.error("复制协议费用失败");
+        return ptlAgreementProductCostsNewService.costsCopy(agreementProductCostsCopyVo) ? HttpResult.ok("复制协议费用成功") : HttpResult.error("复制协议费用失败");
     }
 
     @ApiOperation(value = "调整费用")

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

@@ -0,0 +1,15 @@
+package com.ydtech.modules.protocols.entity.vo;
+
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AgreementProductCostsCopyVo {
+    @ApiModelProperty(value = "原始的费用id")
+    private String orgCostsId;
+
+    @ApiModelProperty(value = "复制到的协议id")
+    private String newAgreementId;
+
+}

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

@@ -6,10 +6,7 @@ import com.ydtech.modules.order.entity.vo.FeeOrderNewRecordVo;
 import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementUndwrtRulesAttr;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductCostsSave;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductQueryVo;
-import com.ydtech.modules.protocols.entity.vo.CostsAuditVo;
+import com.ydtech.modules.protocols.entity.vo.*;
 
 import java.util.List;
 import java.util.Map;
@@ -64,11 +61,10 @@ public interface PtlAgreementProductCostsNewService extends IService<PtlAgreemen
 
     /**
      * 复制协议费用
-     * @param orgCostsId
-     * @param newAgreementId
+     * @param agreementProductCostsCopyVo
      * @return
      */
-    boolean costsCopy(String orgCostsId,String newAgreementId);
+    boolean costsCopy(AgreementProductCostsCopyVo agreementProductCostsCopyVo);
 
     /**
      * 费用审核

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

@@ -24,10 +24,7 @@ import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.service.PtlAreaLicenseService;
 import com.ydtech.modules.protocols.dao.PtlAgreementProductCostsNewMapper;
 import com.ydtech.modules.protocols.entity.po.*;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductCostsSave;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductQueryVo;
-import com.ydtech.modules.protocols.entity.vo.CostsAuditVo;
+import com.ydtech.modules.protocols.entity.vo.*;
 import com.ydtech.modules.protocols.service.*;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiOperation;
@@ -625,27 +622,26 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
     /**
      * 复制协议费用
-     * @param orgCostsId  原始的费用id
-     * @param newAgreementId  需要复制的协议id
+     * @param agreementProductCostsCopyVo
      * @return
      */
     @Transactional
     @Override
-    public boolean costsCopy(String orgCostsId, String newAgreementId) {
+    public boolean costsCopy(AgreementProductCostsCopyVo agreementProductCostsCopyVo) {
         AgreementProductCosts agreementProductCosts = new AgreementProductCosts();
         //设置主表信息
-        PtlAgreementProductCostsNew ptlAgreementProductCostsNew = baseMapper.selectById(orgCostsId);
-        ptlAgreementProductCostsNew.setAgreementId(newAgreementId);
+        PtlAgreementProductCostsNew ptlAgreementProductCostsNew = baseMapper.selectById(agreementProductCostsCopyVo.getOrgCostsId());
+        ptlAgreementProductCostsNew.setAgreementId(agreementProductCostsCopyVo.getNewAgreementId());
         BeanUtils.copyProperties(ptlAgreementProductCostsNew, agreementProductCosts);
 
 
         //设置管理比例信息
-        PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, orgCostsId));
+        PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, agreementProductCostsCopyVo.getOrgCostsId()));
         BeanUtils.copyProperties(ptlAgreementProductCostsExport, agreementProductCosts);
         ptlAgreementProductCostsExport.setId("0");
 
         //设置费用因子信息
-        List<PtlAgreementProductCostsAttrLink> ptlAgreementProductCostsAttrLink = ptlAgreementProductCostsAttrLinkService.list(new LambdaQueryWrapper<PtlAgreementProductCostsAttrLink>().eq(PtlAgreementProductCostsAttrLink::getCostsId, orgCostsId));
+        List<PtlAgreementProductCostsAttrLink> ptlAgreementProductCostsAttrLink = ptlAgreementProductCostsAttrLinkService.list(new LambdaQueryWrapper<PtlAgreementProductCostsAttrLink>().eq(PtlAgreementProductCostsAttrLink::getCostsId, agreementProductCostsCopyVo.getOrgCostsId()));
         agreementProductCosts.setCostsAttrLinks(ptlAgreementProductCostsAttrLink);
         agreementProductCosts.setId("0");