From af5e6adafbc1cd2bf3c082142efd9b011bf8e0d3 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 25 Jan 2024 13:42:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectSectionController.java | 12 +++- .../dao/ProjectSectionMapper.java | 3 + .../dao/mapper/ProjectSectionMapper.xml | 55 +++++++++++++++++++ .../entity/BidElecEvalVideUploadVo.java | 15 ++++- .../service/IProjectSectionService.java | 7 +++ .../impl/ProjectSectionServiceImpl.java | 12 ++++ 6 files changed, 102 insertions(+), 2 deletions(-) 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 5a1bf46..3705e3e 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 @@ -467,5 +467,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..4258b59 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,59 @@ 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..cba6425 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 @@ -115,7 +116,19 @@ 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 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..eb45660 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()); + vo.setProvinceCode(userService.getCacheUser().getOrganizationId()); + vo.setAppManagerId(userService.getCacheUser().getUserId()); + return this.projectSectionMapper.getVideoUploadVoPage(iPage,vo); + } } From 348881e0e59cf6cc14b8383c7254ec482863549e Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 28 Feb 2024 14:46:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E4=BB=A5=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9C=81=E5=88=86=E4=B8=BA=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectSectionServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 eb45660..b6a136f 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 @@ -853,7 +853,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectRoomVideUploadList(BidElecEvalVideUploadVo vo){ IPage iPage = new Page<>(vo.getPageNo(), vo.getPageSize()); - vo.setProvinceCode(userService.getCacheUser().getOrganizationId()); + if(vo.getProvinceCode()==null||"".equals(vo.getProvinceCode())) { + vo.setProvinceCode(userService.getCacheUser().getOrganizationId()); + } vo.setAppManagerId(userService.getCacheUser().getUserId()); return this.projectSectionMapper.getVideoUploadVoPage(iPage,vo); } From ec31bacdebb2232907ee68987799c5090b84b37e Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 28 Feb 2024 15:18:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E4=BB=A5=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9C=81=E5=88=86=E4=B8=BA=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectsection/dao/mapper/ProjectSectionMapper.xml | 10 +++++++++- .../projectsection/entity/BidElecEvalVideUploadVo.java | 1 + .../service/impl/ProjectSectionServiceImpl.java | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) 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 4258b59..5119bbe 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 @@ -265,7 +265,15 @@ where a.section_id = bs.id and bs.project_id = tp.id and tp.province = p.provinces_number - and ( tp.province = #{vo.provinceCode} or tp.app_manager_id = #{vo.appManagerId} ) + and ( + tp.app_manager_id = #{vo.appManagerId} + + or tp.province in + + #{provinceCode} + + + ) and a.id not in 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 cba6425..e58c4c7 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 @@ -44,6 +44,7 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ */ @ApiModelProperty(value = "省分") private String provinceCode; + private List provinceCodes; private String provinceName; /** * 项目名称 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 b6a136f..405ea9d 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 @@ -853,8 +853,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectRoomVideUploadList(BidElecEvalVideUploadVo vo){ IPage iPage = new Page<>(vo.getPageNo(), vo.getPageSize()); - if(vo.getProvinceCode()==null||"".equals(vo.getProvinceCode())) { - vo.setProvinceCode(userService.getCacheUser().getOrganizationId()); + 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); From 13ee3980ed30faa3cc5c8a25e5df5c91318df2ba Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 29 Feb 2024 09:33:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E4=BB=A5=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9C=81=E5=88=86=E4=B8=BA=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectsection/dao/mapper/ProjectSectionMapper.xml | 7 ++++--- .../service/impl/ProjectSectionServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) 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 5119bbe..f154d43 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 @@ -265,10 +265,11 @@ 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} + and + ( + tp.app_manager_id = #{vo.appManagerId} - or tp.province in + or tp.province in #{provinceCode} 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 405ea9d..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 @@ -858,7 +858,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl Date: Mon, 25 Mar 2024 15:57:06 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E5=AE=A4id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/ProjectSectionMapper.xml | 13 +++++++------ .../entity/BidElecEvalVideUploadVo.java | 5 +++++ 2 files changed, 12 insertions(+), 6 deletions(-) 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 f154d43..923abae 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 @@ -251,12 +251,13 @@ 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 + a.room_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, 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 e58c4c7..f21b4d2 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 @@ -75,6 +75,11 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ @ApiModelProperty("实际结束时间") private LocalDateTime realEndDate; + /** + * 评标室id + */ + @ApiModelProperty(value = "评标室id") + private String roomId; /** * 评标室名称 */ From 60bffda81d7ae61154d876ab67572494a1607b47 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 26 Mar 2024 13:47:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E5=AE=A4id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/projectsection/dao/mapper/ProjectSectionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 923abae..319d655 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 @@ -251,7 +251,7 @@ bs.bid_sect_name as section_name, a.real_open_time as real_start_date, a.end_time as real_end_date, - a.room_id as room_id, + a.id as room_id, a.room_name as room_name, a.room_type as room_type, a.room_sort as room_sort, From 534695fdded80bd8dec5fdb81a75f11b4a0abbf9 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 29 Mar 2024 11:36:58 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectsection/dao/mapper/ProjectSectionMapper.xml | 6 ++++++ .../projectsection/entity/BidElecEvalVideUploadVo.java | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 319d655..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 @@ -276,6 +276,12 @@ ) + + and a.id in + + #{alStateId} + + and a.id not in 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 f21b4d2..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 @@ -132,7 +132,10 @@ public class BidElecEvalVideUploadVo extends BasePageRequest implements Serializ * 已上传 */ private List uploadRoomIds; - + /** + * 告警状态 + */ + private List alStateIds; /** * 项目负责人 */