diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java index f411f51..e1b3221 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java @@ -548,6 +548,11 @@ public class ProjectCommonUtil { */ public static final String OPEN_TENDER_FORM_2 = "open_tender_form_2"; + /** + * 是否需要重新购标 0 不需要 1 需要 + */ + public static final String IS_AGAIN_PURCHASE_1 = "1"; + public static Map PROCUREMENT_MODE_MAP = new HashMap(){{ String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2}; String[] recruitArray = {PROCUREMENT_MODE_4}; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java index 67008da..04d0b81 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/controller/ProjectExceptionController.java @@ -117,5 +117,17 @@ public class ProjectExceptionController{ return BaseResponse.success(projectExceptionService.updateState(id)); } + /** + * 获取异常标段是否重新购标 + * @param sectionId 异常信息ID + * @return 返回结果 + */ + @ApiOperation("获取标段是否重新购标") + @GetMapping("getIsAgainPurchase/{sectionId}") + public BaseResponse getIsAgainPurchase(@ApiParam(value = "主键id", required = true) @PathVariable String sectionId){ + + return BaseResponse.success(projectExceptionService.getIsAgainPurchase(sectionId)); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectExceptionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectExceptionMapper.xml index 2748246..1f64ecb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectExceptionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectExceptionMapper.xml @@ -10,6 +10,7 @@ + @@ -40,6 +41,7 @@ t.exception_desc AS exceptionDesc, t.handle_type AS handleType, t.exception_comments AS exceptionComments, + t.is_again_purchase AS isAgainPurchase, t.file_id AS fileId, t.status AS status, t.is_send_message AS isSendMessage, diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectException.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectException.java index 7178f18..932abfc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectException.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectException.java @@ -80,6 +80,12 @@ public class ProjectException extends BaseEntity implements Serializable { @ApiModelProperty(value = "附件ID") private String fileId; + /** + * 是否需要重新购标 0 不需要 1 需要 + */ + @ApiModelProperty(value = "是否需要重新购标 0 不需要 1 需要") + private String isAgainPurchase; + /** * 状态 0:草稿;1:已生效;2:已删除 */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectExceptionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectExceptionService.java index db8f2c3..69f13cc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectExceptionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectExceptionService.java @@ -56,4 +56,11 @@ public interface IProjectExceptionService extends IBaseService * @return 返回结果 成功 失败 */ boolean saveInquiryException(InquiryNoticeVO inquiryNoticeVO); + + /** + * 获取异常标段是否重新购标 + * @param sectionId 异常信息ID + * @return 返回结果 + */ + boolean getIsAgainPurchase(String sectionId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 6292767..6ea2712 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -1,9 +1,12 @@ package com.chinaunicom.mall.ebtp.project.projectexception.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +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; @@ -269,6 +272,24 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(ProjectSectionException::getSectionId,sectionId); + List sectionExceptionList = sectionExceptionService.list(queryWrapper); + if(!CollectionUtils.isEmpty(sectionExceptionList)){ + ProjectException projectException = this.getById(sectionExceptionList.get(0).getExceptionId()); + if(null != projectException){ + result = StringUtils.equals(projectException.getIsAgainPurchase(), ProjectCommonUtil.IS_AGAIN_PURCHASE_1); + } + }else{ + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.throwException(); + } + + return result; + } + /** * 再次发起项目