批量更改费用止期 修改查找条件

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

@@ -149,6 +149,12 @@ public class PtlNewAgreementController extends BaseController {
         return ptlAgreementProductCostsNewService.costsAuditBatch(costsAuditVo) ? HttpResult.ok("费用批量审核成功") : HttpResult.error("费用批量审核失败");
     }
 
+    @ApiOperation(value = "费用批量修改止期")
+    @PostMapping("/costs/endDateBatch")
+    public HttpResult costsEndDateBatch(@RequestBody AgreementProductCostsEndDateVo agreementProductCostsEndDateVo){
+        return ptlAgreementProductCostsNewService.costsEndDateBatch(agreementProductCostsEndDateVo) ? HttpResult.ok("费用批量修改成功") : HttpResult.error("费用批量修改失败");
+    }
+
     @ApiOperation(value = "获取承保规则列表")
     @PostMapping("/undwrt/rules/list")
     public PageResult getRulesList(@RequestBody AgreementUndwrtRulesQueryVo agreementUndwrtRulesQueryVo){

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

@@ -0,0 +1,15 @@
+package com.ydtech.modules.protocols.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgreementProductCostsEndDateVo {
+    @ApiModelProperty(value = "产品ids")
+    private List<String> ids;
+
+    @ApiModelProperty(value = "费用止期")
+    private String costsEndDate;
+}

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
+
 @Data
 public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty(value = "保险公司id")
@@ -21,7 +23,7 @@ public class AgreementProductQueryVo extends PageRequest {
     private String isAudit;
 
     @ApiModelProperty(value = "产品id")
-    private String productCode;
+    private List<String> productCode;
 
     @ApiModelProperty(value = "费用起期")
     private String costStartDate;

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

@@ -84,6 +84,13 @@ public interface PtlAgreementProductCostsNewService extends IService<PtlAgreemen
      */
     boolean costsAuditBatch(CostsAuditVo costsAuditVo);
 
+    /**
+     * 费用批量更改费用止期
+     * @param agreementProductCostsEndDateVo
+     * @return
+     */
+    boolean costsEndDateBatch(AgreementProductCostsEndDateVo agreementProductCostsEndDateVo);
+
     /**
      * 调整费用
      * @param feeOrderNewRecordVo

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

@@ -91,8 +91,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         }
 
         //产品code
-        if (agreementProductQueryVo.getProductCode() != null){
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
+        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()){
+            ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
         //费用时间
@@ -193,7 +193,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         }
 
         //产品code
-        if(agreementProductQueryVo.getProductCode() != null){
+        if(agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()){
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
@@ -675,6 +675,10 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
         //修改审核状态为未审核
         ptlAgreementProductCostsNew.setIsAudit(0);
+        String newProjectId = agreementProductCosts.getProductId().get(0);
+        String newProjectName = agreementProductCosts.getProductName().get(0);
+        ptlAgreementProductCostsNew.setProductId(newProjectId);
+        ptlAgreementProductCostsNew.setProductName(newProjectName);
         int update = baseMapper.updateById(ptlAgreementProductCostsNew);
 
         //更新费用出口表信息
@@ -966,6 +970,27 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         return true;
     }
 
+    @Override
+    @Transactional
+    public boolean costsEndDateBatch(AgreementProductCostsEndDateVo agreementProductCostsEndDateVo){
+        for (String id : agreementProductCostsEndDateVo.getIds()){
+            PtlAgreementProductCostsNew ptlAgreementProductCostsNew = this.getById(id);
+            if(ptlAgreementProductCostsNew == null){
+                throw new SystemException("费用不存在");
+            }
+            if (agreementProductCostsEndDateVo.getCostsEndDate() == null) {
+                throw new SystemException("费用止期不可为空");
+            }
+            ptlAgreementProductCostsNew.setCostsEndDate(agreementProductCostsEndDateVo.getCostsEndDate());
+            String desc = "修改费用因子";
+            //添加费用因子轨迹
+            ptlAgreementProductCostsTrajectoryService.addCostsTrajectory(ptlAgreementProductCostsNew.getId(),desc,BaseController.getUser().getId());
+            baseMapper.updateById(ptlAgreementProductCostsNew);
+        }
+        return true;
+    }
+
+
     @Autowired
     PtlAgreementService ptlAgreementService;