Merge remote-tracking branch 'origin/master'

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

@@ -33,12 +33,8 @@ import lombok.experimental.Accessors;
 public class PmDemandEngineering implements Serializable {
     private static final long serialVersionUID = 907919419476022620L;
 
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
     @ApiModelProperty("主键")
-    @TableField("DEMAND_ENGINEERING_ID")
+    @TableId(value = "DEMAND_ENGINEERING_ID", type = IdType.AUTO)
     private Long demandEngineeringId;
 
 

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

@@ -33,12 +33,9 @@ import lombok.experimental.Accessors;
 public class PmDemandEquip implements Serializable {
     private static final long serialVersionUID = -13343009659577628L;
 
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
 
     @ApiModelProperty("主键")
-    @TableField("DEMAND_EQUIP_ID")
+    @TableId(value = "DEMAND_EQUIP_ID", type = IdType.AUTO)
     private Long demandEquipId;
 
 

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

@@ -33,12 +33,9 @@ import lombok.experimental.Accessors;
 public class PmDemandMaterials implements Serializable {
     private static final long serialVersionUID = -69155120615102721L;
 
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
 
     @ApiModelProperty("主键")
-    @TableField("DEMAND_MATERIALS_ID")
+    @TableId(value = "DEMAND_MATERIALS_ID", type = IdType.AUTO)
     private Long demandMaterialsId;
 
 

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

@@ -33,12 +33,9 @@ import lombok.experimental.Accessors;
 public class PmDemandServe implements Serializable {
     private static final long serialVersionUID = -91312266847333541L;
 
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
 
     @ApiModelProperty("主键")
-    @TableField("DEMAND_SERVE_ID")
+    @TableId(value = "DEMAND_SERVE_ID", type = IdType.AUTO)
     private Long demandServeId;
 
 

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

@@ -33,12 +33,8 @@ import lombok.experimental.Accessors;
 public class PmFlowChart implements Serializable {
     private static final long serialVersionUID = 313515206301363060L;
 
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Long id;
-
-
     @ApiModelProperty("主键")
-    @TableField("FLOW_CHART_ID")
+    @TableId(value = "FLOW_CHART_ID", type = IdType.AUTO)
     private Long flowChartId;
 
 

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

@@ -26,6 +26,9 @@ import java.util.List;
 public class PmContractInfoResVo implements Serializable {
     private static final long serialVersionUID = -59348130033569267L;
 
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
 
     @ApiModelProperty("需求ID")
     private Long demandId;

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

@@ -215,6 +215,10 @@ public class PmDemandResVo extends BaseEntity
     @ApiModelProperty("采购需求工程类对象")
     private PmDemandEngineeringResVo pmDemandEngineeringResVo;
 
+    /** 中标信息对象  */
+    @ApiModelProperty("中标信息对象")
+    private  PmPurchaseExecutionResVo pmPurchaseExecutionResVo;
+
     /** 合同信息对象  */
     @ApiModelProperty("合同信息对象")
     private  PmContractInfoResVo pmContractInfoResVo;

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

@@ -22,6 +22,9 @@ import java.util.List;
 public class PmProjectConstructionResVo implements Serializable {
     private static final long serialVersionUID = -98627692890895867L;
 
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
 
     @ApiModelProperty("需求ID")
     private Long demandId;

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

@@ -0,0 +1,45 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+
+import com.ozs.base.domain.BaseAgency;
+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.HashMap;
+import java.util.List;
+
+
+/**
+ * 中标信息对象
+ *
+ * @author ruoyi
+ * @date 2023-01-16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("中标信息对象")
+public class PmPurchaseExecutionResVo {
+    /** 采购需求ID */
+    @ApiModelProperty("采购需求ID")
+    private Long demandId;
+
+    @ApiModelProperty("招标代理机构信息")
+    private BaseAgency baseAgency;
+
+    @ApiModelProperty("发布公告列表")
+    private List<PmReleaseAnnouncementResVo> pmReleaseAnnouncementResVoList;
+
+    /**
+     *
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+}

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

@@ -0,0 +1,82 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 发布公告表(PmReleaseAnnouncement)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:23
+ */
+
+@Data
+@ApiModel(value = "发布公告表", description = "")
+public class PmReleaseAnnouncementResVo implements Serializable {
+    private static final long serialVersionUID = 403614463746791218L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("发布公告平台,1:军队采购网,2:全军武器装备采购网")
+    private String announcementPlatform;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("发布时间 yyyy-MM-dd")
+    private Date releaseTime;
+
+
+    @ApiModelProperty("开标地点")
+    private String bidOpenPlace;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("报名截止时间 yyyy-MM-dd")
+    private Date enrollCloseTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("开标时间 yyyy-MM-dd")
+    private Date tenderOpenTime;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /** 创建者 */
+    @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;
+
+    /**
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+}

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

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.domain.BaseExpert;
 import com.ozs.base.domain.BaseSupplier;
 import com.ozs.base.domain.BaseUnitInformation;
+import com.ozs.base.service.BaseAgencyService;
 import com.ozs.base.service.BaseExpertService;
 import com.ozs.base.service.BaseSupplierService;
 import com.ozs.common.enums.*;
@@ -90,6 +92,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     @Autowired
     private PmContractUnitRefService pmContractUnitRefService;
 
+    @Autowired
+    private BaseAgencyService baseAgencyService;
 
     @Autowired
     private PmProjectConstructionService pmProjectConstructionService;
@@ -293,7 +297,12 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     vo.setTaskReleaseFileMap(taskReleaseFileMap);
                 }
             } else if("4".equals(detailType)) { //中标信息
+                PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
+                BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
+                pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
+
 
+                vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
             } else if("5".equals(detailType)) { //合同信息
                 LambdaQueryWrapper<PmContractInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(PmContractInfo::getDemandId,demandId);