项目库

pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java

@@ -45,8 +45,8 @@ public class GovBusinessStripController {
 
     @GetMapping("/list")
     @ApiOperation("获取省局条线列表")
-    public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList() {
-        return govBusinessStripManage.getProvincialGovBusinessStripList();
+    public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList(@RequestParam(value = "businessStripName", required = false) String businessStripName) {
+        return govBusinessStripManage.getProvincialGovBusinessStripList(businessStripName);
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java

@@ -6,6 +6,7 @@ import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO;
 import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO;
 import com.ningdatech.pmapi.organization.service.IGovBusinessStripService;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -42,12 +43,16 @@ public class GovBusinessStripManage {
         }).collect(Collectors.toList());
     }
 
-    public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList() {
+    public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList(String businessStripName) {
         List<ProvincialGovBusinessStripVO> provincialGovBusinessStripVOList = new ArrayList<>();
         ProvincialGovBusinessStripVO provincialGovBusinessStripVO = new ProvincialGovBusinessStripVO();
         provincialGovBusinessStripVO.setBusinessStripCode("test_provincial_manage_org_code");
         provincialGovBusinessStripVO.setBusinessStripName("测试省局条线主管单位");
         provincialGovBusinessStripVOList.add(provincialGovBusinessStripVO);
+
+        provincialGovBusinessStripVOList = provincialGovBusinessStripVOList.stream()
+                .filter(b -> StringUtils.isBlank(businessStripName) || b.getBusinessStripName().equals(businessStripName))
+                .collect(Collectors.toList());
         return provincialGovBusinessStripVOList;
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -262,7 +262,7 @@ public class Project implements Serializable {
     private String approvedFile;
 
     @ApiModelProperty("立项批复时间")
-    private LocalDate approvalDate;
+    private LocalDateTime approvalDate;
 
     @ApiModelProperty("批复金额")
     private BigDecimal approvedTotalInvestmentIncrease;

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectApprovedReq.java

@@ -1,5 +1,6 @@
 package com.ningdatech.pmapi.projectlib.model.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +11,7 @@ import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -34,8 +36,9 @@ public class ProjectApprovedReq {
     private BigDecimal approvedAmount;
 
     @NotNull(message = "批复时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("批复时间")
-    private LocalDate approvedDate;
+    private LocalDateTime approvedDate;
 
     @ApiModelProperty("建设周期")
     @NotNull(message = "建设周期不能为空")

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -269,7 +269,8 @@ public class ProjectDetailVO {
     private BigDecimal approvedTotalInvestmentIncrease;
 
     @ApiModelProperty("立项批复时间")
-    private LocalDate approvalDate;
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDateTime approvalDate;
 
     @ApiModelProperty("是否有上级条线主管部门 0没有 1有")
     private Integer isHigherSuperOrg;

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java

@@ -49,7 +49,8 @@ public class ProjectLibListItemVO {
     private BigDecimal approvedAmount;
 
     @ApiModelProperty("立项批复时间")
-    private LocalDate approvalDate;
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDateTime approvalDate;
 
     @ApiModelProperty("项目类型")
     private Integer projectType;
@@ -104,9 +105,10 @@ public class ProjectLibListItemVO {
     private Integer buildCycle;
 
     @ApiModelProperty("计划验收时间")
-    private LocalDate planAcceptanceTime;
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDateTime planAcceptanceTime;
 
-    public LocalDate getPlanAcceptanceTime(){
+    public LocalDateTime getPlanAcceptanceTime(){
         if (Objects.nonNull(this.approvalDate) && Objects.nonNull(this.buildCycle)) {
             planAcceptanceTime = this.approvalDate.plusMonths(buildCycle);
         }