Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostBatchUpdateValidDateParam.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -33,10 +34,10 @@ public class PtlAgreementCostBatchUpdateValidDateParam implements Serializable {
 
     @Schema(description = "生效时间（起）", requiredMode = Schema.RequiredMode.REQUIRED)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effectiveTime;
+    private LocalDateTime effectiveTime;
 
     @Schema(description = "失效时间（止）", requiredMode = Schema.RequiredMode.REQUIRED)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date failureTime;
+    private LocalDateTime failureTime;
 
 }

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostEnd.java

@@ -9,6 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -45,12 +46,12 @@ public class PtlAgreementCostEnd {
     @Schema(description = "生效时间")
     @NotNull(message = "生效时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effectiveTime;
+    private LocalDateTime effectiveTime;
 
     @Schema(description = "失效时间")
     @NotNull(message = "失效时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date failureTime;
+    private LocalDateTime  failureTime;
 
     @Schema(description = "审核方式0-自动审核；1-手动审核")
     @NotBlank(message = "审核方式不能为空")

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -455,7 +455,7 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
             return HttpResult.error("生效时间和失效时间至少要传一个");
         }
         if (param.getEffectiveTime() != null && param.getFailureTime() != null) {
-            if (param.getFailureTime().before(param.getEffectiveTime())
+            if (param.getFailureTime().isBefore(param.getEffectiveTime())
                     || param.getFailureTime().equals(param.getEffectiveTime())) {
                 return HttpResult.error("失效时间必须晚于生效时间");
             }