Browse Source

采购详情、实施详情修改

tags/24080901
WendyYang 9 months ago
parent
commit
030b062af6
3 changed files with 28 additions and 5 deletions
  1. +9
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/OperationVO.java
  2. +18
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java
  3. +1
    -1
      hz-pm-gen/src/main/java/com/hz/pm/gen/config/CodeGen.java

+ 9
- 2
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/OperationVO.java View File

@@ -2,9 +2,7 @@ package com.hz.pm.api.projectdeclared.model.vo;


import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;


import java.time.LocalDateTime; import java.time.LocalDateTime;


@@ -59,4 +57,13 @@ public class OperationVO {
@ApiModelProperty("开始实施时间") @ApiModelProperty("开始实施时间")
private LocalDateTime startTrialOperationDate; private LocalDateTime startTrialOperationDate;


@ApiModelProperty("适配改造时间")
private LocalDateTime adaptationTime;

@ApiModelProperty("系统自测时间")
private LocalDateTime selfTestTime;

@ApiModelProperty("测试验证时间")
private LocalDateTime testValidTime;

} }

+ 18
- 2
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java View File

@@ -1,6 +1,5 @@
package com.hz.pm.api.projectdeclared.model.vo; package com.hz.pm.api.projectdeclared.model.vo;


import com.hz.pm.api.projectdeclared.model.dto.PreInsAcceptancePersonSaveDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@@ -9,7 +8,6 @@ import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;


/** /**
* @Classname Purchase * @Classname Purchase
@@ -88,6 +86,24 @@ public class PurchaseVO {
@ApiModelProperty("预算执行确认书编号") @ApiModelProperty("预算执行确认书编号")
private String budgetExecConfirmNo; private String budgetExecConfirmNo;


@ApiModelProperty("采购范围:1 公开采购、2 非公开采购")
private Integer purchaseScope;

@ApiModelProperty("采购单位")
private String purchaseUnit;

@ApiModelProperty("采购联系人")
private String purchaseContact;

@ApiModelProperty("采购联系电话")
private String purchasePhone;

@ApiModelProperty("采购联系地址")
private String purchaseConnectAddress;

@ApiModelProperty("采购说明")
private String purchaseRemark;

@ApiModelProperty("是否符合信创符合性要求") @ApiModelProperty("是否符合信创符合性要求")
private Boolean matchXcfhx; private Boolean matchXcfhx;




+ 1
- 1
hz-pm-gen/src/main/java/com/hz/pm/gen/config/CodeGen.java View File

@@ -55,7 +55,7 @@ public class CodeGen {
} }


public static void main(String[] args) { public static void main(String[] args) {
generate("WendyYang", "sys", PATH_YYD, "mh_todo_record");
generate("WendyYang", "sys", PATH_YYD, "nd_staging");
} }


} }

Loading…
Cancel
Save