liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yss
2023-12-29 15:54:12 +08:00
parent b56f777709 336bb8e4b6
commit 70673d7d46
6 changed files with 189 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
View File

@ -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;
@ -457,4 +458,14 @@ public class ProjectSectionController{
return BaseResponse.success(projectSectionService.getSectionIsAnnounce(planId));
}
/**
* 视频上传项目数据存储查询
* @return
*/
@GetMapping("/getVideoUploadVo")
public BaseResponse<BidElecEvalVideUploadVo> getVideoUploadVo(@RequestParam(name = "assessId") String assessId){
return BaseResponse.success(projectSectionService.getVideoUploadVo(assessId));
}
}

8
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java
View File

@ -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<ProjectSection> {
* @return 返回结果
*/
List<ProjectSectionVO> selectListByChart(@Param(value = "sectionIds") List<String> sectionIds);
/**
* 视频上传项目数据存储查询
* @param assessId
* @return
*/
BidElecEvalVideUploadVo getVideoUploadVo(@Param(value = "assessId") String assessId);
}

28
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
View File

@ -210,4 +210,32 @@
</where>
</select>
<select id="getVideoUploadVo"
resultType="com.chinaunicom.mall.ebtp.project.projectsection.entity.BidElecEvalVideUploadVo">
SELECT
a.id,
tp.id as project_id,
tp.province as province_code,
p.provinces_remark as province_name,
tp.project_name as project_name,
tp.ebp_parent_project_number as project_num,
bs.bid_sect_name as section_name,
a.real_open_time as real_start_date,
a.end_time as real_end_date,
a.room_name as roomName,
a.room_type as roomType,
a.room_sort as roomSort,
a.review_mark as reviewMark,
a.review_sort as reviewSort,
a.status as roomStatus
FROM
biz_assess_room a,
biz_project_section bs,
biz_project_record tp,
dict_provinces_code p
where a.section_id = bs.id
and bs.project_id = tp.id
and tp.province = p.provinces_number
and a.id = #{assessId}
</select>
</mapper>

121
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/BidElecEvalVideUploadVo.java Normal file
View File

@ -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;
}

10
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java
View File

@ -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<ProjectSection>{
* @return 返回结果
*/
Map<String, String> getOpenTime(List<String> sectionIds);
/**
* 视频上传项目数据存储查询
* @param assessId
* @return
*/
BidElecEvalVideUploadVo getVideoUploadVo(String assessId);
}

11
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
View File

@ -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<ProjectSectionMap
private void updateProjectBusinessMode(String sectionId, int businessMode) {
this.updateProjectBusinessMode(Collections.singletonList(sectionId), businessMode);
}
/**
* 视频上传项目数据存储查询
* @param assessId
* @return
*/
@Override
public BidElecEvalVideUploadVo getVideoUploadVo(String assessId){
return this.projectSectionMapper.getVideoUploadVo(assessId);
}
}