修改协议字段查询 增加对接管理人

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementSaveDto.java

@@ -1,15 +1,12 @@
 package com.ydtech.modules.protocol.entity.dto;
 
 
-import com.ydtech.modules.protocol.entity.vo.PtlAgreementSaveVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
 
 @Data
 @ApiModel("协议添加实体")
@@ -88,4 +85,7 @@ public class PtlAgreementSaveDto implements Serializable {
 
     @ApiModelProperty("工号描述")
     private String jobDescription;
+
+    @ApiModelProperty("对接管理人")
+    private String custodianId;
 }

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -242,6 +242,18 @@ public class PtlAgreement implements Serializable {
     @TableField(value = "job_description")
     private String jobDescription;
 
+    /**
+     * 对接管理人工号
+     */
+    @TableField(value = "custodian_id")
+    private String custodianId;
+
+    /**
+     * 是否有效
+     */
+    @TableField(value = "is_valid")
+    private String isValid;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
@@ -257,8 +269,6 @@ public class PtlAgreement implements Serializable {
     @TableField(exist = false)
     private String partnerCompaniesName;
 
-    @TableField(exist = false)
-    private String isValid;
 
     @TableField(exist = false)
     private String name;

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementPageVo.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.protocol.entity.vo;
 
 
-import com.ydtech.core.page.BasePageVO;
 import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -79,4 +78,7 @@ public class PtlAgreementPageVo extends PageRequest {
 
     @ApiModelProperty("部门id")
     private String deptId;
+    @ApiModelProperty("是否有效")
+    private String isValid;
+
 }

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

@@ -212,6 +212,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreement.setCreator(userName);
         ptlAgreement.setCreateTime(LocalDateTime.now());
         ptlAgreement.setDeleted(0);
+        LocalDate startDate = agreementSaveDto.getStartDate();
+        LocalDate endDate = agreementSaveDto.getEndDate();
+        LocalDate now = LocalDate.now();
+        //更新是否有效
+        if (now.isEqual(startDate) || (now.isAfter(startDate) && now.isBefore(endDate))) {
+            ptlAgreement.setIsValid("1");
+        } else {
+            ptlAgreement.setIsValid("0");
+        }
         save(ptlAgreement);
         // 新增协议轨迹
         PtlAgreementTrajectory ptlAgreementTrajectory = new PtlAgreementTrajectory();
@@ -483,7 +492,9 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                         ptlAgreementPageVo.getAuditType())
                 // 对接人名字
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getDockingPerson()), PtlAgreement::getDockingPerson,
-                        ptlAgreementPageVo.getDockingPerson());
+                        ptlAgreementPageVo.getDockingPerson())
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getIsValid()), PtlAgreement::getIsValid,
+                        ptlAgreementPageVo.getIsValid());
         // 录入时间
         if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())) {
             LocalDateTime startDateTime = ptlAgreementPageVo.getStartDate().atTime(LocalTime.MIN);
@@ -535,15 +546,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         Page<PtlAgreement> agreementPage = page(page, wrapper);
         for (PtlAgreement agreement : agreementPage.getRecords()) {
             LocalDate startDate = agreement.getStartDate();
-            System.out.println(startDate);
             LocalDate endDate = agreement.getEndDate();
             LocalDate now = LocalDate.now();
-
+            //更新是否有效
             if (now.isEqual(startDate) || (now.isAfter(startDate) && now.isBefore(endDate))) {
                 agreement.setIsValid("1");
             } else {
                 agreement.setIsValid("0");
             }
+            ptlAgreementMapper.updateById(agreement);
             // 判断是否勾选
             if(agreeMap.containsKey(agreement.getId())){
                 agreement.setCheck(true);

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

@@ -143,6 +143,15 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             ptlAgreementProductCostsNewLambdaQueryWrapper
                     .ge(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
         }
+        // 创建时间
+        if (agreementProductQueryVo.getCreateStartTime() != null) {
+            ptlAgreementProductCostsNewLambdaQueryWrapper
+                    .ge(PtlAgreementProductCostsNew::getCreateTime, agreementProductQueryVo.getCreateStartTime());
+        }
+        if (agreementProductQueryVo.getCreateEndTime() != null) {
+            ptlAgreementProductCostsNewLambdaQueryWrapper
+                    .le(PtlAgreementProductCostsNew::getCreateTime, agreementProductQueryVo.getCreateEndTime());
+        }
         //是否有效  1失效  2 有效
         if (agreementProductQueryVo.getIsEffective() != null) {
             if (agreementProductQueryVo.getIsEffective().equals("1")) {