From fc82b02de61ff78472ab66177cec33552e4bae00 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 16 Aug 2023 11:19:33 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E7=BB=AD=E5=BB=BA=E8=B5=84=E9=87=91?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProjectRenewalFundDeclarationMapper.xml           | 12 ++++++------
 .../pmapi/projectlib/model/req/ProjectRenewalListReq.java    |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml
index ef954f1..b550e0b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml
@@ -26,8 +26,8 @@
         <if test="param.projectType != null">
             and p.project_type = #{param.projectType}
         </if>
-        <if test="param.projectYear != null">
-            and p.project_year = #{param.projectYear}
+        <if test="param.year != null">
+            and p.project_year = #{param.year}
         </if>
         <if test="param.stage != null">
             and p.stage = #{param.stage}
@@ -35,11 +35,11 @@
         <if test="param.status != null">
             and p.status = #{param.status}
         </if>
-        <if test="param.createOnMin != null">
-            and p.create_on &gt;= #{param.createOnMin}
+        <if test="param.startTime != null">
+            and p.create_on &gt;= #{param.startTime}
         </if>
-        <if test="param.createOnMax != null">
-            and p.create_on &lt;= #{param.createOnMax}
+        <if test="param.endTime != null">
+            and p.create_on &lt;= #{param.endTime}
         </if>
     </select>
 </mapper>
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java
index 2dd6409..486fa9f 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectRenewalListReq.java
@@ -32,7 +32,7 @@ public class ProjectRenewalListReq extends PagePo {
     private Integer projectType;
 
     @ApiModelProperty("预算年度")
-    private Integer projectYear;
+    private Integer year;
 
     @ApiModelProperty("项目阶段")
     private Integer stage;
@@ -42,11 +42,11 @@ public class ProjectRenewalListReq extends PagePo {
 
     @ApiModelProperty("创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime createOnMin;
+    private LocalDateTime startTime;
 
     @ApiModelProperty("创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime createOnMax;
+    private LocalDateTime endTime;
 
     @ApiModelProperty("用户ID")
     private Long userId;