Merge branch 'master_电子评审室上传视频列表' into 'master'

Master 电子评审室上传视频列表

See merge request eshop/biz_service_ebtp_project!18

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<IPage<BidElecEvalVideUploadVo>> selectRoomVideUploadList(@RequestBody BidElecEvalVideUploadVo vo){
+		return BaseResponse.success(projectSectionService.selectRoomVideUploadList(vo));
+	}
+
 }

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<ProjectSection> {
      * @return
      */
     BidElecEvalVideUploadVo getVideoUploadVo(@Param(value = "assessId") String assessId);
+
+    IPage<BidElecEvalVideUploadVo> getVideoUploadVoPage(@Param(value = "parm") IPage<BidElecEvalVideUploadVo> page,@Param(value = "vo")BidElecEvalVideUploadVo vo);
 }

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}
     </select>
+
+    <select id="getVideoUploadVoPage"
+            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.id as room_id,
+            a.room_name as room_name,
+            a.room_type as room_type,
+            a.room_sort as room_sort,
+            a.review_mark as review_mark,
+            a.review_sort as review_sort,
+            a.status as room_status
+        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
+            (
+            tp.app_manager_id = #{vo.appManagerId}
+            <if test="vo.provinceCodes !=null and vo.provinceCodes.size()>0 ">
+                or  tp.province in
+                <foreach item="provinceCode" collection="vo.provinceCodes" open="(" separator="," close=")">
+                    #{provinceCode}
+                </foreach>
+            </if>
+            )
+            <if test="vo.alStateIds !=null and vo.alStateIds.size()>0 ">
+                and  a.id in
+                <foreach item="alStateId" collection="vo.alStateIds" open="(" separator="," close=")">
+                    #{alStateId}
+                </foreach>
+            </if>
+            <if test="vo.evalAssessIds !=null  ">
+                and a.id not in
+                <foreach item="assessId" collection="vo.evalAssessIds" open="(" separator="," close=")">
+                    #{assessId}
+                </foreach>
+            </if>
+            <if test="vo.projectName !=null and vo.projectName != ''">
+                AND tp.project_name like  CONCAT('%',#{vo.projectName},'%')
+            </if>
+            <if test="vo.sectionName !=null and vo.sectionName != ''">
+                AND bs.sectionName like  CONCAT('%',#{vo.sectionName},'%')
+            </if>
+
+            <if test="vo.status !=null and vo.status != '' and vo.status == 0 ">
+                and a.id not in
+                <foreach item="assessId" collection="vo.uploadRoomIds" open="(" separator="," close=")">
+                    #{assessId}
+                </foreach>
+            </if>
+            <if test="vo.status !=null and vo.status != '' and vo.status == 1 ">
+                and a.id in
+                <foreach item="assessId" collection="vo.uploadRoomIds" open="(" separator="," close=")">
+                    #{assessId}
+                </foreach>
+            </if>
+            order by a.end_time desc
+    </select>
 </mapper>

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<String> 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<String> evalAssessIds;
+        /**
+         * 已上传
+         */
+        private List<String> uploadRoomIds;
+        /**
+         * 告警状态
+         */
+        private List<String> alStateIds;
+        /**
+         * 项目负责人
+         */
+        private String appManagerId;
 }

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

@@ -255,4 +255,11 @@ public interface IProjectSectionService extends IBaseService<ProjectSection>{
      * @return
      */
     BidElecEvalVideUploadVo getVideoUploadVo(String assessId);
+
+    /**
+     * 查询电子评标室视频上传情况
+     * @param vo
+     * @return
+     */
+    public IPage<BidElecEvalVideUploadVo> selectRoomVideUploadList(BidElecEvalVideUploadVo vo);
 }

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<ProjectSectionMap
     @Resource
     private ISectionMaterialService materialService;
 
+    @Autowired
+    private IBaseCacheUserService userService;
     /**
      * 默认轮次
      */
@@ -845,4 +849,16 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
     public BidElecEvalVideUploadVo getVideoUploadVo(String assessId){
         return this.projectSectionMapper.getVideoUploadVo(assessId);
     }
+
+    @Override
+    public IPage<BidElecEvalVideUploadVo> selectRoomVideUploadList(BidElecEvalVideUploadVo vo){
+        IPage<BidElecEvalVideUploadVo> iPage = new Page<>(vo.getPageNo(), vo.getPageSize());
+        if(vo.getProvinceCodes()==null||vo.getProvinceCodes().size()==0) {
+            List<String> codes = new ArrayList<>();
+            codes.add(userService.getCacheUser().getOrganizationId());
+            vo.setProvinceCodes(codes);
+        }
+        ///vo.setAppManagerId(userService.getCacheUser().getUserId());
+        return this.projectSectionMapper.getVideoUploadVoPage(iPage,vo);
+    }
 }