diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java index 9c96f36..5a1bf46 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckUtil; import com.chinaunicom.mall.ebtp.project.feign.entity.SectionFlowVO; +import com.chinaunicom.mall.ebtp.project.projectsection.entity.BidElecEvalVideUploadVo; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; @@ -456,5 +457,15 @@ public class ProjectSectionController{ return BaseResponse.success(projectSectionService.getSectionIsAnnounce(planId)); } + + /** + * 视频上传项目数据存储查询 + * @return + */ + @GetMapping("/getVideoUploadVo") + public BaseResponse getVideoUploadVo(@RequestParam(name = "assessId") String assessId){ + + return BaseResponse.success(projectSectionService.getVideoUploadVo(assessId)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java index 73bfa5f..16c6150 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.project.projectsection.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.chinaunicom.mall.ebtp.project.projectsection.entity.BidElecEvalVideUploadVo; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; import org.apache.ibatis.annotations.Param; @@ -73,4 +74,11 @@ public interface ProjectSectionMapper extends IBaseMapper { * @return 返回结果 */ List selectListByChart(@Param(value = "sectionIds") List sectionIds); + + /** + * 视频上传项目数据存储查询 + * @param assessId + * @return + */ + BidElecEvalVideUploadVo getVideoUploadVo(@Param(value = "assessId") String assessId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml index b2f016b..69ec2c7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml @@ -210,4 +210,32 @@ + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java new file mode 100644 index 0000000..d409846 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java @@ -0,0 +1,121 @@ +package com.chinaunicom.mall.ebtp.project.projectsection.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 实体类 BidElecEvalRoomReserve + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + private String id; + + /** + * 项目id + */ + @ApiModelProperty(value = "项目id") + private String projectId; + + /** + * 省分 + */ + @ApiModelProperty(value = "省分") + private String provinceCode; + private String provinceName; + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + + /** + * 项目编号 + */ + @ApiModelProperty(value = "项目编号") + private String projectNum; + /** + * 标段名称 + */ + @ApiModelProperty(value = "标段名称") + private String sectionName; + + @TableField(fill = FieldFill.INSERT, typeHandler = CustomLocalDateTimeTypeHandler.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("实际开始时间") + private LocalDateTime realStartDate; + + @TableField(fill = FieldFill.INSERT, typeHandler = CustomLocalDateTimeTypeHandler.class) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("实际结束时间") + private LocalDateTime realEndDate; + + /** + * 评标室名称 + */ + @ApiModelProperty(value = "评标室名称") + private String roomName; + /** + * 评审室类型:1-资审,2-评标 + */ + @ApiModelProperty(value = "评审室类型:1-资审,2-评标") + private String roomType; + /** + * 评审室排序 + */ + @ApiModelProperty(value = "评审室排序") + private String roomSort; + /** + * 重新评审标识:0-正常评审(默认),1-重新评审 + */ + @ApiModelProperty(value = "重新评审标识:0-正常评审(默认),1-重新评审") + private String reviewMark; + /** + * 重新评审排序 + */ + @ApiModelProperty(value = "重新评审排序") + private String reviewSort; + + /** + * 状态:0-初始状态,1-已保存,2-已开启评审室,3-已关闭评审室 + */ + @ApiModelProperty(value = "状态:0-初始状态,1-已保存,2-已开启评审室,3-已关闭评审室") + private String roomStatus; + + /** + * 评标区域地址 + */ + @ApiModelProperty(value = "评标区域地址") + private String areaAddress; + + /** + * 状态 0 未上传 1 已上传 + */ + @ApiModelProperty(value = "状态 0 未上传 1 已上传") + private Integer status; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java index 26bfe7a..ad500b7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java @@ -2,10 +2,13 @@ package com.chinaunicom.mall.ebtp.project.projectsection.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.project.feign.entity.SectionFlowVO; +import com.chinaunicom.mall.ebtp.project.projectsection.entity.BidElecEvalVideUploadVo; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; @@ -245,4 +248,11 @@ public interface IProjectSectionService extends IBaseService{ * @return 返回结果 */ Map getOpenTime(List sectionIds); + + /** + * 视频上传项目数据存储查询 + * @param assessId + * @return + */ + BidElecEvalVideUploadVo getVideoUploadVo(String assessId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 9decafe..80bed52 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -30,6 +30,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService; import com.chinaunicom.mall.ebtp.project.projectsection.dao.ProjectSectionMapper; +import com.chinaunicom.mall.ebtp.project.projectsection.entity.BidElecEvalVideUploadVo; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionFlow; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; @@ -834,4 +835,14 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl