产品录入 描述查询

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

@@ -92,7 +92,7 @@ public class PtlNewAgreementController extends BaseController {
 
     @ApiOperation(value = "添加协议费用")
     @PostMapping("/costs/add")
-    public HttpResult costsAdd(@RequestBody List<AgreementProductCosts> agreementProductCostsList) {
+    public HttpResult costsAdd(@RequestBody AgreementProductCosts agreementProductCostsList) {
         return ptlAgreementProductCostsNewService.costsAdd(agreementProductCostsList) ? HttpResult.ok("添加协议费用成功") : HttpResult.error("添加协议费用失败");
     }
 

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

@@ -38,9 +38,12 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty(value = "是否有效")
     private String isEffective;
 
-    @ApiModelProperty(value = "描述")
+    @ApiModelProperty(value = "费用因子描述")
     private String desc;
 
+    @ApiModelProperty(value = "费用描述")
+    private String costsDescription;
+
     @ApiModelProperty("操作人")
     private String operator;
 

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

@@ -45,7 +45,7 @@ public interface PtlAgreementProductCostsNewService extends IService<PtlAgreemen
      * @param agreementProductCostsList
      * @return
      */
-    boolean costsAdd(List<AgreementProductCosts> agreementProductCostsList);
+    boolean costsAdd(AgreementProductCosts agreementProductCostsList);
 
     /**
      * 更新协议费用

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

@@ -118,6 +118,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             ptlAgreementProductCostsNewLambdaQueryWrapper.like(PtlAgreementProductCostsNew::getDesc, agreementProductQueryVo.getDesc());
         }
 
+        //费用描述
+        if (agreementProductQueryVo.getCostsDescription() != null) {
+            ptlAgreementProductCostsNewLambdaQueryWrapper.like(PtlAgreementProductCostsNew::getCostsDescription, agreementProductQueryVo.getCostsDescription());
+        }
+
         Page<PtlAgreementProductCostsNew> pages = baseMapper.selectPage(page, ptlAgreementProductCostsNewLambdaQueryWrapper);
 
 //                .lt(PtlAgreementProductCostsNew::getCostsStartDate, formattedDateTime)
@@ -440,7 +445,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 
     @Transactional
     @Override
-    public boolean costsAdd(List<AgreementProductCosts> agreementProductCostsList) {
+    public boolean costsAdd(AgreementProductCosts agreementProductCosts) {
 //2024-04-26  删除检测非车信息 强制填写费用
         //校验非车信息是否存在
 //        List<PtlAgreementProductCostsAttrLink> nonMotorInsurance = agreementProductCosts.getCostsAttrLinks().stream().filter(x -> x.getAttrCode().equals("NonMotorInsurance")).collect(Collectors.toList());
@@ -453,7 +458,6 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 //            }
 //        }
         try {
-            for (AgreementProductCosts agreementProductCosts : agreementProductCostsList) {
                 for (int i = 0; i < agreementProductCosts.getProductId().size(); i++) {
                     PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
                     BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
@@ -462,6 +466,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     if (ptlAgreementProductCostsNew.getPriorityLevel() == null) {
                         ptlAgreementProductCostsNew.setPriorityLevel(1);
                     }
+                    ptlAgreementProductCostsNew.setIsAudit(0);
                     ptlAgreementProductCostsNew.setProductId(agreementProductCosts.getProductId().get(i));
                     ptlAgreementProductCostsNew.setProductName(agreementProductCosts.getProductName().get(i));
                     ptlAgreementProductCostsNew.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -543,7 +548,6 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     //添加费用因子轨迹
                     ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(), "新增费用因子", BaseController.getUser().getId());
                 }
-            }
             return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -867,7 +871,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         agreementProductCosts.setCostsAttrLinks(ptlAgreementProductCostsAttrLink);
         agreementProductCosts.setId("0");
 
-        this.costsAdd((List<AgreementProductCosts>) agreementProductCosts);
+        this.costsAdd(agreementProductCosts);
 
         return true;
     }
@@ -904,7 +908,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             agreementProductCosts.setCostsAttrLinks(ptlAgreementProductCostsAttrLink);
             agreementProductCosts.setId("0");
 
-            this.costsAdd((List<AgreementProductCosts>) agreementProductCosts);
+            this.costsAdd(agreementProductCosts);
         }
 
         return true;