项目管理 需求变更

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmDemandController.java

@@ -23,6 +23,8 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
 
 /**
  * 采购需求Controller
@@ -70,7 +72,7 @@ public class PmDemandController extends BaseController {
      */
     @ApiOperation(value = "需求建档", notes = "必传demandId,根据项目类型必传pmDemandEngineeringResponseVo(3：工程类)、pmDemandEquipResponseVo(0：装备类)、pmDemandMaterialsResponseVo(1：物资类)、pmDemandServeResponseVo(2：服务类)其中之一")
     @PostMapping("/bookBuilding")
-    public AjaxResult bookBuilding(@RequestBody PmBookBuildingReqVo pmBookBuildingReqVo, HttpServletRequest request) {
+    public AjaxResult bookBuilding(@NotEmpty(message = "数据为空") @RequestBody PmBookBuildingReqVo pmBookBuildingReqVo, HttpServletRequest request) {
         try {
             if (pmBookBuildingReqVo.getDemandId() == null) {
                 return AjaxResult.error("demandId不能为空");
@@ -80,7 +82,10 @@ public class PmDemandController extends BaseController {
                 return error("demandId参数错误");
             }
             LoginUser loginUser = tokenService.getLoginUser(request);
+            pmBookBuildingReqVo.setCreateBy(String.valueOf(loginUser.getUserId()));
+            pmBookBuildingReqVo.setCreateTime(new Date());
             pmBookBuildingReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
+            pmBookBuildingReqVo.setUpdateTime(pmBookBuildingReqVo.getCreateTime());
             return toAjax(pmDemandService.bookBuilding(pmBookBuildingReqVo));
         } catch (Exception e) {
             return error(e.getMessage());
@@ -93,6 +98,7 @@ public class PmDemandController extends BaseController {
         if(pmDemandReqVo.getDemandId() == null){
             return AjaxResult.error("demandId不能为空");
         }
+
         LoginUser loginUser = tokenService.getLoginUser(request);
         pmDemandReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
         return toAjax(pmDemandService.commit(pmDemandReqVo));

purchase-common/src/main/java/com/ozs/common/enums/SysFileRefEnum.java

@@ -13,20 +13,17 @@ public enum SysFileRefEnum {
     PLAN_TEMPORARY(2, "临时、季度计划附件"),
     PLAN_YEAR_EXAMINE(3, "年度计划审核文件"),
     PM_DEMAND(4, "采购需求附件"),
-    PM_DEMAND_EQUIP(5, "采购需求装备类附件"),
-    PM_DEMAND_MATERIALS(6, "采购需求物资类附件"),
-    PM_DEMAND_SERVE(7, "采购需求服务类附件"),
-    PM_DEMAND_ENGINEERING(8, "采购需求工程类附件"),
-    PM_DEMAND_EXAMINE(9, "采购需求审核文件"),
-    PM_TAST_RELEASE(10, "任务下达文件"),
-    PM_BID_FILE(11, "招标文件"),
-    PM_ANNOUNCEMENT_FILE(12, "公告文件"),
-    PM_BID_WINNING_FILE(13, "中标文件"),
-    PM_BID_FAILURE_FILE(14, "流标文件"),
-    PM_BID_CALL_QEUSTION_FILE(15, "质疑文件"),
-    PM_BID_WINNING_NOTIFICATION(16, "中标通知书"),
-    PM_CONTRACT_INFO (17, "合同信息附件"),
-    PM_PROJECT_CONSTRUCTION (18, "建设文档附件")
+    PM_BOOK_BUILDING(5, "需求建档附件"),
+    PM_DEMAND_EXAMINE(6, "采购需求审核文件"),
+    PM_TAST_RELEASE(7, "任务下达文件"),
+    PM_BID_FILE(8, "招标文件"),
+    PM_ANNOUNCEMENT_FILE(9, "公告文件"),
+    PM_BID_WINNING_FILE(10, "中标文件"),
+    PM_BID_FAILURE_FILE(11, "流标文件"),
+    PM_BID_CALL_QEUSTION_FILE(12, "质疑文件"),
+    PM_BID_WINNING_NOTIFICATION(13, "中标通知书"),
+    PM_CONTRACT_INFO (14, "合同信息附件"),
+    PM_PROJECT_CONSTRUCTION (15, "建设文档附件")
     ;
 
     private Integer type;

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

@@ -19,50 +19,42 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 合同单位关联表(PmContractUnitRef)实体类
+ * 需求建档表(PmBookBuilding)实体类
  *
  * @author makejava
- * @since 2023-02-02 00:47:22
+ * @since 2023-02-08 12:50:30
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("pm_contract_unit_ref")
-@ApiModel(value = "合同单位关联表", description = "")
-public class PmContractUnitRef implements Serializable {
-    private static final long serialVersionUID = 497813391870165785L;
+@TableName("pm_book_building")
+@ApiModel(value = "需求建档表", description = "")
+public class PmBookBuilding implements Serializable {
+    private static final long serialVersionUID = 554636460409301951L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
 
-    @ApiModelProperty("合同ID")
-    @TableField("CONTRACT_INFO_ID")
-    private Long contractInfoId;
-
-
     @ApiModelProperty("需求ID")
     @TableField("DEMAND_ID")
     private Long demandId;
 
-    @ApiModelProperty("单位ID（供应商或需求单位ID)")
-    @TableField("UNIT_ID")
-    private Long unitId;
 
-    @ApiModelProperty("单位类型，A:甲方，B：乙方")
-    @TableField("UNIT_TYPE")
-    private String unitType;
+    @ApiModelProperty("预算金额(万元)")
+    @TableField("BUDGET_AMOUNT")
+    private Double budgetAmount;
 
 
-    @ApiModelProperty("合同签订地点")
-    @TableField("CONTRACT_SIGN_PLACE")
-    private String contractSignPlace;
+    @ApiModelProperty("需求提报时间")
+    @TableField("DEMAND_COMMIT_TIME")
+    private Date demandCommitTime;
 
 
-    @ApiModelProperty("合同签订日期")
-    @TableField("CONTRACT_SIGN_DATE")
-    private Date contractSignDate;
+    @ApiModelProperty("备注")
+    @TableField("REMARKS")
+    private String remarks;
 
 
     @ApiModelProperty("创建者")

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

@@ -57,16 +57,16 @@ public class PmContractInfo implements Serializable {
     private Double contractAmount;
 
 
+    @ApiModelProperty("合同起始日期")
+    @TableField("CONTRACT_START_DATE")
+    private Date contractStartDate;
+
+
     @ApiModelProperty("合同终止日期")
     @TableField("CONTRACT_TERMINATION_DATE")
     private Date contractTerminationDate;
 
 
-    @ApiModelProperty("建设(交付)时间")
-    @TableField("CONSTRUCTION_DELIVERY_TIME")
-    private Date constructionDeliveryTime;
-
-
     @ApiModelProperty("创建者")
     @TableField("CREATE_BY")
     private String createBy;

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

@@ -1,171 +0,0 @@
-package com.ozs.pm.doman;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 采购需求工程类表(PmDemandEngineering)实体类
- *
- * @author makejava
- * @since 2023-02-04 19:36:13
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("pm_demand_engineering")
-@ApiModel(value = "采购需求工程类表", description = "")
-public class PmDemandEngineering implements Serializable {
-    private static final long serialVersionUID = 907919419476022620L;
-
-    @ApiModelProperty("主键")
-    @TableId(value = "DEMAND_ENGINEERING_ID", type = IdType.AUTO)
-    private Long demandEngineeringId;
-
-
-    @ApiModelProperty("需求ID")
-    @TableField("DEMAND_ID")
-    private Long demandId;
-
-
-    @ApiModelProperty("工程项目名称")
-    @TableField("ENGINEERING_NAME")
-    private String engineeringName;
-
-
-    @ApiModelProperty("建设地点")
-    @TableField("CONSTRUCTION_LOCATION")
-    private String constructionLocation;
-
-
-    @ApiModelProperty("设计任务书批复文号")
-    @TableField("DESIGN_ASSIGNMEN_APPROVAL_NUMBER")
-    private String designAssignmenApprovalNumber;
-
-
-    @ApiModelProperty("工程建设计划文号")
-    @TableField("PROJECT_CONSTRUCTION_PLAN_NUMBER")
-    private String projectConstructionPlanNumber;
-
-
-    @ApiModelProperty("任务书批复规模(㎡)")
-    @TableField("TASSIGNMENT_APPROVAL_SCALE")
-    private Double tassignmentApprovalScale;
-
-
-    @ApiModelProperty("任务书批复投资")
-    @TableField("TASSIGNMENT_APPROVAL_INVESTMEN")
-    private String tassignmentApprovalInvestmen;
-
-
-    @ApiModelProperty("规划许可文号")
-    @TableField("PLANNING_LICENSE_NUMBER")
-    private String planningLicenseNumber;
-
-
-    @ApiModelProperty("密级处理")
-    @TableField("CLASSIFIED_TREATMENT")
-    private String classifiedTreatment;
-
-
-    @ApiModelProperty("采购项目规模(㎡)")
-    @TableField("PROCUREMENT_PROJECT_SCALE")
-    private Double procurementProjectScale;
-
-
-    @ApiModelProperty("采购项目投资(万元)")
-    @TableField("PROCUREMENT_PROJECT_INVESTMENT")
-    private Double procurementProjectInvestment;
-
-
-    @ApiModelProperty("联系人")
-    @TableField("LINKMAN")
-    private String linkman;
-
-
-    @ApiModelProperty("电话")
-    @TableField("PHONE")
-    private String phone;
-
-
-    @ApiModelProperty("项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    @TableField("PROJECT_CATEGORY")
-    private String projectCategory;
-
-
-    @ApiModelProperty("承包方式（1工程总承包，2施工总承包，3专业承包）")
-    @TableField("CONTRACTING_MODE")
-    private String contractingMode;
-
-
-    @ApiModelProperty("施工图是否完成(0未完成，1完成)")
-    @TableField("CONSTRUCTION_DRAWING")
-    private String constructionDrawing;
-
-
-    @ApiModelProperty("设计单位")
-    @TableField("DESIGN_UNIT")
-    private String designUnit;
-
-
-    @ApiModelProperty("最高限价")
-    @TableField("CEILING_PRICE")
-    private Double ceilingPrice;
-
-
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @TableField("PROCUREMENT_METHOD_SUGGEST")
-    private String procurementMethodSuggest;
-
-
-    @ApiModelProperty("投标(报价)人资质等级要求")
-    @TableField("QUALIFICATION_LEVEL_REQUIREMENT")
-    private String qualificationLevelRequirement;
-
-
-    @ApiModelProperty("供应商")
-    @TableField("SUPPLIER_ID")
-    private Long supplierId;
-
-
-    @ApiModelProperty("备注")
-    @TableField("REMARKS")
-    private String remarks;
-
-
-    @ApiModelProperty("创建者")
-    @TableField("CREATE_BY")
-    private String createBy;
-
-
-    @ApiModelProperty("创建时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("更新者")
-    @TableField("UPDATE_BY")
-    private String updateBy;
-
-
-    @ApiModelProperty("更新时间")
-    @TableField("UPDATE_TIME")
-    private Date updateTime;
-
-
-}

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

@@ -1,117 +0,0 @@
-package com.ozs.pm.doman;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 采购需求装备类表(PmDemandEquip)实体类
- *
- * @author makejava
- * @since 2023-02-04 19:36:13
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("pm_demand_equip")
-@ApiModel(value = "采购需求装备类表", description = "")
-public class PmDemandEquip implements Serializable {
-    private static final long serialVersionUID = -13343009659577628L;
-
-
-    @ApiModelProperty("主键")
-    @TableId(value = "DEMAND_EQUIP_ID", type = IdType.AUTO)
-    private Long demandEquipId;
-
-
-    @ApiModelProperty("需求ID")
-    @TableField("DEMAND_ID")
-    private Long demandId;
-
-
-    @ApiModelProperty("物资类别及品种名称")
-    @TableField("TYPE_AND_NAME")
-    private String typeAndName;
-
-
-    @ApiModelProperty("规格型号长*宽*高")
-    @TableField("SPECIFICATION")
-    private String specification;
-
-
-    @ApiModelProperty("质量技术标准(技术参数):")
-    @TableField("QUALITY_TECHNICAL_STANDARD")
-    private String qualityTechnicalStandard;
-
-
-    @ApiModelProperty("计量单位")
-    @TableField("MEASUREMENT_UNIT")
-    private String measurementUnit;
-
-
-    @ApiModelProperty("采购数量")
-    @TableField("PROCUREMENT_QUANTITY")
-    private Double procurementQuantity;
-
-
-    @ApiModelProperty("单价(元)")
-    @TableField("PRICE")
-    private Double price;
-
-
-    @ApiModelProperty("预算金额(万元)")
-    @TableField("BUDGET_AMOUNT")
-    private Double budgetAmount;
-
-
-    @ApiModelProperty("需求提报时间")
-    @TableField("DEMAND_COMMIT_TIME")
-    private Date demandCommitTime;
-
-
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @TableField("PROCUREMENT_METHOD_SUGGEST")
-    private String procurementMethodSuggest;
-
-
-    @ApiModelProperty("备注")
-    @TableField("REMARKS")
-    private String remarks;
-
-
-    @ApiModelProperty("创建者")
-    @TableField("CREATE_BY")
-    private String createBy;
-
-
-    @ApiModelProperty("创建时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("更新者")
-    @TableField("UPDATE_BY")
-    private String updateBy;
-
-
-    @ApiModelProperty("更新时间")
-    @TableField("UPDATE_TIME")
-    private Date updateTime;
-
-
-}

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

@@ -1,117 +0,0 @@
-package com.ozs.pm.doman;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 采购需求物资类表(PmDemandMaterials)实体类
- *
- * @author makejava
- * @since 2023-02-04 19:36:14
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("pm_demand_materials")
-@ApiModel(value = "采购需求物资类表", description = "")
-public class PmDemandMaterials implements Serializable {
-    private static final long serialVersionUID = -69155120615102721L;
-
-
-    @ApiModelProperty("主键")
-    @TableId(value = "DEMAND_MATERIALS_ID", type = IdType.AUTO)
-    private Long demandMaterialsId;
-
-
-    @ApiModelProperty("需求ID")
-    @TableField("DEMAND_ID")
-    private Long demandId;
-
-
-    @ApiModelProperty("物资类别及品种名称")
-    @TableField("TYPE_AND_NAME")
-    private String typeAndName;
-
-
-    @ApiModelProperty("规格型号长*宽*高")
-    @TableField("SPECIFICATION")
-    private String specification;
-
-
-    @ApiModelProperty("质量技术标准(技术参数):")
-    @TableField("QUALITY_TECHNICAL_STANDARD")
-    private String qualityTechnicalStandard;
-
-
-    @ApiModelProperty("计量单位")
-    @TableField("MEASUREMENT_UNIT")
-    private String measurementUnit;
-
-
-    @ApiModelProperty("采购数量")
-    @TableField("PROCUREMENT_QUANTITY")
-    private Double procurementQuantity;
-
-
-    @ApiModelProperty("单价(元)")
-    @TableField("PRICE")
-    private Double price;
-
-
-    @ApiModelProperty("预算金额(万元)")
-    @TableField("BUDGET_AMOUNT")
-    private Double budgetAmount;
-
-
-    @ApiModelProperty("需求提报时间")
-    @TableField("DEMAND_COMMIT_TIME")
-    private Date demandCommitTime;
-
-
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @TableField("PROCUREMENT_METHOD_SUGGEST")
-    private String procurementMethodSuggest;
-
-
-    @ApiModelProperty("备注")
-    @TableField("REMARKS")
-    private String remarks;
-
-
-    @ApiModelProperty("创建者")
-    @TableField("CREATE_BY")
-    private String createBy;
-
-
-    @ApiModelProperty("创建时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("更新者")
-    @TableField("UPDATE_BY")
-    private String updateBy;
-
-
-    @ApiModelProperty("更新时间")
-    @TableField("UPDATE_TIME")
-    private Date updateTime;
-
-
-}

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

@@ -1,117 +0,0 @@
-package com.ozs.pm.doman;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 采购需求服务类表(PmDemandServe)实体类
- *
- * @author makejava
- * @since 2023-02-04 19:36:15
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("pm_demand_serve")
-@ApiModel(value = "采购需求服务类表", description = "")
-public class PmDemandServe implements Serializable {
-    private static final long serialVersionUID = -91312266847333541L;
-
-
-    @ApiModelProperty("主键")
-    @TableId(value = "DEMAND_SERVE_ID", type = IdType.AUTO)
-    private Long demandServeId;
-
-
-    @ApiModelProperty("需求ID")
-    @TableField("DEMAND_ID")
-    private Long demandId;
-
-
-    @ApiModelProperty("服务项目名称")
-    @TableField("SERVICE_NAME")
-    private String serviceName;
-
-
-    @ApiModelProperty("技术服务要求")
-    @TableField("TECHNICAL_SERVICE_REQUIREMENT")
-    private String technicalServiceRequirement;
-
-
-    @ApiModelProperty("计量单位")
-    @TableField("MEASUREMENT_UNIT")
-    private String measurementUnit;
-
-
-    @ApiModelProperty("采购数量")
-    @TableField("PROCUREMENT_QUANTITY")
-    private Double procurementQuantity;
-
-
-    @ApiModelProperty("单价(元)")
-    @TableField("PRICE")
-    private Double price;
-
-
-    @ApiModelProperty("预算金额(万元)")
-    @TableField("BUDGET_AMOUNT")
-    private Double budgetAmount;
-
-
-    @ApiModelProperty("交货期限")
-    @TableField("DELIVERY_TIME_LIMIT")
-    private String deliveryTimeLimit;
-
-
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @TableField("PROCUREMENT_METHOD_SUGGEST")
-    private String procurementMethodSuggest;
-
-
-    @ApiModelProperty("供应商")
-    @TableField("SUPPLIER_ID")
-    private Long supplierId;
-
-
-    @ApiModelProperty("备注")
-    @TableField("REMARKS")
-    private String remarks;
-
-
-    @ApiModelProperty("创建者")
-    @TableField("CREATE_BY")
-    private String createBy;
-
-
-    @ApiModelProperty("创建时间")
-    @TableField("CREATE_TIME")
-    private Date createTime;
-
-
-    @ApiModelProperty("更新者")
-    @TableField("UPDATE_BY")
-    private String updateBy;
-
-
-    @ApiModelProperty("更新时间")
-    @TableField("UPDATE_TIME")
-    private Date updateTime;
-
-
-}

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

@@ -1,71 +0,0 @@
-package com.ozs.pm.doman.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.vo.PageVo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PmBaseSupplierVo {
-
-    @ApiModelProperty(value = "主键id")
-    private Integer id;
-
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
-
-    @ApiModelProperty("供应商负责人")
-    private String supplierResponsiblePerson;
-
-    @ApiModelProperty("供应商地址")
-    private String supplierAddress;
-
-    @ApiModelProperty("供应商类型")
-    private String supplierType;
-
-    @ApiModelProperty("状态 黑白名单")
-    private String supplierState;
-
-    @ApiModelProperty("预先采购")
-    private String supplierAdvancePurchase;
-
-    @ApiModelProperty(value = "邮政编码")
-    private String postalCode;
-
-    @ApiModelProperty(value = "项目联系人")
-    private String projectPerson;
-
-    @ApiModelProperty(value = "联系电话")
-    private String telephone;
-
-    @ApiModelProperty(value = "银行账户名称")
-    private String bankAccountName;
-
-    @ApiModelProperty(value = "开户银行")
-    private String bankOfDeposit;
-
-    @ApiModelProperty(value = "银行账号")
-    private String bankAccountNumber;
-
-    @ApiModelProperty(value = "创建者")
-    private String created;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改者")
-    private String updated;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty("合同签订地点")
-    private String contractSignPlace;
-
-    @ApiModelProperty("合同签订日期")
-    private Date contractSignDate;
-}

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

@@ -1,48 +0,0 @@
-package com.ozs.pm.doman.vo;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author : sunhh
- * @create 2023/2/2 17:59
- */
-@Data
-@TableName("base_unit_information")
-public class PmBaseUnitInformationVo {
-    /**
-     * 主键ID
-     */
-    @ApiModelProperty(value = "id")
-    private Integer id;
-
-    /**
-     * 单位名称
-     */
-    @ApiModelProperty(value = "单位名称")
-    private String unitName;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String created;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("合同签订地点")
-    private String contractSignPlace;
-
-    @ApiModelProperty("合同签订日期")
-    private Date contractSignDate;
-
-}

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

@@ -2,50 +2,70 @@ package com.ozs.pm.doman.vo.requestVo;
 
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
 
 
 /**
- * 采购需求对象 pm_demand
+ * 需求建档对象
  *
  * @author ruoyi
  * @date 2023-01-16
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求对象")
+@ApiModel("需求建档对象")
 public class PmBookBuildingReqVo
 {
-    /** 主键 */
+
+
     @ApiModelProperty("主键")
+    private Long id;
+
+
+    @ApiModelProperty("需求ID")
     private Long demandId;
 
-    /** 采购需求装备类对象 */
-    @ApiModelProperty("采购需求装备类对象")
-    private PmDemandEquipReqVo pmDemandEquipReqVo;
 
-    /** 采购需求物资类对象 */
-    @ApiModelProperty("采购需求物资类对象")
-    private PmDemandMaterialsReqVo pmDemandMaterialsReqVo;
+    @ApiModelProperty("预算金额(万元)")
+    private Double budgetAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("需求提报时间")
+    private Date demandCommitTime;
+
+
+    @ApiModelProperty("备注")
+    private String remarks;
 
-    /** 采购需求服务类对象 */
-    @ApiModelProperty("采购需求服务类对象")
-    private PmDemandServeReqVo pmDemandServeReqVo;
 
-    /** 采购需求工程类对象 */
-    @ApiModelProperty("采购需求工程类对象")
-    private PmDemandEngineeringReqVo pmDemandEngineeringReqVo;
 
     /**
-     * 更改者
+     * 上传附件
      */
-    @ApiModelProperty("更改者")
+    @ApiModelProperty("上传附件")
+    private List<SysFileRef> sysFileRefs;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
     private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
 }

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

@@ -2,8 +2,6 @@ package com.ozs.pm.doman.vo.requestVo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.pm.doman.vo.PmBaseSupplierVo;
-import com.ozs.pm.doman.vo.PmBaseUnitInformationVo;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -41,13 +39,14 @@ public class PmContractInfoReqVo implements Serializable {
     @ApiModelProperty("合同金额（万元）")
     private Double contractAmount;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("合同起始日期")
+    private Date contractStartDate;
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("合同终止日期")
     private Date contractTerminationDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty("建设(交付)时间")
-    private Date constructionDeliveryTime;
 
     @ApiModelProperty("创建者")
     private String createBy;
@@ -64,12 +63,6 @@ public class PmContractInfoReqVo implements Serializable {
     private Date updateTime;
 
 
-    @ApiModelProperty("甲方信息对象")
-    private PmBaseUnitInformationVo pmBaseUnitInformationVo;
-
-    @ApiModelProperty("乙方信息列表")
-    private List<PmBaseSupplierVo> baseSupplierList;
-
     /**
      * 上传附件
      */

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

@@ -1,171 +0,0 @@
-package com.ozs.pm.doman.vo.requestVo;
-
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import com.ozs.system.domain.SysFileRef;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.List;
-
-/**
- * 采购需求工程类对象 pm_demand_engineering
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求工程类对象")
-public class PmDemandEngineeringReqVo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long demandEngineeringId;
-
-    /** 需求ID */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /** 工程项目名称 */
-    @Excel(name = "工程项目名称")
-    @ApiModelProperty("工程项目名称")
-    private String engineeringName;
-
-    /** 建设地点 */
-    @Excel(name = "建设地点")
-    @ApiModelProperty("建设地点")
-    private String constructionLocation;
-
-    /** 设计任务书批复文号 */
-    @Excel(name = "设计任务书批复文号")
-    @ApiModelProperty("设计任务书批复文号")
-    private String designAssignmenApprovalNumber;
-
-    /** 工程建设计划文号 */
-    @Excel(name = "工程建设计划文号")
-    @ApiModelProperty("工程建设计划文号")
-    private String projectConstructionPlanNumber;
-
-    /** 任务书批复规模(㎡)*/
-    @Excel(name = "任务书批复规模(㎡)")
-    @ApiModelProperty("任务书批复规模(㎡)")
-    private Double tassignmentApprovalScale;
-
-    /** 任务书批复投资 */
-    @Excel(name = "任务书批复投资")
-    @ApiModelProperty("任务书批复投资")
-    private String tassignmentApprovalInvestmen;
-
-    /** 规划许可文号 */
-    @Excel(name = "规划许可文号")
-    @ApiModelProperty("规划许可文号")
-    private String planningLicenseNumber;
-
-    /** 密级处理 */
-    @Excel(name = "密级处理")
-    @ApiModelProperty("密级处理")
-    private String classifiedTreatment;
-
-    /** 采购项目规模(㎡) */
-    @Excel(name = "采购项目规模(㎡)")
-    @ApiModelProperty("采购项目规模(㎡)")
-    private Double procurementProjectScale;
-
-    /** 采购项目投资(万元) */
-    @Excel(name = "采购项目投资(万元)")
-    @ApiModelProperty("采购项目投资(万元)")
-    private Double procurementProjectInvestment;
-
-    /** 联系人 */
-    @Excel(name = "联系人")
-    @ApiModelProperty("联系人")
-    private String linkman;
-
-    /** 电话 */
-    @Excel(name = "电话")
-    @ApiModelProperty("电话")
-    private String phone;
-
-    /** 项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料） */
-    @Excel(name = "项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    @ApiModelProperty("项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    private String projectCategory;
-
-    /** 项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料） */
-    @Excel(name = "项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    @ApiModelProperty("项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    private String projectCategoryName;
-
-    /** 承包方式（1工程总承包，2施工总承包，3专业承包） */
-    @Excel(name = "承包方式（1工程总承包，2施工总承包，3专业承包）")
-    @ApiModelProperty("承包方式（1工程总承包，2施工总承包，3专业承包）")
-    private String contractingMode;
-
-
-    /** 承包方式名（1工程总承包，2施工总承包，3专业承包） */
-    @Excel(name = "承包方式名（1工程总承包，2施工总承包，3专业承包）")
-    @ApiModelProperty("承包方式名（1工程总承包，2施工总承包，3专业承包）")
-    private String contractingModeName;
-
-    /** 施工图是否完成(0未完成，1完成) */
-    @Excel(name = "施工图是否完成(0未完成，1完成)")
-    @ApiModelProperty("施工图是否完成(0未完成，1完成)")
-    private String constructionDrawing;
-
-    /** 施工图是否完成名(0未完成，1完成) */
-    @Excel(name = "施工图是否完成名(0未完成，1完成)")
-    @ApiModelProperty("施工图是否完成名(0未完成，1完成)")
-    private String constructionDrawingName;
-
-    /** 设计单位 */
-    @Excel(name = "设计单位")
-    @ApiModelProperty("设计单位")
-    private String designUnit;
-
-    /** 最高限价 */
-    @Excel(name = "最高限价")
-    @ApiModelProperty("最高限价")
-    private Double ceilingPrice;
-
-    /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /** 投标(报价)人资质等级要求 */
-    @Excel(name = "投标(报价)人资质等级要求")
-    @ApiModelProperty("投标(报价)人资质等级要求")
-    private String qualificationLevelRequirement;
-
-    /** 供应商 */
-    @Excel(name = "供应商")
-    @ApiModelProperty("供应商")
-    private Long supplierId;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件
-     */
-    @ApiModelProperty("上传附件")
-    private List<SysFileRef> sysFileRefs;
-
-}

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

@@ -1,102 +0,0 @@
-package com.ozs.pm.doman.vo.requestVo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import com.ozs.system.domain.SysFileRef;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 采购需求装备类对象 pm_demand_equip
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求装备类对象")
-public class PmDemandEquipReqVo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long demandEquipId;
-
-    /** 需求ID */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /** 物资类别及品种名称 */
-    @Excel(name = "物资类别及品种名称")
-    @ApiModelProperty("物资类别及品种名称")
-    private String typeAndName;
-
-    /** 规格型号长*宽*高 */
-    @Excel(name = "规格型号长*宽*高")
-    @ApiModelProperty("规格型号长*宽*高")
-    private String specification;
-
-    /** 质量技术标准(技术参数)*/
-    @Excel(name = "质量技术标准(技术参数)")
-    @ApiModelProperty("质量技术标准(技术参数)\"")
-    private String qualityTechnicalStandard;
-
-    /** 计量单位 */
-    @Excel(name = "计量单位")
-    @ApiModelProperty("计量单位")
-    private String measurementUnit;
-
-    /** 采购数量 */
-    @Excel(name = "采购数量")
-    @ApiModelProperty("采购数量")
-    private Double procurementQuantity;
-
-    /** 单价(元) */
-    @Excel(name = "单价(元)")
-    @ApiModelProperty("单价(元)")
-    private Double price;
-
-    /** 预算金额(万元) */
-    @Excel(name = "预算金额(万元)")
-    @ApiModelProperty("预算金额(万元)")
-    private Double budgetAmount;
-
-    /** 需求提报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("需求提报时间 yyyy-MM-dd")
-    private Date demandCommitTime;
-
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件
-     */
-    @ApiModelProperty("上传附件")
-    private List<SysFileRef> sysFileRefs;
-}

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

@@ -1,125 +0,0 @@
-package com.ozs.pm.doman.vo.requestVo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import com.ozs.system.domain.SysFileRef;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 采购需求物资类对象 pm_demand_materials
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求物资类对象")
-public class PmDemandMaterialsReqVo extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private Long demandMaterialsId;
-
-    /**
-     * 需求ID
-     */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /**
-     * 物资类别及品种名称
-     */
-    @Excel(name = "物资类别及品种名称")
-    @ApiModelProperty("物资类别及品种名称")
-    private String typeAndName;
-
-    /**
-     * 规格型号长*宽*高
-     */
-    @Excel(name = "规格型号长*宽*高")
-    @ApiModelProperty("规格型号长*宽*高")
-    private String specification;
-
-    /**
-     * 质量技术标准(技术参数)
-     */
-    @Excel(name = "质量技术标准(技术参数)")
-    @ApiModelProperty("质量技术标准(技术参数)")
-    private String qualityTechnicalStandard;
-
-    /**
-     * 计量单位
-     */
-    @Excel(name = "计量单位")
-    @ApiModelProperty("计量单位")
-    private String measurementUnit;
-
-    /**
-     * 采购数量
-     */
-    @Excel(name = "采购数量")
-    @ApiModelProperty("采购数量")
-    private Double procurementQuantity;
-
-    /**
-     * 单价(元)
-     */
-    @Excel(name = "单价(元)")
-    @ApiModelProperty("单价(元)")
-    private Double price;
-
-    /**
-     * 预算金额(万元)
-     */
-    @Excel(name = "预算金额(万元)")
-    @ApiModelProperty("预算金额(万元)")
-    private Double budgetAmount;
-
-    /**
-     * 需求提报时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("需求提报时间")
-    private Date demandCommitTime;
-
-    /**
-     * 采购方式建议
-     */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件
-     */
-    @ApiModelProperty("上传附件列表")
-    private List<SysFileRef> sysFileRefs;
-}

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

@@ -1,105 +0,0 @@
-package com.ozs.pm.doman.vo.requestVo;
-
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import com.ozs.system.domain.SysFileRef;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.List;
-
-/**
- * 采购需求服务类对象 pm_demand_serve
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求服务类对象")
-public class PmDemandServeReqVo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long demandServeId;
-
-    /** 需求ID */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /** 服务项目名称 */
-    @Excel(name = "服务项目名称")
-    @ApiModelProperty("服务项目名称")
-    private String serviceName;
-
-    /** 技术服务要求 */
-    @Excel(name = "技术服务要求")
-    @ApiModelProperty("技术服务要求")
-    private String technicalServiceRequirement;
-
-    /** 计量单位 */
-    @Excel(name = "计量单位")
-    @ApiModelProperty("计量单位")
-    private String measurementUnit;
-
-    /** 采购数量 */
-    @Excel(name = "采购数量")
-    @ApiModelProperty("采购数量")
-    private Double procurementQuantity;
-
-    /** 单价(元) */
-    @Excel(name = "单价(元)")
-    @ApiModelProperty("单价(元)")
-    private Double price;
-
-    /** 预算金额(万元) */
-    @Excel(name = "预算金额(万元)")
-    @ApiModelProperty("预算金额(万元)")
-    private Double budgetAmount;
-
-    /** 交货期限 */
-    @Excel(name = "交货期限")
-    @ApiModelProperty("交货期限")
-    private String deliveryTimeLimit;
-
-    /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /** 供应商 */
-    @Excel(name = "供应商")
-    @ApiModelProperty("供应商")
-    private Long supplierId;
-
-    /** 供应商名 */
-    @Excel(name = "供应商名")
-    @ApiModelProperty("供应商名")
-    private String supplierName;
-
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件
-     */
-    @ApiModelProperty("上传附件")
-    private List<SysFileRef> sysFileRefs;
-}

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

@@ -0,0 +1,68 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 需求建档对象
+ *
+ * @author ruoyi
+ * @date 2023-01-16
+ */
+@Data
+@ApiModel("需求建档对象")
+public class PmBookBuildingResVo
+{
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("预算金额(万元)")
+    private Double budgetAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("需求提报时间")
+    private Date demandCommitTime;
+
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+
+    /**
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+}

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

@@ -2,9 +2,6 @@ package com.ozs.pm.doman.vo.responseVo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.base.domain.BaseUnitInformation;
-import com.ozs.pm.doman.vo.PmBaseSupplierVo;
-import com.ozs.pm.doman.vo.PmBaseUnitInformationVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
+
 
 /**
  * 合同信息表(PmContractInfo)实体类
@@ -45,13 +42,14 @@ public class PmContractInfoResVo implements Serializable {
     @ApiModelProperty("合同金额（万元）")
     private Double contractAmount;
 
+
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty("合同终止日期")
-    private Date contractTerminationDate;
+    @ApiModelProperty("合同起始日期")
+    private Date contractStartDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty("建设(交付)时间")
-    private Date constructionDeliveryTime;
+    @ApiModelProperty("合同终止日期")
+    private Date contractTerminationDate;
 
     @ApiModelProperty("创建者")
     private String createBy;
@@ -67,11 +65,6 @@ public class PmContractInfoResVo implements Serializable {
     @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    @ApiModelProperty("甲方信息对象")
-    private PmBaseUnitInformationVo pmBaseUnitInformationVo;
-
-    @ApiModelProperty("乙方信息列表")
-    private List<PmBaseSupplierVo> baseSupplierList;
 
     /**
      * 上传附件的URL

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

@@ -1,171 +0,0 @@
-package com.ozs.pm.doman.vo.responseVo;
-
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.HashMap;
-
-/**
- * 采购需求工程类对象 pm_demand_engineering
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求工程类对象")
-public class PmDemandEngineeringResVo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @ApiModelProperty("主键")
-    private Long demandEngineeringId;
-
-    /** 需求ID */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /** 工程项目名称 */
-    @Excel(name = "工程项目名称")
-    @ApiModelProperty("工程项目名称")
-    private String engineeringName;
-
-    /** 建设地点 */
-    @Excel(name = "建设地点")
-    @ApiModelProperty("建设地点")
-    private String constructionLocation;
-
-    /** 设计任务书批复文号 */
-    @Excel(name = "设计任务书批复文号")
-    @ApiModelProperty("设计任务书批复文号")
-    private String designAssignmenApprovalNumber;
-
-    /** 工程建设计划文号 */
-    @Excel(name = "工程建设计划文号")
-    @ApiModelProperty("工程建设计划文号")
-    private String projectConstructionPlanNumber;
-
-    /** 任务书批复规模(㎡)*/
-    @Excel(name = "任务书批复规模(㎡)")
-    @ApiModelProperty("任务书批复规模(㎡)")
-    private Double tassignmentApprovalScale;
-
-    /** 任务书批复投资 */
-    @Excel(name = "任务书批复投资")
-    @ApiModelProperty("任务书批复投资")
-    private String tassignmentApprovalInvestmen;
-
-    /** 规划许可文号 */
-    @Excel(name = "规划许可文号")
-    @ApiModelProperty("规划许可文号")
-    private String planningLicenseNumber;
-
-    /** 密级处理 */
-    @Excel(name = "密级处理")
-    @ApiModelProperty("密级处理")
-    private String classifiedTreatment;
-
-    /** 采购项目规模(㎡) */
-    @Excel(name = "采购项目规模(㎡)")
-    @ApiModelProperty("采购项目规模(㎡)")
-    private Double procurementProjectScale;
-
-    /** 采购项目投资(万元) */
-    @Excel(name = "采购项目投资(万元)")
-    @ApiModelProperty("采购项目投资(万元)")
-    private Double procurementProjectInvestment;
-
-    /** 联系人 */
-    @Excel(name = "联系人")
-    @ApiModelProperty("联系人")
-    private String linkman;
-
-    /** 电话 */
-    @Excel(name = "电话")
-    @ApiModelProperty("电话")
-    private String phone;
-
-    /** 项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料） */
-    @Excel(name = "项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    @ApiModelProperty("项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    private String projectCategory;
-
-    /** 项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料） */
-    @Excel(name = "项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    @ApiModelProperty("项目类别名（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
-    private String projectCategoryName;
-
-    /** 承包方式（1工程总承包，2施工总承包，3专业承包） */
-    @Excel(name = "承包方式（1工程总承包，2施工总承包，3专业承包）")
-    @ApiModelProperty("承包方式（1工程总承包，2施工总承包，3专业承包）")
-    private String contractingMode;
-
-
-    /** 承包方式名（1工程总承包，2施工总承包，3专业承包） */
-    @Excel(name = "承包方式名（1工程总承包，2施工总承包，3专业承包）")
-    @ApiModelProperty("承包方式名（1工程总承包，2施工总承包，3专业承包）")
-    private String contractingModeName;
-
-    /** 施工图是否完成(0未完成，1完成) */
-    @Excel(name = "施工图是否完成(0未完成，1完成)")
-    @ApiModelProperty("施工图是否完成(0未完成，1完成)")
-    private String constructionDrawing;
-
-    /** 施工图是否完成名(0未完成，1完成) */
-    @Excel(name = "施工图是否完成名(0未完成，1完成)")
-    @ApiModelProperty("施工图是否完成名(0未完成，1完成)")
-    private String constructionDrawingName;
-
-    /** 设计单位 */
-    @Excel(name = "设计单位")
-    @ApiModelProperty("设计单位")
-    private String designUnit;
-
-    /** 最高限价 */
-    @Excel(name = "最高限价")
-    @ApiModelProperty("最高限价")
-    private Double ceilingPrice;
-
-    /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /** 投标(报价)人资质等级要求 */
-    @Excel(name = "投标(报价)人资质等级要求")
-    @ApiModelProperty("投标(报价)人资质等级要求")
-    private String qualificationLevelRequirement;
-
-    /** 供应商 */
-    @Excel(name = "供应商")
-    @ApiModelProperty("供应商")
-    private Long supplierId;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件的URL
-     */
-    @ApiModelProperty("上传附件的URL")
-    HashMap<String, String> fileMap;
-
-}

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

@@ -1,102 +0,0 @@
-package com.ozs.pm.doman.vo.responseVo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * 采购需求装备类对象 pm_demand_equip
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求装备类对象")
-public class PmDemandEquipResVo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @ApiModelProperty("主键")
-    private Long demandEquipId;
-
-    /** 需求ID */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /** 物资类别及品种名称 */
-    @Excel(name = "物资类别及品种名称")
-    @ApiModelProperty("物资类别及品种名称")
-    private String typeAndName;
-
-    /** 规格型号长*宽*高 */
-    @Excel(name = "规格型号长*宽*高")
-    @ApiModelProperty("规格型号长*宽*高")
-    private String specification;
-
-    /** 质量技术标准(技术参数)*/
-    @Excel(name = "质量技术标准(技术参数)")
-    @ApiModelProperty("质量技术标准(技术参数)\"")
-    private String qualityTechnicalStandard;
-
-    /** 计量单位 */
-    @Excel(name = "计量单位")
-    @ApiModelProperty("计量单位")
-    private String measurementUnit;
-
-    /** 采购数量 */
-    @Excel(name = "采购数量")
-    @ApiModelProperty("采购数量")
-    private Double procurementQuantity;
-
-    /** 单价(元) */
-    @Excel(name = "单价(元)")
-    @ApiModelProperty("单价(元)")
-    private Double price;
-
-    /** 预算金额(万元) */
-    @Excel(name = "预算金额(万元)")
-    @ApiModelProperty("预算金额(万元)")
-    private Double budgetAmount;
-
-    /** 需求提报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("需求提报时间 yyyy-MM-dd")
-    private Date demandCommitTime;
-
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件的URL
-     */
-    @ApiModelProperty("上传附件的URL")
-    HashMap<String, String> fileMap;
-}

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

@@ -1,125 +0,0 @@
-package com.ozs.pm.doman.vo.responseVo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * 采购需求物资类对象 pm_demand_materials
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求物资类对象")
-public class PmDemandMaterialsResVo extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("主键")
-    private Long demandMaterialsId;
-
-    /**
-     * 需求ID
-     */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /**
-     * 物资类别及品种名称
-     */
-    @Excel(name = "物资类别及品种名称")
-    @ApiModelProperty("物资类别及品种名称")
-    private String typeAndName;
-
-    /**
-     * 规格型号长*宽*高
-     */
-    @Excel(name = "规格型号长*宽*高")
-    @ApiModelProperty("规格型号长*宽*高")
-    private String specification;
-
-    /**
-     * 质量技术标准(技术参数)
-     */
-    @Excel(name = "质量技术标准(技术参数)")
-    @ApiModelProperty("质量技术标准(技术参数)")
-    private String qualityTechnicalStandard;
-
-    /**
-     * 计量单位
-     */
-    @Excel(name = "计量单位")
-    @ApiModelProperty("计量单位")
-    private String measurementUnit;
-
-    /**
-     * 采购数量
-     */
-    @Excel(name = "采购数量")
-    @ApiModelProperty("采购数量")
-    private Double procurementQuantity;
-
-    /**
-     * 单价(元)
-     */
-    @Excel(name = "单价(元)")
-    @ApiModelProperty("单价(元)")
-    private Double price;
-
-    /**
-     * 预算金额(万元)
-     */
-    @Excel(name = "预算金额(万元)")
-    @ApiModelProperty("预算金额(万元)")
-    private Double budgetAmount;
-
-    /**
-     * 需求提报时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("需求提报时间")
-    private Date demandCommitTime;
-
-    /**
-     * 采购方式建议
-     */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件的URL
-     */
-    @ApiModelProperty("上传附件的URL")
-    HashMap<String, String> fileMap;
-}

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

@@ -200,21 +200,9 @@ public class PmDemandResVo extends BaseEntity
     @ApiModelProperty("调整建议")
     private String adjustAdvice;
 
-    /** 采购需求装备类对象 */
-    @ApiModelProperty("采购需求装备类对象")
-    private PmDemandEquipResVo pmDemandEquipResVo;
-
-    /** 采购需求物资类对象 */
-    @ApiModelProperty("采购需求物资类对象")
-    private PmDemandMaterialsResVo pmDemandMaterialsResVo;
-
-    /** 采购需求服务类对象 */
-    @ApiModelProperty("采购需求服务类对象")
-    private PmDemandServeResVo pmDemandServeResVo;
-
-    /** 采购需求工程类对象 */
-    @ApiModelProperty("采购需求工程类对象")
-    private PmDemandEngineeringResVo pmDemandEngineeringResVo;
+    /** 需求建档对象  */
+    @ApiModelProperty("需求建档对象")
+    private PmBookBuildingResVo pmBookBuildingResVo;
 
     /** 中标信息对象  */
     @ApiModelProperty("中标信息对象")

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

@@ -1,105 +0,0 @@
-package com.ozs.pm.doman.vo.responseVo;
-
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-import java.util.HashMap;
-
-/**
- * 采购需求服务类对象 pm_demand_serve
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求服务类对象")
-public class PmDemandServeResVo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @ApiModelProperty("主键")
-    private Long demandServeId;
-
-    /** 需求ID */
-    @Excel(name = "需求ID")
-    @ApiModelProperty("需求ID")
-    private Long demandId;
-
-    /** 服务项目名称 */
-    @Excel(name = "服务项目名称")
-    @ApiModelProperty("服务项目名称")
-    private String serviceName;
-
-    /** 技术服务要求 */
-    @Excel(name = "技术服务要求")
-    @ApiModelProperty("技术服务要求")
-    private String technicalServiceRequirement;
-
-    /** 计量单位 */
-    @Excel(name = "计量单位")
-    @ApiModelProperty("计量单位")
-    private String measurementUnit;
-
-    /** 采购数量 */
-    @Excel(name = "采购数量")
-    @ApiModelProperty("采购数量")
-    private Double procurementQuantity;
-
-    /** 单价(元) */
-    @Excel(name = "单价(元)")
-    @ApiModelProperty("单价(元)")
-    private Double price;
-
-    /** 预算金额(万元) */
-    @Excel(name = "预算金额(万元)")
-    @ApiModelProperty("预算金额(万元)")
-    private Double budgetAmount;
-
-    /** 交货期限 */
-    @Excel(name = "交货期限")
-    @ApiModelProperty("交货期限")
-    private String deliveryTimeLimit;
-
-    /** 采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源） */
-    @Excel(name = "采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggest;
-
-    /** 采购方式建议名 */
-    @Excel(name = "采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    @ApiModelProperty("采购方式建议名（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
-    private String procurementMethodSuggestName;
-
-    /** 供应商 */
-    @Excel(name = "供应商")
-    @ApiModelProperty("供应商")
-    private Long supplierId;
-
-    /** 供应商名 */
-    @Excel(name = "供应商名")
-    @ApiModelProperty("供应商名")
-    private String supplierName;
-
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /**
-     * 上传附件的URL
-     */
-    @ApiModelProperty("上传附件的URL")
-    HashMap<String, String> fileMap;
-}

purchase-system/src/main/java/com/ozs/pm/mapper/PmBookBuildingMapper.java

@@ -0,0 +1,15 @@
+package com.ozs.pm.mapper;
+
+import com.ozs.pm.doman.PmBookBuilding;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 需求建档表(PmBookBuilding)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-02-08 12:50:33
+ */
+public interface PmBookBuildingMapper extends BaseMapper<PmBookBuilding> {
+
+}

purchase-system/src/main/java/com/ozs/pm/mapper/PmContractUnitRefMapper.java

@@ -1,15 +0,0 @@
-package com.ozs.pm.mapper;
-
-import com.ozs.pm.doman.PmContractUnitRef;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 合同单位关联表(PmContractUnitRef)表数据库访问层
- *
- * @author makejava
- * @since 2023-02-02 00:47:22
- */
-public interface PmContractUnitRefMapper extends BaseMapper<PmContractUnitRef> {
-
-}

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandEngineeringMapper.java

@@ -1,19 +0,0 @@
-package com.ozs.pm.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import com.ozs.pm.doman.PmDemandEngineering;
-
-
-
-
-/**
- * 采购需求工程类Mapper接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface PmDemandEngineeringMapper extends BaseMapper<PmDemandEngineering>
-{
-
-}

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandEquipMapper.java

@@ -1,17 +0,0 @@
-package com.ozs.pm.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.pm.doman.PmDemandEquip;
-
-
-
-/**
- * 采购需求装备类Mapper接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface PmDemandEquipMapper extends BaseMapper<PmDemandEquip>
-{
-
-}

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMaterialsMapper.java

@@ -1,17 +0,0 @@
-package com.ozs.pm.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import com.ozs.pm.doman.PmDemandMaterials;
-
-
-
-/**
- * 采购需求物资类Mapper接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface PmDemandMaterialsMapper extends BaseMapper<PmDemandMaterials>
-{
-}

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandServeMapper.java

@@ -1,16 +0,0 @@
-package com.ozs.pm.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import com.ozs.pm.doman.PmDemandServe;
-
-
-/**
- * 采购需求服务类Mapper接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface PmDemandServeMapper extends BaseMapper<PmDemandServe>
-{
-}

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandEngineeringService.java

@@ -1,19 +0,0 @@
-package com.ozs.pm.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import com.ozs.pm.doman.PmDemandEngineering;
-
-
-
-
-/**
- * 采购需求工程类Service接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface IPmDemandEngineeringService  extends IService<PmDemandEngineering>
-{
-
-}

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandEquipService.java

@@ -1,16 +0,0 @@
-package com.ozs.pm.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.pm.doman.PmDemandEquip;
-
-
-/**
- * 采购需求装备类Service接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface IPmDemandEquipService extends IService<PmDemandEquip>
-{
-
-}

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandMaterialsService.java

@@ -1,16 +0,0 @@
-package com.ozs.pm.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.pm.doman.PmDemandMaterials;
-
-
-/**
- * 采购需求物资类Service接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface IPmDemandMaterialsService extends IService<PmDemandMaterials>
-{
-
-}

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandServeService.java

@@ -1,19 +0,0 @@
-package com.ozs.pm.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import com.ozs.pm.doman.PmDemandServe;
-
-
-
-/**
- * 采购需求服务类Service接口
- * 
- * @author ruoyi
- * @date 2023-01-16
- */
-public interface IPmDemandServeService extends IService<PmDemandServe>
-{
-
-
-}

purchase-system/src/main/java/com/ozs/pm/service/PmBookBuildingService.java

@@ -0,0 +1,14 @@
+package com.ozs.pm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.pm.doman.PmBookBuilding;
+
+/**
+ * 需求建档表(PmBookBuilding)表服务接口
+ *
+ * @author makejava
+ * @since 2023-02-08 12:50:33
+ */
+public interface PmBookBuildingService extends IService<PmBookBuilding> {
+
+}

purchase-system/src/main/java/com/ozs/pm/service/PmContractUnitRefService.java

@@ -1,14 +0,0 @@
-package com.ozs.pm.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.pm.doman.PmContractUnitRef;
-
-/**
- * 合同单位关联表(PmContractUnitRef)表服务接口
- *
- * @author makejava
- * @since 2023-02-02 00:47:23
- */
-public interface PmContractUnitRefService extends IService<PmContractUnitRef> {
-
-}

purchase-system/src/main/java/com/ozs/pm/service/impl/PmBookBuildingServiceImpl.java

@@ -0,0 +1,18 @@
+package com.ozs.pm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.pm.mapper.PmBookBuildingMapper;
+import com.ozs.pm.doman.PmBookBuilding;
+import com.ozs.pm.service.PmBookBuildingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 需求建档表(PmBookBuilding)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-02-08 12:50:33
+ */
+@Service
+public class PmBookBuildingServiceImpl extends ServiceImpl<PmBookBuildingMapper, PmBookBuilding> implements PmBookBuildingService {
+
+}

purchase-system/src/main/java/com/ozs/pm/service/impl/PmContractUnitRefServiceImpl.java

@@ -1,18 +0,0 @@
-package com.ozs.pm.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.pm.mapper.PmContractUnitRefMapper;
-import com.ozs.pm.doman.PmContractUnitRef;
-import com.ozs.pm.service.PmContractUnitRefService;
-import org.springframework.stereotype.Service;
-
-/**
- * 合同单位关联表(PmContractUnitRef)表服务实现类
- *
- * @author makejava
- * @since 2023-02-02 00:47:23
- */
-@Service
-public class PmContractUnitRefServiceImpl extends ServiceImpl<PmContractUnitRefMapper, PmContractUnitRef> implements PmContractUnitRefService {
-
-}

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandEngineeringServiceImpl.java

@@ -1,21 +0,0 @@
-package com.ozs.pm.service.impl;
-
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.pm.doman.PmDemandEngineering;
-import com.ozs.pm.mapper.PmDemandEngineeringMapper;
-import com.ozs.pm.service.IPmDemandEngineeringService;
-import org.springframework.stereotype.Service;
-
-
-/**
- * 采购需求工程类Service业务层处理
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Service
-public class PmDemandEngineeringServiceImpl extends ServiceImpl<PmDemandEngineeringMapper, PmDemandEngineering> implements IPmDemandEngineeringService
-{
-}

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandEquipServiceImpl.java

@@ -1,22 +0,0 @@
-package com.ozs.pm.service.impl;
-
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.pm.doman.PmDemandEquip;
-import com.ozs.pm.mapper.PmDemandEquipMapper;
-import com.ozs.pm.service.IPmDemandEquipService;
-import org.springframework.stereotype.Service;
-
-
-/**
- * 采购需求装备类Service业务层处理
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Service
-public class PmDemandEquipServiceImpl extends ServiceImpl<PmDemandEquipMapper, PmDemandEquip> implements IPmDemandEquipService
-{
-
-}

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandMaterialsServiceImpl.java

@@ -1,21 +0,0 @@
-package com.ozs.pm.service.impl;
-
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.pm.doman.PmDemandMaterials;
-import com.ozs.pm.mapper.PmDemandMaterialsMapper;
-import com.ozs.pm.service.IPmDemandMaterialsService;
-import org.springframework.stereotype.Service;
-
-
-/**
- * 采购需求物资类Service业务层处理
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Service
-public class PmDemandMaterialsServiceImpl  extends ServiceImpl<PmDemandMaterialsMapper, PmDemandMaterials> implements IPmDemandMaterialsService
-{
-}

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServeServiceImpl.java

@@ -1,21 +0,0 @@
-package com.ozs.pm.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.pm.doman.PmDemandServe;
-import com.ozs.pm.mapper.PmDemandServeMapper;
-import com.ozs.pm.service.IPmDemandServeService;
-import org.springframework.stereotype.Service;
-
-
-/**
- * 采购需求服务类Service业务层处理
- *
- * @author ruoyi
- * @date 2023-01-16
- */
-@Service
-public class PmDemandServeServiceImpl extends ServiceImpl<PmDemandServeMapper, PmDemandServe> implements IPmDemandServeService
-{
-
-}

purchase-system/src/main/resources/mapper/pm/PmContractUnitRefMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.pm.mapper.PmContractUnitRefMapper">
+<mapper namespace="com.ozs.pm.mapper.PmBookBuildingMapper">
 
 
 </mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandEngineeringMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.pm.mapper.PmDemandEngineeringMapper">
-
-</mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandEquipMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.pm.mapper.PmDemandEquipMapper">
-
-</mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandMaterialsMapper.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.pm.mapper.PmDemandMaterialsMapper">
-    
-
-</mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandServeMapper.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.pm.mapper.PmDemandServeMapper">
-
-
-</mapper>