修改立项备案查询列表

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/MhProjectManage.java

@@ -23,8 +23,6 @@ import com.ningdatech.basic.util.CollUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -51,11 +49,11 @@ public class MhProjectManage {
         LambdaQueryWrapper<MhProject> query = Wrappers.lambdaQuery(MhProject.class)
                 .like(StrUtil.isNotBlank(req.getProjectName()), MhProject::getProjectName, req.getProjectName())
                 .like(StrUtil.isNotBlank(req.getDeclaredUnit()), MhProject::getUnitName, req.getDeclaredUnit());
-        if (req.getBudgetYear() != null) {
-            LocalDateTime startTime = LocalDate.of(req.getBudgetYear(), 1, 1).atStartOfDay();
-            LocalDateTime endTime = startTime.plusYears(1);
-            query.ge(MhProject::getCreateTime, startTime);
-            query.lt(MhProject::getCreateTime, endTime);
+        if (req.getCreateDateMin() != null) {
+            query.ge(MhProject::getCreateTime, req.getCreateDateMin());
+        }
+        if (req.getCreateDateMax() != null) {
+            query.lt(MhProject::getCreateTime, req.getCreateDateMax().minusDays(1));
         }
         UserInfoDetails user = LoginUserUtil.loginUserDetail();
         if (!user.getSuperAdmin() && !user.getRegionAdmin()) {
@@ -89,7 +87,6 @@ public class MhProjectManage {
             } else {
                 item.setStatus(project.getStatus());
                 item.setStage(project.getStage());
-                item.setBizDomain(project.getBizDomain());
             }
             item.setProjectCode(w.getProjectCode());
             item.setProjectName(w.getProjectName());

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/req/DeclaredProjectListReq.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  * DeclaredProjectListReq
@@ -23,10 +25,10 @@ public class DeclaredProjectListReq extends PagePo {
     @ApiModelProperty("申报单位")
     private String declaredUnit;
 
-    @ApiModelProperty("项目类型")
-    private String projectType;
+    @ApiModelProperty("创建时间（开始）")
+    private LocalDate createDateMin;
 
-    @ApiModelProperty("预算年度")
-    private Integer budgetYear;
+    @ApiModelProperty("创建时间（结束）")
+    private LocalDate createDateMax;
 
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java

@@ -23,9 +23,6 @@ public class DeclaredProjectListVO {
     @ApiModelProperty("申报单位")
     private String declaredUnit;
 
-    @ApiModelProperty("领域")
-    private Integer bizDomain;
-
     @ApiModelProperty("项目申报金额（万元）")
     private BigDecimal declaredAmount;