项目管理

purchase-system/src/main/java/com/ozs/pm/doman/PmDemand.java

@@ -1,7 +1,7 @@
 package com.ozs.pm.doman;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
+
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -60,7 +60,7 @@ public class PmDemand implements Serializable {
     /** 概算金额(万元（保留小数点后两位） */
     @ApiModelProperty("概算金额(万元（保留小数点后两位）")
     @TableField("EVALUATION")
-    private BigDecimal evaluation;
+    private Double evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */
     @ApiModelProperty("是否为超限额计划(0:未超额，1:超额)")

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandEngineering.java

@@ -60,7 +60,7 @@ public class PmDemandEngineering implements Serializable {
 
     @ApiModelProperty("工程建设计划文号")
     @TableField("PROJECT_CONSTRUCTION_PLAN_NUMBER")
-    private Double projectConstructionPlanNumber;
+    private String projectConstructionPlanNumber;
 
 
     @ApiModelProperty("任务书批复规模(㎡)")

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandEngineeringReqVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.List;
 
 /**
@@ -54,12 +54,12 @@ public class PmDemandEngineeringReqVo extends BaseEntity
     /** 工程建设计划文号 */
     @Excel(name = "工程建设计划文号")
     @ApiModelProperty("工程建设计划文号")
-    private BigDecimal projectConstructionPlanNumber;
+    private String projectConstructionPlanNumber;
 
     /** 任务书批复规模(㎡)*/
     @Excel(name = "任务书批复规模(㎡)")
     @ApiModelProperty("任务书批复规模(㎡)")
-    private BigDecimal tassignmentApprovalScale;
+    private Double tassignmentApprovalScale;
 
     /** 任务书批复投资 */
     @Excel(name = "任务书批复投资")
@@ -79,12 +79,12 @@ public class PmDemandEngineeringReqVo extends BaseEntity
     /** 采购项目规模(㎡) */
     @Excel(name = "采购项目规模(㎡)")
     @ApiModelProperty("采购项目规模(㎡)")
-    private BigDecimal procurementProjectScale;
+    private Double procurementProjectScale;
 
     /** 采购项目投资(万元) */
     @Excel(name = "采购项目投资(万元)")
     @ApiModelProperty("采购项目投资(万元)")
-    private BigDecimal procurementProjectInvestment;
+    private Double procurementProjectInvestment;
 
     /** 联系人 */
     @Excel(name = "联系人")
@@ -135,7 +135,7 @@ public class PmDemandEngineeringReqVo extends BaseEntity
     /** 最高限价 */
     @Excel(name = "最高限价")
     @ApiModelProperty("最高限价")
-    private BigDecimal ceilingPrice;
+    private Double ceilingPrice;
 
     /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
     @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandEquipReqVo.java

@@ -11,7 +11,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.List;
 
@@ -61,17 +61,17 @@ public class PmDemandEquipReqVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 需求提报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandMaterialsReqVo.java

@@ -11,7 +11,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.List;
 
@@ -74,21 +74,21 @@ public class PmDemandMaterialsReqVo extends BaseEntity {
      */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /**
      * 单价(元)
      */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /**
      * 预算金额(万元)
      */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /**
      * 需求提报时间
@@ -120,6 +120,6 @@ public class PmDemandMaterialsReqVo extends BaseEntity {
     /**
      * 上传附件
      */
-    @ApiModelProperty("上传附件")
+    @ApiModelProperty("上传附件列表")
     private List<SysFileRef> sysFileRefs;
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmDemandServeReqVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.List;
 
 /**
@@ -54,17 +54,17 @@ public class PmDemandServeReqVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 交货期限 */
     @Excel(name = "交货期限")

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandEngineeringResVo.java

@@ -9,7 +9,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.HashMap;
 
 /**
@@ -54,12 +54,12 @@ public class PmDemandEngineeringResVo extends BaseEntity
     /** 工程建设计划文号 */
     @Excel(name = "工程建设计划文号")
     @ApiModelProperty("工程建设计划文号")
-    private BigDecimal projectConstructionPlanNumber;
+    private String projectConstructionPlanNumber;
 
     /** 任务书批复规模(㎡)*/
     @Excel(name = "任务书批复规模(㎡)")
     @ApiModelProperty("任务书批复规模(㎡)")
-    private BigDecimal tassignmentApprovalScale;
+    private Double tassignmentApprovalScale;
 
     /** 任务书批复投资 */
     @Excel(name = "任务书批复投资")
@@ -79,12 +79,12 @@ public class PmDemandEngineeringResVo extends BaseEntity
     /** 采购项目规模(㎡) */
     @Excel(name = "采购项目规模(㎡)")
     @ApiModelProperty("采购项目规模(㎡)")
-    private BigDecimal procurementProjectScale;
+    private Double procurementProjectScale;
 
     /** 采购项目投资(万元) */
     @Excel(name = "采购项目投资(万元)")
     @ApiModelProperty("采购项目投资(万元)")
-    private BigDecimal procurementProjectInvestment;
+    private Double procurementProjectInvestment;
 
     /** 联系人 */
     @Excel(name = "联系人")
@@ -135,7 +135,7 @@ public class PmDemandEngineeringResVo extends BaseEntity
     /** 最高限价 */
     @Excel(name = "最高限价")
     @ApiModelProperty("最高限价")
-    private BigDecimal ceilingPrice;
+    private Double ceilingPrice;
 
     /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
     @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandEquipResVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.HashMap;
 
@@ -61,17 +61,17 @@ public class PmDemandEquipResVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 需求提报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandMaterialsResVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.HashMap;
 
@@ -74,21 +74,21 @@ public class PmDemandMaterialsResVo extends BaseEntity {
      */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /**
      * 单价(元)
      */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /**
      * 预算金额(万元)
      */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /**
      * 需求提报时间

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandResVo.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.HashMap;
 
@@ -71,7 +71,7 @@ public class PmDemandResVo extends BaseEntity
     /** 概算金额(万元（保留小数点后两位） */
     @Excel(name = "概算金额(万元 保留小数点后两位")
     @ApiModelProperty("概算金额(万元（保留小数点后两位）")
-    private BigDecimal evaluation;
+    private Double evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */
     @Excel(name = "是否为超限额计划(0:未超额，1:超额)")

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandServeResVo.java

@@ -9,7 +9,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+
 import java.util.HashMap;
 
 /**
@@ -54,17 +54,17 @@ public class PmDemandServeResVo extends BaseEntity
     /** 采购数量 */
     @Excel(name = "采购数量")
     @ApiModelProperty("采购数量")
-    private BigDecimal procurementQuantity;
+    private Double procurementQuantity;
 
     /** 单价(元) */
     @Excel(name = "单价(元)")
     @ApiModelProperty("单价(元)")
-    private BigDecimal price;
+    private Double price;
 
     /** 预算金额(万元) */
     @Excel(name = "预算金额(万元)")
     @ApiModelProperty("预算金额(万元)")
-    private BigDecimal budgetAmount;
+    private Double budgetAmount;
 
     /** 交货期限 */
     @Excel(name = "交货期限")