Merge branch 'uat-examination' into 'uat'

审查人员列表及公开项目

See merge request eshop/biz_service_ebtp_project!50

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<IPage<ProjectRecordVO>> getPageByExamination(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord) {
+		return BaseResponse.success(projectRecordService.getPageByExamination(projectRecord));
+	}
+
+	/**
+	 * 审查人员公开项目
+	 *
+	 * @param projectIds
+	 * @return 返回结果
+	 */
+	@ApiOperation("审查人员公开项目")
+	@PostMapping("/examination/public")
+	public BaseResponse<Boolean> publicByExamination(@ApiParam(value = "对象数据", required = true) @RequestBody List<String> projectIds) {
+		return BaseResponse.success(projectRecordService.publicByExamination(projectIds));
+	}
+
+	/**
+	 * 审查人员取消公开
+	 *
+	 * @param projectIds
+	 * @return 返回结果
+	 */
+	@ApiOperation("审查人员取消公开")
+	@PostMapping("/examination/private")
+	public BaseResponse<Boolean> privateByExamination(@ApiParam(value = "对象数据", required = true) @RequestBody List<String> projectIds) {
+		return BaseResponse.success(projectRecordService.privateByExamination(projectIds));
+	}
+
+
 	/**
 	 * 根据项目ID查看权限和项目信息
 	 * @param id 项目ID

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

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java

@@ -186,6 +186,30 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
      */
     IPage<ProjectRecordVO> getPageBySupervisor(ProjectRecordVO projectRecord);
 
+    /**
+     * 审查人员查看分页信息
+     *
+     * @param projectRecord 项目信息
+     * @return 返回结果
+     */
+    IPage<ProjectRecordVO> getPageByExamination(ProjectRecordVO projectRecord);
+
+    /**
+     * 审查人员查看分页信息
+     *
+     * @param projectIds 项目信息
+     * @return 返回结果
+     */
+    Boolean publicByExamination(List<String> projectIds);
+
+    /**
+     * 审查人员查看分页信息
+     *
+     * @param projectIds 项目信息
+     * @return 返回结果
+     */
+    Boolean privateByExamination(List<String> projectIds);
+
     /**
      * 根据项目ID查看权限和项目信息
      * @param id 项目ID

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java

@@ -191,6 +191,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             query.eq("owner_contact_id", projectRecordVO.getOwnerContactId());
         }
 
+        if(StringUtils.isNotBlank(projectRecordVO.getIsPublic())){
+            query.eq("is_public", projectRecordVO.getIsPublic());
+        }
+
         if(null != projectRecordVO.getLimit()){
             query.last("limit "+ projectRecordVO.getLimit());
         }
@@ -1164,6 +1168,63 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
         return voPage;
     }
 
+    /**
+     * 审查人员查看分页信息
+     *
+     * @param projectRecord 项目信息
+     * @return 返回结果
+     */
+    @Override
+    public IPage<ProjectRecordVO> getPageByExamination(ProjectRecordVO projectRecord) {
+        QueryWrapper<ProjectRecord> 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<ProjectRecord> p = new Page<>(projectRecord.getBasePageRequest().getPageNo(), projectRecord.getBasePageRequest().getPageSize());
+        IPage<ProjectRecord> result = this.page(p, query);
+
+        IPage<ProjectRecordVO> voPage = result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class));
+        assembleProjectPage(voPage.getRecords());
+
+        return voPage;
+    }
+
+    /**
+     * 审查人员查看分页信息
+     *
+     * @param projectIds 项目信息
+     * @return 返回结果
+     */
+    @Override
+    public Boolean publicByExamination(List<String> 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<String> 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<ProjectRecordMappe
                     StringUtils.equals(user.getProvince(),record.getProvince())){
                     resultList.add(authority);
                 }
-
+            }
+            //是否审查人员
+            if(StringUtils.equals(EbtpRoleEnum.SYSTEM_EXAMINATION.getRole(),authority.getRoleCode())){
+                if(StringUtils.equals(ProjectCommonUtil.PROVINCES_BLOC,user.getProvince()) ||
+                    StringUtils.equals(user.getProvince(),record.getProvince())){
+                    resultList.add(authority);
+                }
             }
         }
         return resultList;