From 10ac94089f06286d5e1d85824710ef672273ccf1 Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Tue, 17 May 2022 11:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E4=BA=BA=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=85=AC=E5=BC=80=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRecordController.java | 38 +++++++++- .../projectrecord/entity/ProjectRecord.java | 6 ++ .../service/IProjectRecordService.java | 24 +++++++ .../impl/ProjectRecordServiceImpl.java | 69 ++++++++++++++++++- 4 files changed, 135 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java index eb7ee69..fb3fdb0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java @@ -4,7 +4,6 @@ package com.chinaunicom.mall.ebtp.project.projectrecord.controller; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckSc; import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckUtil; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; @@ -249,6 +248,43 @@ public class ProjectRecordController{ } + /** + * 审查人员查询分页数据 + * + * @param projectRecord 分页信息 + * @return 返回结果 + */ + @ApiOperation("审查人员查询分页数据") + @PostMapping("/examination/getPage") + public BaseResponse> getPageByExamination(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord) { + return BaseResponse.success(projectRecordService.getPageByExamination(projectRecord)); + } + + /** + * 审查人员公开项目 + * + * @param projectIds + * @return 返回结果 + */ + @ApiOperation("审查人员公开项目") + @PostMapping("/examination/public") + public BaseResponse publicByExamination(@ApiParam(value = "对象数据", required = true) @RequestBody List projectIds) { + return BaseResponse.success(projectRecordService.publicByExamination(projectIds)); + } + + /** + * 审查人员取消公开 + * + * @param projectIds + * @return 返回结果 + */ + @ApiOperation("审查人员取消公开") + @PostMapping("/examination/private") + public BaseResponse privateByExamination(@ApiParam(value = "对象数据", required = true) @RequestBody List projectIds) { + return BaseResponse.success(projectRecordService.privateByExamination(projectIds)); + } + + /** * 根据项目ID查看权限和项目信息 * @param id 项目ID diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java index 969aa11..018734d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java @@ -352,4 +352,10 @@ public class ProjectRecord extends BaseEntity implements Serializable { @ApiModelProperty(value = "公开招标 招标形式（依法招标 自愿招标）") private String openTenderForm; + /** + * 是否公开（0、null否 1是） + */ + @ApiModelProperty(value = "是否公开（0、null否 1是）") + private String isPublic; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java index d435913..d5360da 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java @@ -186,6 +186,30 @@ public interface IProjectRecordService extends IBaseService{ */ IPage getPageBySupervisor(ProjectRecordVO projectRecord); + /** + * 审查人员查看分页信息 + * + * @param projectRecord 项目信息 + * @return 返回结果 + */ + IPage getPageByExamination(ProjectRecordVO projectRecord); + + /** + * 审查人员查看分页信息 + * + * @param projectIds 项目信息 + * @return 返回结果 + */ + Boolean publicByExamination(List projectIds); + + /** + * 审查人员查看分页信息 + * + * @param projectIds 项目信息 + * @return 返回结果 + */ + Boolean privateByExamination(List projectIds); + /** * 根据项目ID查看权限和项目信息 * @param id 项目ID diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index f1176d1..68f6e95 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -191,6 +191,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl getPageByExamination(ProjectRecordVO projectRecord) { + QueryWrapper query = getProjectRecordQueryWrapper(projectRecord); + + if(null == projectRecord.getBasePageRequest()){ + projectRecord.setBasePageRequest(new BasePageRequest()); + } + + BaseCacheUser cacheUser = cacheUserService.getCacheUser(); + + if(null == cacheUser || StringUtils.isEmpty(cacheUser.getProvince())){ + ProjectExceptionEnum.FRAME_EXCEPTION_USER_PROVINCE_EMPTY.throwException(); + } + + if(!StringUtils.equals(ProjectCommonUtil.PROVINCES_BLOC,cacheUser.getProvince())){ + query.eq("province", cacheUser.getProvince()); + } + query.eq("is_public",1); + query.orderByDesc("create_date"); + //查询 + IPage p = new Page<>(projectRecord.getBasePageRequest().getPageNo(), projectRecord.getBasePageRequest().getPageSize()); + IPage result = this.page(p, query); + + IPage voPage = result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class)); + assembleProjectPage(voPage.getRecords()); + + return voPage; + } + + /** + * 审查人员查看分页信息 + * + * @param projectIds 项目信息 + * @return 返回结果 + */ + @Override + public Boolean publicByExamination(List projectIds) { + return this.updateBatchById(projectIds.stream().map(id -> new ProjectRecord().setId(id).setIsPublic("1")).collect(Collectors.toList())); + } + + /** + * 审查人员查看分页信息 + * + * @param projectIds 项目信息 + * @return 返回结果 + */ + @Override + public Boolean privateByExamination(List projectIds) { + return this.updateBatchById(projectIds.stream().map(id -> new ProjectRecord().setId(id).setIsPublic("0")).collect(Collectors.toList())); + } + /** * 跳转判断查看项目权限 * @param record 项目信息 @@ -1203,7 +1264,13 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl