Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev

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>

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;