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 8df4232..c6d7aef 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 @@ -479,5 +479,15 @@ public class ProjectSectionController{ return BaseResponse.success(projectSectionService.getVideoUploadVo(assessId)); } - + /**selectRoomVideUploadList + * 查询电子评标室视频上传情况 + * @param vo + * @return + */ + @ApiOperation("查询电子评标室视频上传情况") + @PostMapping("/selectRoomVideUploadList") + public BaseResponse> selectRoomVideUploadList(@RequestBody BidElecEvalVideUploadVo vo){ + return BaseResponse.success(projectSectionService.selectRoomVideUploadList(vo)); + } + } 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 16c6150..b7c03be 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 @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.project.projectsection.dao; +import com.baomidou.mybatisplus.core.metadata.IPage; 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; @@ -81,4 +82,6 @@ public interface ProjectSectionMapper extends IBaseMapper { * @return */ BidElecEvalVideUploadVo getVideoUploadVo(@Param(value = "assessId") String assessId); + + IPage getVideoUploadVoPage(@Param(value = "parm") IPage page,@Param(value = "vo")BidElecEvalVideUploadVo vo); } 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 69ec2c7..c06cbdd 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 @@ -238,4 +238,75 @@ and tp.province = p.provinces_number and a.id = #{assessId} + + \ 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 index d409846..8ac8ad0 100644 --- 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 @@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** * 实体类 BidElecEvalRoomReserve @@ -43,6 +44,7 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ */ @ApiModelProperty(value = "省分") private String provinceCode; + private List provinceCodes; private String provinceName; /** * 项目名称 @@ -73,6 +75,11 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ @ApiModelProperty("实际结束时间") private LocalDateTime realEndDate; + /** + * 评标室id + */ + @ApiModelProperty(value = "评标室id") + private String roomId; /** * 评标室名称 */ @@ -115,7 +122,22 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ * 状态 0 未上传 1 已上传 */ @ApiModelProperty(value = "状态 0 未上传 1 已上传") - private Integer status; - + private String status; + /** + * 预约智慧评标室的评审室id集合 + */ + private List evalAssessIds; + /** + * 已上传 + */ + private List uploadRoomIds; + /** + * 告警状态 + */ + private List alStateIds; + /** + * 项目负责人 + */ + private String appManagerId; } 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 ad500b7..af6a3d1 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 @@ -255,4 +255,11 @@ public interface IProjectSectionService extends IBaseService{ * @return */ BidElecEvalVideUploadVo getVideoUploadVo(String assessId); + + /** + * 查询电子评标室视频上传情况 + * @param vo + * @return + */ + public IPage selectRoomVideUploadList(BidElecEvalVideUploadVo vo); } 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 80bed52..aa5783c 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 @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.util.JsonUtils; @@ -42,6 +43,7 @@ import com.chinaunicom.mall.ebtp.project.sectionmaterial.service.ISectionMateria import io.seata.core.context.RootContext; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -98,6 +100,8 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectRoomVideUploadList(BidElecEvalVideUploadVo vo){ + IPage iPage = new Page<>(vo.getPageNo(), vo.getPageSize()); + if(vo.getProvinceCodes()==null||vo.getProvinceCodes().size()==0) { + List codes = new ArrayList<>(); + codes.add(userService.getCacheUser().getOrganizationId()); + vo.setProvinceCodes(codes); + } + ///vo.setAppManagerId(userService.getCacheUser().getUserId()); + return this.projectSectionMapper.getVideoUploadVoPage(iPage,vo); + } }