协议录入bug修改

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

@@ -62,4 +62,8 @@ public class PtlAgreementPageVo extends PageRequest {
     @ApiModelProperty("协议类型 1 平台 2 私有 3 网销")
     private Integer agreementType;
 
+    @ApiModelProperty("费用描述")
+    private String costsDescription;
+
+
 }

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

@@ -4,6 +4,8 @@ import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 public class PtlAgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("协议ID")
@@ -15,7 +17,10 @@ public class PtlAgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("操作类型")
     private String operatorType;
 
-    @ApiModelProperty("操作时间")
-    private String operatorTime;
+    @ApiModelProperty("操作开始时间")
+    private LocalDate operatorStartTime;
+
+    @ApiModelProperty("操作结束时间")
+    private LocalDate operatorEndTime;
 
 }

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

@@ -362,6 +362,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedBy()), PtlAgreement::getModifiedBy, ptlAgreementPageVo.getModifiedBy())
                 // 合作公司
                 .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
+                // 费用描述
+                .like(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCostsDescription()), PtlAgreement::getUnderwritingDescription, ptlAgreementPageVo.getCostsDescription())
                 // 协议起期
                 .le(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementStartDate()), PtlAgreement::getStartDate, ptlAgreementPageVo.getAgreementStartDate())
                 // 协议止期

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

@@ -47,7 +47,12 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("操作类型")
     private String operatorType;
 
-    @ApiModelProperty("操作时间")
-    private LocalDate operatorTime;
+    @ApiModelProperty("操作开始时间")
+    private LocalDate operatorStartTime;
+
+    @ApiModelProperty("操作结束时间")
+    private LocalDate operatorEndTime;
+
+
 
 }

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

@@ -4,6 +4,8 @@ import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 public class AgreementUndwrtRulesQueryVo extends PageRequest {
 
@@ -16,7 +18,10 @@ public class AgreementUndwrtRulesQueryVo extends PageRequest {
     @ApiModelProperty("操作类型")
     private String operatorType;
 
-    @ApiModelProperty("操作时间")
-    private String operatorTime;
+    @ApiModelProperty("操作开始时间")
+    private LocalDate operatorStartTime;
+
+    @ApiModelProperty("操作结束时间")
+    private LocalDate operatorEndTime;
 
 }

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

@@ -51,7 +51,8 @@ public class PtlAgreementProductCostsNewHistoryServiceImpl extends ServiceImpl<P
                 .eq("agreement_id", agreementProductQueryVo.getAgreementId())
                 .eq(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperator()), "modifier", agreementProductQueryVo.getOperator())
                 .eq(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorType()), "operator_type", agreementProductQueryVo.getOperatorType())
-                .eq(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorTime()), "DATE(`operator_time`)", agreementProductQueryVo.getOperatorTime());
+                .ge(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementProductQueryVo.getOperatorStartTime())
+                .le(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementProductQueryVo.getOperatorEndTime());
         Page selectPage = baseMapper.selectPage(page, wrapper);
         List<PtlAgreementProductCostsNewHistory> records = selectPage.getRecords();
 

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

@@ -61,7 +61,8 @@ public class PtlAgreementUndwrtRulesNewHistoryServiceImpl extends ServiceImpl<Pt
                 .eq("agreement_id", agreementUndwrtRulesQueryVo.getAgreementId())
                 .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperator()), "modifier", agreementUndwrtRulesQueryVo.getOperator())
                 .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorType()), "operator_type", agreementUndwrtRulesQueryVo.getOperatorType())
-                .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorTime());
+                .le(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorStartTime())
+                .ge(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorEndTime());
         Page selectPage = baseMapper.selectPage(page, wrapper);
         List<PtlAgreementUndwrtRulesNewHistory> records = selectPage.getRecords();
 

src/main/resources/mapper/modules/protocol/PtlAgreementHistoryMapper.xml

@@ -59,8 +59,8 @@
         <if test="vo.operator != null and vo.operator != ''">
             AND iah.operator = #{vo.operator}
         </if>
-        <if test="vo.operatorTime != null and vo.operatorTime != ''">
-            AND DATE(iah.operator_time) = #{vo.operatorTime}
+        <if test="vo.operatorStartTime != null and vo.operatorStartTime != ''">
+            AND DATE(iah.operator_time) between #{vo.operatorStartTime} AND #{vo.operatorEndTime}
         </if>
     </select>