From d4d309d3f8154377f055abebd26215914cfdd21c Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Wed, 27 Jan 2021 15:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-gz.yaml | 5 + pom.xml | 25 +-- .../BizServiceEbtpProjectApplication.java | 12 +- .../dao/mapper/BaseOperLogMapper.xml | 4 +- .../baseoperlog/entity/BaseOperLog.java | 2 +- .../service/impl/BaseOperLogServiceImpl.java | 2 +- .../project/common/InquiryCommonUtil.java | 91 +++++++++++ .../project/common/ProjectCommonUtil.java | 10 ++ .../project/common/ProjectExceptionEnum.java | 11 +- .../common/ProjectlnnerShotExceptionEnum.java | 33 ++++ .../dict/dao/mapper/DictProjectMapper.xml | 2 +- .../dict/dao/mapper/DictRegionMapper.xml | 4 +- .../dao/mapper/DictChooseProcessMapper.xml | 8 +- .../entity/DictChooseProcess.java | 6 +- .../ebtp/project/feign/EbtpMallBidApi.java | 5 +- .../project/feign/EbtpMallProcessApi.java | 18 +-- .../mall/ebtp/project/feign/EbtpRespsApi.java | 2 +- .../mall/ebtp/project/feign/EbtpRsmsApi.java | 14 +- .../ebtp/project/feign/EbtpTenderApi.java | 2 +- .../mall/ebtp/project/feign/MallPurpApi.java | 2 +- .../project/feign/entity/AgainRoomVO.java | 6 +- .../ebtp/project/feign/entity/AnnoVO.java | 4 +- .../project/feign/entity/BizAgainSection.java | 4 + .../project/feign/entity/BizAssessRoom.java | 6 +- .../feign/entity/DictProjectConfig.java | 4 +- .../feign/entity/WfProjectConfigTask.java | 2 +- .../fallback/EbtpMallBidClientFallback.java | 6 +- .../EbtpMallProcessClientFallback.java | 10 +- .../fallback/EbtpProjectClientFallback.java | 4 +- .../controller/ProjectAuctionController.java | 4 +- .../dao/mapper/ProjectAuctionMapper.xml | 4 +- .../projectauction/entity/ProjectAuction.java | 6 +- .../service/IProjectAuctionService.java | 4 +- .../impl/ProjectAuctionServiceImpl.java | 45 +++--- .../mapper/ProjectAuctionMaterialMapper.xml | 6 +- .../entity/ProjectAuctionMaterial.java | 4 +- .../controller/ProjectEntrustController.java | 16 +- .../dao/mapper/ProjectEntrustExpandMapper.xml | 7 +- .../dao/mapper/ProjectEntrustMapper.xml | 6 +- .../projectentrust/entity/ProjectEntrust.java | 2 +- .../entity/ProjectEntrustExpand.java | 11 +- .../entity/ebpentity/ProjBaseInfoVO.java | 2 +- .../entity/ebpentity/ProjSuppRelVO.java | 2 +- .../entity/ebpentity/PurpBaseInfoVO.java | 3 + .../entity/inquiryentity/InquiryGoodsVO.java | 80 ++++++++++ .../InquiryResponseFormatVO.java | 57 +++++++ .../entity/inquiryentity/InquiryVO.java | 150 ++++++++++++++++++ .../IProjectEntrustInquiryService.java | 21 +++ .../service/IProjectEntrustService.java | 29 ++-- .../ProjectEntrustInquiryServiceImpl.java | 125 +++++++++++++++ .../impl/ProjectEntrustServiceImpl.java | 17 +- .../ProjectExceptionController.java | 4 +- .../dao/ProjectExceptionMapper.java | 2 +- .../dao/ProjectSectionExceptionMapper.java | 2 +- .../dao/mapper/ProjectExceptionMapper.xml | 6 +- .../mapper/ProjectSectionExceptionMapper.xml | 6 +- .../entity/ProjectException.java | 6 +- .../entity/ProjectSectionException.java | 6 +- .../service/IProjectExceptionService.java | 4 +- .../IProjectSectionExceptionService.java | 2 +- .../impl/ProjectExceptionServiceImpl.java | 39 +++-- .../ProjectSectionExceptionServiceImpl.java | 2 +- .../controller/ProjectRecordController.java | 8 +- .../dao/ProjectRecordMapper.java | 2 +- .../dao/mapper/ProjectRecordMapper.xml | 6 +- .../projectrecord/entity/ProjectRecord.java | 6 +- .../projectrecord/entity/ProjectRecordVO.java | 2 +- .../service/IProjectRecordService.java | 12 +- .../impl/ProjectRecordServiceImpl.java | 30 ++-- .../ProjectReEvaluationController.java | 8 +- .../dao/mapper/ProjectReEvaluationMapper.xml | 8 +- .../entity/ProjectReEvaluation.java | 10 +- .../entity/ProjectReEvaluationVO.java | 2 +- .../service/IProjectReEvaluationService.java | 6 +- .../impl/ProjectReEvaluationServiceImpl.java | 61 +++---- .../controller/ProjectSectionController.java | 62 +++++--- .../dao/ProjectSectionMapper.java | 10 +- .../dao/mapper/ProjectSectionFlowMapper.xml | 10 +- .../dao/mapper/ProjectSectionMapper.xml | 19 +-- .../projectsection/entity/ProjectSection.java | 6 +- .../entity/ProjectSectionFlow.java | 4 +- .../entity/ProjectSectionVO.java | 6 +- .../service/IProjectSectionFlowService.java | 2 +- .../service/IProjectSectionService.java | 38 +++-- .../impl/ProjectSectionFlowServiceImpl.java | 4 +- .../impl/ProjectSectionServiceImpl.java | 64 +++++--- .../dao/mapper/ProjectUpdateFieldMapper.xml | 4 +- .../entity/ProjectUpdateField.java | 8 +- .../dao/SectionMaterialMapper.java | 2 +- .../dao/mapper/SectionMaterialMapper.xml | 6 +- .../entity/SectionMaterial.java | 6 +- .../service/ISectionMaterialService.java | 2 +- .../impl/SectionMaterialServiceImpl.java | 2 +- .../controller/SectionSupplierController.java | 4 +- .../dao/SectionSupplierMapper.java | 2 +- .../dao/mapper/SectionSupplierMapper.xml | 12 +- .../entity/SectionSupplier.java | 8 +- .../service/ISectionSupplierService.java | 2 +- .../impl/SectionSupplierServiceImpl.java | 2 +- src/main/resources/application-dev.yml | 22 ++- src/main/resources/application-test.yml | 8 +- src/main/resources/file.conf | 5 +- src/main/resources/registry.conf | 72 +-------- src/main/resources/seata.conf | 21 --- 104 files changed, 1061 insertions(+), 497 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryGoodsVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustInquiryService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java delete mode 100644 src/main/resources/seata.conf diff --git a/deployment-gz.yaml b/deployment-gz.yaml index c35f3ed..2d84e2a 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -29,6 +29,9 @@ spec: labels: # 模板名称 app: biz-service-ebtp-project + annotations: + prometheus.io/port: '18012' + prometheus.io/jl-pod: 'true' # 定义容器模板，该模板可以包含多个容器 spec: @@ -71,6 +74,8 @@ metadata: app: biz-service-ebtp-project annotations: lb.cke.tg.unicom/target-vports: 18012-18012 + prometheus.io/port: '18012' + prometheus.io/jl-svc: 'true' spec: ports: - port: 18012 diff --git a/pom.xml b/pom.xml index 5be14b1..04baae7 100644 --- a/pom.xml +++ b/pom.xml @@ -17,25 +17,9 @@ com.chinaunicom.mall.ebtp uboot-core - 0.0.2-SNAPSHOT - - - com.chinaunicom.ebtp - mall-ebtp-cloud-security-starter - - + 0.0.1-SNAPSHOT - - com.alibaba - druid-spring-boot-starter - - - - io.seata - seata-spring-boot-starter - - com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter @@ -51,15 +35,9 @@ mysql-connector-java - - com.chinaunicom.ebtp - mall-ebtp-cloud-redis-starter - - com.chinaunicom.ebtp mall-ebtp-cloud-attachment-sdk - 0.0.1-SNAPSHOT @@ -80,6 +58,7 @@ true + always diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java index 76f05ab..18d36fa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java @@ -1,14 +1,19 @@ package com.chinaunicom.mall.ebtp.project; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; + +import io.micrometer.core.instrument.MeterRegistry; + @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class @@ -22,5 +27,10 @@ public class BizServiceEbtpProjectApplication { public static void main(String[] args) { SpringApplication.run(BizServiceEbtpProjectApplication.class, args); } + + @Bean + public MeterRegistryCustomizer configurer() { + return (registry) -> registry.config().commonTags("application", "biz-service-ebtp-project"); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/dao/mapper/BaseOperLogMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/dao/mapper/BaseOperLogMapper.xml index 4430b04..47eab31 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/dao/mapper/BaseOperLogMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/dao/mapper/BaseOperLogMapper.xml @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + update base_oper_log set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/entity/BaseOperLog.java b/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/entity/BaseOperLog.java index f257b05..c95b3bf 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/entity/BaseOperLog.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/entity/BaseOperLog.java @@ -32,7 +32,7 @@ public class BaseOperLog implements Serializable { * 主键 */ @ApiModelProperty(value = "主键") - private Long id; + private String id; /** * 调用的函数 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/service/impl/BaseOperLogServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/service/impl/BaseOperLogServiceImpl.java index 963446c..2003903 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/service/impl/BaseOperLogServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/service/impl/BaseOperLogServiceImpl.java @@ -47,7 +47,7 @@ public class BaseOperLogServiceImpl extends BaseServiceImpl IS_DELEGATION_MAP = new HashMap(){{ + put(IS_DELEGATION_0,ProjectCommonUtil.ORGANIZATION_2); + put(IS_DELEGATION_1,ProjectCommonUtil.ORGANIZATION_1); + }}; + + + /** + * 采购类型转换 MAP + */ + public static Map BID_TYPE_MAP = new HashMap(){{ + put(BID_TYPE_1,ProjectCommonUtil.PROCUREMENT_TYPE_1); + put(BID_TYPE_2,ProjectCommonUtil.PROCUREMENT_TYPE_2); + put(BID_TYPE_3,ProjectCommonUtil.PROCUREMENT_TYPE_3); + }}; + + /** + * 采购方式 MAP + */ + public static Map BUY_WAY_MAP = new HashMap(){{ + put(BUY_WAY_0,ProjectCommonUtil.PROCUREMENT_MODE_7); + }}; + + /** + * 询价模式 MAP + */ + public static Map INQUIRY_MODEL_MAP = new HashMap(){{ + put(INQUIRY_MODEL_0,ProjectCommonUtil.INQUIRY_METHOD_1); + put(INQUIRY_MODEL_1,ProjectCommonUtil.INQUIRY_METHOD_2); + }}; +} 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 ff859cd..3abb89f 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 @@ -425,4 +425,14 @@ public class ProjectCommonUtil { * 项目异常处理 公告状态5 发布成功 */ public static final int SEND_MESSAGE_STATUS_5 = 5; + + /** + * 询价方式 公开询价 + */ + public static final String INQUIRY_METHOD_1 = "inquiry_method_1"; + + /** + * 询价方式 定向询价 + */ + public static final String INQUIRY_METHOD_2 = "inquiry_method_2"; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index bb8cdd1..a584314 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -16,6 +16,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { /** * 数据为空 */ + FRAME_EXCEPTION_ERROR(110000, ""), + FRAME_EXCEPTION_PROJECT_ENTRUST_NOT_FIND(110001, "项目委托单信息为空！"), FRAME_EXCEPTION_PROJECT_RECORD_NOT_FIND(110002, "项目建档信息为空！"), @@ -82,13 +84,13 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_PROJECT_PROJ_BASE_INFO_VO_EMPTY(110033, "项目委托方案信息为空！"), - FRAME_EXCEPTION_PROJECT_ASSET_TYPE_EMPTY(110034, "项目委托方案信息资产类型信息为空！"), + FRAME_EXCEPTION_PROJECT_UNDERTAKER_CODE_EMPTY(110034, "项目委托方案信息处置经理信息为空！"), FRAME_EXCEPTION_PROJECT_ASSET_VALUE_EMPTY(110035, "项目委托方案信息资产价值信息为空！"), - FRAME_EXCEPTION_PROJECT_NUM_EMPTY(110036, "项目委托方案信息数量信息为空！"), + FRAME_EXCEPTION_DISPOSAL_TYPE_EMPTY(110036, "项目委托方案信息报价方式信息为空！"), - FRAME_EXCEPTION_PROJECT_UNIT_EMPTY(110037, "项目委托方案信息计量单位信息为空！"), + FRAME_EXCEPTION_START_PRICE_EMPTY(110037, "项目委托方案信息起拍总价信息为空！"), FRAME_EXCEPTION_PROJECT_SECTION_EXCEPTION_DELETE(110038, "项目异常标段信息删除失败！"), @@ -110,6 +112,9 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_ASSESS_ROOM_NOT_FIND(110047, "项目标段评审室信息查询失败！"), + FRAME_EXCEPTION_PROC_IMPL_DEPT_EMPTY(110048, "项目委托方案信息处置实施部门信息为空！"), + + FRAME_EXCEPTION_PURP_MATERIAL_VO_LIST_EMPTY(110049, "项目委托方案信息采购内容信息为空！"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java new file mode 100644 index 0000000..9b93653 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java @@ -0,0 +1,33 @@ +package com.chinaunicom.mall.ebtp.project.common; + +import com.chinaunicom.mall.ebtp.common.exception.service.BusinessExceptionAssert; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 项目建档错误提示信息 + * @author daixc + * @date 2020/10/10 + */ +@Getter +@AllArgsConstructor +public enum ProjectlnnerShotExceptionEnum implements BusinessExceptionAssert { + + AUCTION_PROJECT_INFORMATION_NONE(200001, "暂无此项目建档信息!"), + AUCTION_PROJECT_FAILED_TO_QUERY_ITEM_DATA(200002, "查询不到此数据!"), + AUCTION_PROJECT_CAN_ALREADY(200003, "已参与此竞拍项目!"), + + AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN(200004, "再次发起竞拍失败!"), + AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN_MATERIAL(200005, "再次发起竞拍失败!") + + ; + + /** + * 返回码 + */ + private int code; + /** + * 返回消息 + */ + private String message; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml index 517c6ce..1141584 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml @@ -16,7 +16,7 @@ - + update dict_project set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml index 34a80a0..9fc807a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml @@ -4,14 +4,14 @@ - + - + update dict_region set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/dao/mapper/DictChooseProcessMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/dao/mapper/DictChooseProcessMapper.xml index c95ffda..1cc1984 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/dao/mapper/DictChooseProcessMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/dao/mapper/DictChooseProcessMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,8 +13,8 @@ - - + + @@ -26,7 +26,7 @@ - + update dict_choose_process set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/entity/DictChooseProcess.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/entity/DictChooseProcess.java index a93f787..2c75843 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/entity/DictChooseProcess.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/dictchooseprocess/entity/DictChooseProcess.java @@ -30,7 +30,7 @@ public class DictChooseProcess extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 流程标识 @@ -86,14 +86,14 @@ public class DictChooseProcess extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "流程ID") @JsonSerialize(using = ToStringSerializer.class) - private Long flowId; + private String flowId; /** * 候审流程ID */ @ApiModelProperty(value = "候审流程ID") @JsonSerialize(using = ToStringSerializer.class) - private Long qualFlowId; + private String qualFlowId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallBidApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallBidApi.java index e6795f1..b71182c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallBidApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallBidApi.java @@ -5,7 +5,6 @@ import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; import com.chinaunicom.mall.ebtp.project.feign.entity.AgainRoomVO; import com.chinaunicom.mall.ebtp.project.feign.entity.AnnoVO; import com.chinaunicom.mall.ebtp.project.feign.fallback.EbtpMallBidClientFallback; -import com.chinaunicom.mall.ebtp.project.feign.fallback.EbtpMallProcessClientFallback; import com.chinaunicom.mall.ebtp.project.sectionsupplier.entity.SectionSupplierVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -28,7 +27,7 @@ public interface EbtpMallBidApi { * @return 返回结果 */ @PutMapping("/v1/anno/abnormal") - BaseResponse abnormal(@RequestBody List sectionIds); + BaseResponse abnormal(@RequestBody List sectionIds); /** @@ -59,4 +58,6 @@ public interface EbtpMallBidApi { @PostMapping("/v1/anno/failList") BaseResponse> getAnnoStatus(@RequestBody List abnormalIds); + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java index 8a92c9a..c033a9a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java @@ -28,8 +28,8 @@ public interface EbtpMallProcessApi { * @return 返回结果 */ @PostMapping("/v1/bizassessroom/initialize") - BaseResponse initialize(@RequestParam(name = "tpId") Long tpId, - @RequestBody Map sectionMap, + BaseResponse initialize(@RequestParam(name = "tpId") String tpId, + @RequestBody Map sectionMap, @RequestParam(name = "preStatus") Boolean preStatus); /** * 评审室信息初始化 @@ -39,8 +39,8 @@ public interface EbtpMallProcessApi { * @return 返回结果 */ @PostMapping("/v1/bizassessroom/again/initialize") - BaseResponse againinitialize(@RequestParam(name = "tpId") Long tpId, - @RequestParam(name = "sectionId") Long sectionId, + BaseResponse againinitialize(@RequestParam(name = "tpId") String tpId, + @RequestParam(name = "sectionId") String sectionId, @RequestParam(name = "roomSort") Integer roomSort); @@ -60,14 +60,4 @@ public interface EbtpMallProcessApi { @PostMapping("/v1/bizassessroom/listAll") BaseResponse> listAll(@RequestBody BizAssessRoom bizAssessRoomVO); - - /** - * 复制评委会成员信息 - * @param oldRoomId 被复制的评审室ID - * @param newRoomId 新的评审室ID - * @return 返回结果 - */ - @GetMapping("/v1/jury/copy") - BaseResponse copyJury(@RequestParam(name = "oldRoomId") Long oldRoomId, - @RequestParam(name = "newRoomId") Long newRoomId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRespsApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRespsApi.java index a08b530..9cb58b6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRespsApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRespsApi.java @@ -20,6 +20,6 @@ public interface EbtpRespsApi { * @param againRoom 参数 * @return 返回结果 */ - @PostMapping("/copyTdocByAgainRoom") + @PostMapping("/v1/tdoc/copyTdocByAgainRoom") BaseResponse copyTdocByAgainRoom(@RequestBody AgainRoomVO againRoom); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java index 3b7c8c2..fbbe200 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java @@ -4,11 +4,13 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.constant.ServiceNameConstants; import com.chinaunicom.mall.ebtp.project.feign.entity.AgainRoomVO; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; /** - * 标段应答文件 + * 评审 * @author daixc * @date 2020/11/25 */ @@ -22,4 +24,14 @@ public interface EbtpRsmsApi { */ @PostMapping("/v1/review/config/detail/again") BaseResponse again(@RequestBody AgainRoomVO againRoomVO); + + /** + * 复制评委会成员信息 + * @param oldRoomId 被复制的评审室ID + * @param newRoomId 新的评审室ID + * @return 返回结果 + */ + @GetMapping("/v1/jury/copy") + BaseResponse copyJury(@RequestParam(name = "oldRoomId") String oldRoomId, + @RequestParam(name = "newRoomId") String newRoomId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpTenderApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpTenderApi.java index c62bd2c..6bfc933 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpTenderApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpTenderApi.java @@ -24,5 +24,5 @@ public interface EbtpTenderApi { */ @PostMapping("/v1/supplier_register/review_again") BaseResponse reviewAgain(@RequestBody AgainRoomVO againRoomVO, - @RequestParam("roomId") Long roomId); + @RequestParam("roomId") String roomId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java index 9089c86..024fcab 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/MallPurpApi.java @@ -39,7 +39,7 @@ public interface MallPurpApi { * @return 返回结果 */ @PostMapping("/v1/purpBaseInfo/findDataByPurpImplmentId") - BaseResponse findDataByPurpImplmentId(@RequestParam("purpImplmentId") Long purpImplmentId); + BaseResponse findDataByPurpImplmentId(@RequestParam("purpImplmentId") String purpImplmentId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AgainRoomVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AgainRoomVO.java index 11213bd..b4b684a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AgainRoomVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AgainRoomVO.java @@ -14,15 +14,15 @@ public class AgainRoomVO { @ApiModelProperty(value = "重新评审的新的评审室ID") - private Long roomId; + private String roomId; @ApiModelProperty(value = "评审轮次<旧轮次ID，新轮次ID>") - private Map turnMap; + private Map turnMap; @ApiModelProperty(value = "业务数据对象") - private Map dataMap; + private Map dataMap; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java index d2b0809..024eba2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java @@ -21,7 +21,7 @@ public class AnnoVO implements Serializable { @ApiModelProperty(value = "主键id") @JsonInclude(JsonInclude.Include.NON_NULL) - private Long id; + private String id; /** * 异常ID @@ -36,7 +36,7 @@ public class AnnoVO implements Serializable { */ @ApiModelProperty(value = "附件集id") @JsonInclude(JsonInclude.Include.NON_NULL) - private Long attDatasetId; + private String attDatasetId; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAgainSection.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAgainSection.java index 862cddb..96db428 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAgainSection.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAgainSection.java @@ -33,4 +33,8 @@ public class BizAgainSection implements Serializable { * 评审室ID */ private String assessId; + /** + * 项目ID + */ + private String projectId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAssessRoom.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAssessRoom.java index 4d02cff..9ac2182 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAssessRoom.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/BizAssessRoom.java @@ -31,19 +31,19 @@ public class BizAssessRoom extends BaseEntity implements Serializable { * 主键 */ @ApiModelProperty(value = "主键") - private Long id; + private String id; /** * 项目id */ @ApiModelProperty(value = "项目id") - private Long tpId; + private String tpId; /** * 标包id */ @ApiModelProperty(value = "标包id") - private Long sectionId; + private String sectionId; /** * 评审室名称 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/DictProjectConfig.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/DictProjectConfig.java index cc0c3d8..d85640a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/DictProjectConfig.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/DictProjectConfig.java @@ -25,13 +25,13 @@ public class DictProjectConfig implements Serializable { * 主键 */ @ApiModelProperty(value = "主键") - private Long id; + private String id; /** * 项目配置定义表主键ID */ @ApiModelProperty(value = "项目配置定义表主键ID") - private Long defId; + private String defId; /** * 采购方式(bid_method_dict) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/WfProjectConfigTask.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/WfProjectConfigTask.java index 8b2972b..b07be24 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/WfProjectConfigTask.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/WfProjectConfigTask.java @@ -25,7 +25,7 @@ public class WfProjectConfigTask implements Serializable { * */ @ApiModelProperty(value = "主键") - private Long id; + private String id; /** * 流程节点名称 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java index 488f3fe..aed5e97 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java @@ -3,7 +3,6 @@ package com.chinaunicom.mall.ebtp.project.feign.fallback; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.EbtpMallBidApi; -import com.chinaunicom.mall.ebtp.project.feign.EbtpMallProcessApi; import com.chinaunicom.mall.ebtp.project.feign.entity.*; import com.chinaunicom.mall.ebtp.project.sectionsupplier.entity.SectionSupplierVO; import feign.hystrix.FallbackFactory; @@ -30,8 +29,9 @@ public class EbtpMallBidClientFallback implements FallbackFactory abnormal(List sectionIds) { + public BaseResponse abnormal(List sectionIds) { return null; } @@ -49,6 +49,8 @@ public class EbtpMallBidClientFallback implements FallbackFactory> getAnnoStatus(List abnormalIds) { return null; } + + }; } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java index b787437..2cf259d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java @@ -33,13 +33,14 @@ public class EbtpMallProcessClientFallback implements FallbackFactory initialize(Long tpId, Map sectionMap, Boolean preStatus) { + public BaseResponse initialize(String tpId, Map sectionMap, Boolean preStatus) { return null; } @Override - public BaseResponse againinitialize(Long tpId, Long sectionId, Integer roomSort) { + public BaseResponse againinitialize(String tpId, String sectionId, Integer roomSort) { return null; } @@ -52,11 +53,6 @@ public class EbtpMallProcessClientFallback implements FallbackFactory> listAll(BizAssessRoom bizAssessRoomVO) { return null; } - - @Override - public BaseResponse copyJury(Long oldRoomId, Long newRoomId) { - return null; - } }; } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java index 1532d95..94a8732 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java @@ -27,14 +27,14 @@ public class EbtpProjectClientFallback implements FallbackFactory { public MallPurpApi create(Throwable throwable) { throwable.printStackTrace(); return new MallPurpApi() { + @Override public BaseResponse projInvitationFail(String purpImplmentId, List projIds, String failStatus, String failCause) { - return null; } @Override - public BaseResponse findDataByPurpImplmentId(Long purpImplmentId) { + public BaseResponse findDataByPurpImplmentId(String purpImplmentId) { return null; } }; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/controller/ProjectAuctionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/controller/ProjectAuctionController.java index d829db4..247ee3e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/controller/ProjectAuctionController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/controller/ProjectAuctionController.java @@ -67,7 +67,7 @@ public class ProjectAuctionController{ */ @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ ProjectAuction projectAuction = projectAuctionService.getById(id); @@ -97,7 +97,7 @@ public class ProjectAuctionController{ */ @ApiOperation("查询数据（包括竞拍物资信息）") @GetMapping("/getAllById/{id}") - public BaseResponse getAllById(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse getAllById(@ApiParam(value = "主键id", required = true) @PathVariable String id){ ProjectAuction projectAuction = projectAuctionService.getAllById(id); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/dao/mapper/ProjectAuctionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/dao/mapper/ProjectAuctionMapper.xml index dc6086d..6fe2f54 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/dao/mapper/ProjectAuctionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/dao/mapper/ProjectAuctionMapper.xml @@ -4,7 +4,7 @@ - + @@ -47,7 +47,7 @@ - + update biz_project_auction set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/entity/ProjectAuction.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/entity/ProjectAuction.java index f62b5c4..49eec4b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/entity/ProjectAuction.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/entity/ProjectAuction.java @@ -31,7 +31,7 @@ public class ProjectAuction extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 处置名称（项目名称） @@ -43,7 +43,7 @@ public class ProjectAuction extends BaseEntity implements Serializable { * 项目流水号 */ @ApiModelProperty(value = "项目流水号") - private Long projectNum; + private String projectBizNum; /** * 父项目编号 @@ -218,6 +218,6 @@ public class ProjectAuction extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "附件组ID") @JsonSerialize(using = ToStringSerializer.class) - private Long fileUploadId; + private String fileUploadId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/IProjectAuctionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/IProjectAuctionService.java index 811a889..4520807 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/IProjectAuctionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/IProjectAuctionService.java @@ -27,7 +27,7 @@ public interface IProjectAuctionService extends IBaseService{ * @param id 项目ID * @return 返回结果 */ - ProjectAuctionVO getAllById(Long id); + ProjectAuctionVO getAllById(String id); /** * 出始化竞拍项目信息 @@ -42,6 +42,6 @@ public interface IProjectAuctionService extends IBaseService{ * @param purpImplementSendVO 竞拍 * @return 返回结果 */ - boolean initProjectAuction(Long ebpProjectId,PurpImplementSendVO purpImplementSendVO); + boolean initProjectAuction(String ebpProjectId,PurpImplementSendVO purpImplementSendVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/impl/ProjectAuctionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/impl/ProjectAuctionServiceImpl.java index 1ffb68f..502baa7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/impl/ProjectAuctionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauction/service/impl/ProjectAuctionServiceImpl.java @@ -72,7 +72,7 @@ public class ProjectAuctionServiceImpl extends BaseServiceImpl().eq("ebp_project_id",ebpProjectId)); if(count > 0){ @@ -130,7 +130,7 @@ public class ProjectAuctionServiceImpl extends BaseServiceImpl assembleAuctionMaterial(Long auctionId,List purpMaterialVOList){ + private List assembleAuctionMaterial(String auctionId,List purpMaterialVOList){ List materialList = new ArrayList<>(); @@ -254,9 +254,29 @@ public class ProjectAuctionServiceImpl extends BaseServiceImpl - - + + @@ -32,7 +32,7 @@ - + update biz_project_auction_material set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauctionmaterial/entity/ProjectAuctionMaterial.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauctionmaterial/entity/ProjectAuctionMaterial.java index e853fa9..6ac92a3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectauctionmaterial/entity/ProjectAuctionMaterial.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectauctionmaterial/entity/ProjectAuctionMaterial.java @@ -31,14 +31,14 @@ public class ProjectAuctionMaterial extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 竞拍项目编号 */ @ApiModelProperty(value = "竞拍项目编号") @JsonSerialize(using = ToStringSerializer.class) - private Long auctionId; + private String auctionId; /** * 物资行ID diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java index 8fc38ba..eab8aed 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java @@ -74,7 +74,7 @@ public class ProjectEntrustController{ // @OperLog() @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ ProjectEntrust projectEntrust = projectEntrustService.getById(id); return BaseResponse.success(BeanUtil.toBean(projectEntrust,ProjectEntrustVO.class)); @@ -106,7 +106,7 @@ public class ProjectEntrustController{ @ApiOperation("分派项目经理") @PostMapping("/dispatch/{id}") public BaseResponse dispatch( - @ApiParam(value = "主键id", required = true) @PathVariable Long id, + @ApiParam(value = "主键id", required = true) @PathVariable String id, @ApiParam(value = "主键id", required = true) @RequestBody ProjectEntrustVO projectEntrust){ projectEntrust.setId(id); @@ -122,7 +122,7 @@ public class ProjectEntrustController{ */ @ApiOperation("取消分派项目经理") @GetMapping("/retractDispatch/{id}") - public BaseResponse retractDispatch(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse retractDispatch(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectEntrustService.retractDispatch(id)); } @@ -137,7 +137,7 @@ public class ProjectEntrustController{ */ @ApiOperation("委托机构拒绝") @GetMapping("/agencyCompanyDispatch/{id}") - public BaseResponse agencyCompanyDispatch(@ApiParam(value = "主键id", required = true) @PathVariable Long id, + public BaseResponse agencyCompanyDispatch(@ApiParam(value = "主键id", required = true) @PathVariable String id, @ApiParam(value = "拒绝信息", required = true) String remarks){ return BaseResponse.success(projectEntrustService.agencyCompanyDispatch(id,remarks)); @@ -152,7 +152,7 @@ public class ProjectEntrustController{ */ @ApiOperation("项目经理同意") @GetMapping("/projectManagerAgree/{id}") - public BaseResponse projectManagerAgree(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse projectManagerAgree(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectEntrustService.projectManagerAgree(id)); } @@ -166,7 +166,7 @@ public class ProjectEntrustController{ */ @ApiOperation("项目经理拒绝") @GetMapping("/projectManagerRefuse/{id}") - public BaseResponse projectManagerRefuse(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse projectManagerRefuse(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectEntrustService.projectManagerRefuse(id)); } @@ -181,7 +181,7 @@ public class ProjectEntrustController{ */ @ApiOperation("查询数据（所有关于项目信息）") @GetMapping("/getProject/{id}") - public BaseResponse getProjectAll(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse getProjectAll(@ApiParam(value = "主键id", required = true) @PathVariable String id){ ProjectEntrustVO projectEntrust = projectEntrustService.getProjectAll(id); @@ -198,7 +198,7 @@ public class ProjectEntrustController{ @PostMapping("/initProjectEntrust") public BaseResponse initProjectEntrust(@ApiParam(value = "实施项目编码", required = true) @RequestParam(name = "ebpProjectId") Long ebpProjectId) { - return BaseResponse.success(projectEntrustService.initProjectEntrust(ebpProjectId)); + return BaseResponse.success(projectEntrustService.initProjectEntrust(String.valueOf(ebpProjectId))); } /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustExpandMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustExpandMapper.xml index 17fd17b..cb81673 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustExpandMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustExpandMapper.xml @@ -4,9 +4,10 @@ - + - + + @@ -18,7 +19,7 @@ - + update biz_project_entrust_expand set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustMapper.xml index 07583fe..9d6c1f4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/dao/mapper/ProjectEntrustMapper.xml @@ -5,7 +5,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -43,7 +43,7 @@ - + update biz_project_entrust set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrust.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrust.java index da508b9..a202d9d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrust.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrust.java @@ -36,7 +36,7 @@ public class ProjectEntrust extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 采购人，GG_JGBH,JGBH diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrustExpand.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrustExpand.java index 1b96cdf..be58ae6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrustExpand.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ProjectEntrustExpand.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.config.CustomJacksonTypeHandler; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpImplementSendVO; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,13 +32,13 @@ public class ProjectEntrustExpand extends BaseEntity implements Serializable { * 编号 */ @ApiModelProperty(value = "编号") - private Long id; + private String id; /** * 委托单ID */ @ApiModelProperty(value = "委托单ID") - private Long entrustId; + private String entrustId; /** * 采购系统推送项目信息 @@ -47,4 +48,10 @@ public class ProjectEntrustExpand extends BaseEntity implements Serializable { private PurpImplementSendVO purpImplementSendVO; + /** + * 采购系统推送项目信息 + */ + @ApiModelProperty(value = "商城系统推送询价项目信息") + @TableField(typeHandler = CustomJacksonTypeHandler.class) + private InquiryVO inquiryVO; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java index ceeb14d..cd36841 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjBaseInfoVO.java @@ -32,7 +32,7 @@ public class ProjBaseInfoVO{ @ApiModelProperty(value = "方案主键id") @JsonFormat(shape = JsonFormat.Shape.STRING) @TableId(value = "id") - private Long id; + private String id; @ApiModelProperty(value = "采购方案编号") private String projNo; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java index 1abcce4..32d301f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/ProjSuppRelVO.java @@ -33,7 +33,7 @@ public class ProjSuppRelVO{ @ApiModelProperty(value = "id") @JsonFormat(shape = JsonFormat.Shape.STRING) @TableId(value = "id") - private Long id; + private String id; @ApiModelProperty(value = "采购方案id") private Long projId; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java index bb6f034..29dd25c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpBaseInfoVO.java @@ -178,5 +178,8 @@ public class PurpBaseInfoVO { @ApiModelProperty(value = "所属省分") private String suborProvince; + + @ApiModelProperty(value = "项目背景") + private String purpContext; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryGoodsVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryGoodsVO.java new file mode 100644 index 0000000..0ded4c2 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryGoodsVO.java @@ -0,0 +1,80 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @description：询价商品 + * @author：weiyg + * @date：2020/12/15 10:16 + * @since：2020/12/15 10:16 + * @update [序号][日期YYYY-MM-DD] [更改人姓名][变更描述] + */ +@Data +@Accessors(chain = true) +@ApiModel(value="ChinaunicomOrderInquiryGoodsVO对象", description="询价商品") +public class InquiryGoodsVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + private String inquiryGoodsId; + + @ApiModelProperty(value = "询价单id") + private String inquiryId; + + @ApiModelProperty(value = "询价单编号") + private String inquiryNo; + + @ApiModelProperty(value = "产品物料编码") + private String itemNumber; + + @ApiModelProperty(value = "商品货号(条形码)") + private String goodsNo; + + @ApiModelProperty(value = "物料名称") + private String itemDescription; + + @ApiModelProperty(value = "商品分类") + private String categoryCode; + + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "标准单价") + private BigDecimal standardPrice; + + @ApiModelProperty(value = "权重占比") + private BigDecimal weightRatio; + + @ApiModelProperty(value = "物料描述") + private String note; + + @ApiModelProperty(value = "数量") + private BigDecimal num; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "0不限 1孵化区 2推广区") + private Integer extensionArea; + + @ApiModelProperty(value = "创建人名称") + private String createCn; + + @ApiModelProperty(value = "处理人，操作人") + private String managerBy; + + @ApiModelProperty(value = "处理人名称") + private String managerCn; + + private Date lastUpdateTime; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java new file mode 100644 index 0000000..495ec41 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryResponseFormatVO.java @@ -0,0 +1,57 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @file: cn.chinaunicom.sdsi.inquiry.vo.InquiryResponseFormatVO + * @description: 应答格式实体 + * @author: ck + * @date: 2021-01-06 + * @version: V1.0 + * @update [序号][日期YYYY-MM-DD] [更改人姓名][变更描述] + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="应答格式实体", description="应答格式实体") +public class InquiryResponseFormatVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "应答格式实体id") + private String responseFormatId; + + @ApiModelProperty(value = "询价单id") + private String inquiryId; + + @ApiModelProperty(value = "类别名称") + private String categoryName; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "格式类型 0:rar/zip ; 1: pdf") + private Integer type; + + @ApiModelProperty(value = "创建人名称") + private String createCn; + + @ApiModelProperty(value = "处理人，操作人") + private String managerBy; + + @ApiModelProperty(value = "处理人名称") + private String managerCn; + + @ApiModelProperty(value = "租户名称") + private String tenantName; + + private Date lastUpdateTime; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java new file mode 100644 index 0000000..a53e838 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/inquiryentity/InquiryVO.java @@ -0,0 +1,150 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity; + +import java.math.BigDecimal; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @description：询价单 + * @author：weiyg + * @date：2020/12/15 9:16 + * @since：2020/12/15 9:16 + * @update [序号][日期YYYY-MM-DD] [更改人姓名][变更描述] + */ +@Data +@Accessors(chain = true) +@ApiModel(value="ChinaunicomOrderInquiryVO对象", description="询价单") +public class InquiryVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + private String inquiryId; + + @ApiModelProperty(value = "询价单号") + private String inquiryNo; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "询价人市份ou") + private String userCityOu; + + @ApiModelProperty(value = "询价人省分ou") + private String orgOu; + + @ApiModelProperty(value = "询价人省分ou名称") + private String orgOuName; + + @ApiModelProperty(value = "询价企业名称（中国联合网络通信有限公司）") + private String inquiryCompany; + + @ApiModelProperty(value = "询价单位名称(例如山东省济南市分公司)") + private String inquiryOrg; + + @ApiModelProperty(value = "报价截至时间") + private Date endTime; + + @ApiModelProperty(value = "省code") + private String province; + + @ApiModelProperty(value = "省份名称") + private String addressProvinceName; + + @ApiModelProperty(value = "市code") + private String city; + + @ApiModelProperty(value = "地市") + private String addressCityName; + + @ApiModelProperty(value = "区code") + private String area; + + @ApiModelProperty(value = "区县名称") + private String addressAreaName; + + @ApiModelProperty(value = "联系人") + private String telName; + + @ApiModelProperty(value = "联系电话") + private String telphone; + + @ApiModelProperty(value = "询价范围,0:所有,1:1级,2:2级及以上,3:3级及以上,4:4级及以上,5:5级及以上,6:指定供应商,7:按标签筛选供应商,8上一轮中选供应商") + private Integer scope; + + @ApiModelProperty(value = "中选方式，0:综合评分法，1:最低价法") + private Integer selectType; + + @ApiModelProperty(value = "价格公式") + private String priceFormula; + + @ApiModelProperty(value = "供应商中选最小数量") + private Integer providerSelectCountMin; + + @ApiModelProperty(value = "供应商中选最大数量") + private Integer providerSelectCountMax; + + @ApiModelProperty(value = "中选原则") + private String selectRule; + + @ApiModelProperty(value = "询价模式 0:公开询价 1：定向询价") + private Integer inquiryModel; + + @ApiModelProperty(value = "预算金额") + private BigDecimal budgetNum; + + @ApiModelProperty(value = "采购方式：0公开询价，1公开直购") + private Integer buyWay; + + @ApiModelProperty(value = "唱标时间") + private Date announcementTime; + + @ApiModelProperty(value = "唱标状态 -1：不需要唱标 0 未唱标 1 唱标中 2 唱标结束 ") + private Integer announcementStatus; + + @ApiModelProperty(value = "定向询价原因") + private String inquiryModel1Reason; + + @ApiModelProperty(value = "评审开始时间") + private Date reviewStartTime; + + @ApiModelProperty(value = "价格评审办法：0最低价法,1基准价法,2其他") + private Integer reviewMethod; + + @ApiModelProperty(value = "是否委托招标代理，0否1是") + private Integer isDelegation; + + @ApiModelProperty(value = "代理机构编号") + private String delegationCode; + + @ApiModelProperty(value = "代理机构名称") + private String delegationName; + + @ApiModelProperty(value = "标的类型：1货物 2服务 3施工服务") + private Integer bidType; + + @ApiModelProperty(value = "处理人，操作人") + private String managerBy; + + @ApiModelProperty(value = "处理人名称") + private String managerCn; + + @ApiModelProperty(value = "委托部门") + private String entrustDepartment; + + @ApiModelProperty(value = "委托部门名称") + private String entrustDepartmentName; + + @ApiModelProperty(value = "询价商品列表") + private List inquiryGoodsList; + + @ApiModelProperty(value = "应答格式列表") + private List responseFormatList; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustInquiryService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustInquiryService.java new file mode 100644 index 0000000..07f1cbb --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustInquiryService.java @@ -0,0 +1,21 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.service; + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrust; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO; + +/** + * 操作询价项目委托信息 + * @author daixc + * @date 2021/01/12 + * + */ +public interface IProjectEntrustInquiryService extends IBaseService { + + /** + * 初始化询价委托信息 + * @param inquiryVO 询价单 + * @return 返回结果 + */ + boolean initProjectEntrust(InquiryVO inquiryVO); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java index 3804c36..ef9b322 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java @@ -6,9 +6,6 @@ import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrust; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpImplementSendVO; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; /** * 对数据表 biz_project_entrust 操作的 service @@ -37,7 +34,7 @@ public interface IProjectEntrustService extends IBaseService{ * @param id 委托单ID * @return 返回结果 */ - boolean retractDispatch(Long id); + boolean retractDispatch(String id); /** * 委托机构拒绝 @@ -45,28 +42,28 @@ public interface IProjectEntrustService extends IBaseService{ * @param remarks 决绝说明 * @return 返回结果 */ - boolean agencyCompanyDispatch(Long id, String remarks); + boolean agencyCompanyDispatch(String id, String remarks); /** * 项目经理同意 * @param id 委托单ID * @return 返回结果 */ - boolean projectManagerAgree(Long id); + boolean projectManagerAgree(String id); /** * 项目经理拒绝 * @param id 委托单ID * @return 返回结果 */ - boolean projectManagerRefuse(Long id); + boolean projectManagerRefuse(String id); /** * 获取项目相关所有信息 * @param id 委托单ID * @return 返回结果 */ - ProjectEntrustVO getProjectAll(Long id); + ProjectEntrustVO getProjectAll(String id); /** * 委托项目信息出始化 @@ -74,7 +71,7 @@ public interface IProjectEntrustService extends IBaseService{ * @param ebpProjectId 实施项目ID * @return 返回结果 */ - boolean initProjectEntrust(Long ebpProjectId); + boolean initProjectEntrust(String ebpProjectId); /** * 接口测试 @@ -82,4 +79,18 @@ public interface IProjectEntrustService extends IBaseService{ * @return */ boolean testProjectEntrust(PurpImplementSendVO purpImplementSendVO); + + /** + * 初始化项目相关信息 + * @param projectEntrustVO 项目所有信息 + * @return 返回结果 + */ + boolean saveProject(ProjectEntrustVO projectEntrustVO); + + /** + * 初始化项目相关信息 + * @param projectEntrustVO 项目所有信息 + * @return 返回结果 + */ + boolean updateProject(ProjectEntrustVO projectEntrustVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java new file mode 100644 index 0000000..ed8725a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java @@ -0,0 +1,125 @@ +package com.chinaunicom.mall.ebtp.project.projectentrust.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.project.common.InquiryCommonUtil; +import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil; +import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum; +import com.chinaunicom.mall.ebtp.project.projectentrust.dao.ProjectEntrustMapper; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrust; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustExpand; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO; +import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryVO; +import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustInquiryService; +import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustService; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +/** + * 项目询价serviceImpl + * @author daixc + * @date 2021/01/16 + */ +@Service +public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl implements IProjectEntrustInquiryService { + + + @Resource + private IProjectEntrustService entrustService; + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean initProjectEntrust(InquiryVO inquiryVO) { + boolean result = false; + ProjectEntrust projectEntrust = this.getOne(new QueryWrapper().eq("procurement_plan_id",inquiryVO.getInquiryId())); + + //是否需要请求接口 + boolean isRequestClient = false; + + //是否调用修改 + boolean isUpdate =false; + //判断如果为空 或者之前拒绝 重新插入 + if(null == projectEntrust || projectEntrust.getStatus().equals(ProjectCommonUtil.ENTRUS_STATUS_9)){ + isRequestClient = true; + }else{ + //如果为分派或者未同意 可以进行修改 + if(projectEntrust.getStatus().equals(ProjectCommonUtil.ENTRUS_STATUS_1) || + projectEntrust.getStatus().equals(ProjectCommonUtil.ENTRUS_STATUS_2)){ + isRequestClient = true; + isUpdate = true; + }else{ + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_ERROR_STATE.throwException(); + } + } + + if(isRequestClient){ + + //校验数据 + //checkPurpImplementSendVO(purpImplementSendVO); + //初始化委托单信息 + ProjectEntrustVO projectEntrustVO = assembleProjectEntrust(inquiryVO); + if(isUpdate){ + result = entrustService.updateProject(projectEntrustVO); + }else{ + result = entrustService.saveProject(projectEntrustVO); + } + + } + return result; + } + + /** + * 初始化委托单信息 + * @param inquiryVO 询价单信息 + * @return + */ + private ProjectEntrustVO assembleProjectEntrust(InquiryVO inquiryVO) { + + ProjectEntrustVO entrustVO = new ProjectEntrustVO(); + + //ID + entrustVO.setId(PropertyUtils.getSnowflakeId()); + //采购人/询价单位名称 + entrustVO.setPurchaser(inquiryVO.getInquiryOrg()); + //委托部门/委托部门 + entrustVO.setEntrustDepartment(inquiryVO.getEntrustDepartment()); + //委托部门名称/委托部门名称 + entrustVO.setEntrustDepartmentName(inquiryVO.getEntrustDepartmentName()); + //代理公司/代理机构编号 + entrustVO.setAgencyCompany(inquiryVO.getDelegationCode()); + //代理公司名称/代理机构名称 + entrustVO.setAgencyCompanyName(inquiryVO.getDelegationName()); + //项目名称/标题 + entrustVO.setProjectName(inquiryVO.getTitle()); + //采购类型 + entrustVO.setProcurementType(InquiryCommonUtil.BID_TYPE_MAP.get(inquiryVO.getBidType())); + //采购方式 + entrustVO.setProcurementMode(InquiryCommonUtil.BUY_WAY_MAP.get(inquiryVO.getBuyWay())); + + //采购经理 + entrustVO.setPurchasingManager(inquiryVO.getManagerBy()); + entrustVO.setPurchasingManagerName(inquiryVO.getManagerCn()); + entrustVO.setPurchasingManagerPhone(inquiryVO.getTelphone()); + + //起草人 + entrustVO.setDraftUser(inquiryVO.getManagerBy()); + //如果自主采购 采购经理就是项目经理 + if(StringUtils.equals(ProjectCommonUtil.ORGANIZATION_2,entrustVO.getOrganization())){ + entrustVO.setProjectManager(entrustVO.getPurchasingManager()); + entrustVO.setProjectManagerName(entrustVO.getPurchasingManagerName()); + entrustVO.setProjectManagerPhone(entrustVO.getPurchasingManagerPhone()); + entrustVO.setStatus(ProjectCommonUtil.ENTRUS_STATUS_3); + } + ProjectEntrustExpand expand = new ProjectEntrustExpand(); + expand.setId(PropertyUtils.getSnowflakeId()); + expand.setEntrustId(entrustVO.getId()); + expand.setInquiryVO(inquiryVO); + entrustVO.setProjectEntrustExpand(expand); + + return entrustVO; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index 34128f8..68be0cb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -143,7 +143,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl delete(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectExceptionService.delete(id)); } @@ -112,7 +112,7 @@ public class ProjectExceptionController{ */ @ApiOperation("项目异常生效") @PutMapping("/{id}") - public BaseResponse updateState(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse updateState(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectExceptionService.updateState(id)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectExceptionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectExceptionMapper.java index 770fd73..d491c3b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectExceptionMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectExceptionMapper.java @@ -28,5 +28,5 @@ public interface ProjectExceptionMapper extends IBaseMapper { * @param id 项目异常信息ID * @return */ - boolean deletePhysical(@Param(value = "id") Long id); + boolean deletePhysical(@Param(value = "id") String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectSectionExceptionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectSectionExceptionMapper.java index 92c2d4b..cbfc2c9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectSectionExceptionMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/ProjectSectionExceptionMapper.java @@ -13,5 +13,5 @@ public interface ProjectSectionExceptionMapper extends IBaseMapper - + @@ -24,7 +24,7 @@ - + update biz_project_exception set delete_flag="deleted" @@ -63,7 +63,7 @@ - + delete from biz_project_exception where id = #{id} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml index 700e5ce..795e747 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/dao/mapper/ProjectSectionExceptionMapper.xml @@ -4,7 +4,7 @@ - + @@ -18,7 +18,7 @@ - + update biz_project_section_exception set delete_flag="deleted" @@ -26,7 +26,7 @@ - + delete from biz_project_section_exception where exception_id = #{exceptionId} \ No newline at end of file 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 dbde6a0..3907097 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 @@ -33,7 +33,7 @@ public class ProjectException extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 项目ID @@ -41,14 +41,14 @@ public class ProjectException extends BaseEntity implements Serializable { @ApiModelProperty(value = "项目ID") @NotNull(message = "项目ID不能为空") @JsonSerialize(using = ToStringSerializer.class) - private Long projectId; + private String projectId; /** * 标段ID */ @ApiModelProperty(value = "标段ID") @JsonSerialize(using = ToStringSerializer.class) - private Long sectionId; + private String sectionId; /** * 项目异常类别 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectSectionException.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectSectionException.java index 5df7d66..7b5cf3e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectSectionException.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectSectionException.java @@ -31,21 +31,21 @@ public class ProjectSectionException extends BaseEntity implements Serializable */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 标段ID */ @ApiModelProperty(value = "标段ID") @JsonSerialize(using = ToStringSerializer.class) - private Long sectionId; + private String sectionId; /** * 异常处理ID */ @ApiModelProperty(value = "异常处理ID") @JsonSerialize(using = ToStringSerializer.class) - private Long exceptionId; + private String exceptionId; } 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 75f2be0..6c6049a 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 @@ -39,7 +39,7 @@ public interface IProjectExceptionService extends IBaseService * @param id 异常ID * @return 返回结果 */ - boolean delete(Long id); + boolean delete(String id); /** @@ -47,5 +47,5 @@ public interface IProjectExceptionService extends IBaseService * @param id 异常ID * @return 返回结果 */ - boolean updateState(Long id); + boolean updateState(String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectSectionExceptionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectSectionExceptionService.java index 9ad03dd..4057828 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectSectionExceptionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/IProjectSectionExceptionService.java @@ -17,5 +17,5 @@ public interface IProjectSectionExceptionService extends IBaseService().eq("id",id).eq("status",ProjectCommonUtil.SECTION_EXCEPTION_STATE_0)); @@ -158,7 +157,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionExceptionIds = sectionExceptionList.stream().map(ProjectSectionException::getSectionId).collect(Collectors.toList()); + List sectionExceptionIds = sectionExceptionList.stream().map(ProjectSectionException::getSectionId).collect(Collectors.toList()); UpdateWrapper sectionUpdateWrapper = new UpdateWrapper<>(); sectionUpdateWrapper.in("id",sectionExceptionIds); sectionUpdateWrapper.set("status",ProjectCommonUtil.SECTION_STATUS_9); @@ -228,7 +227,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionList) { + private void launchAgainProject(String projectId,List sectionList) { //查询项目信息 ProjectRecord projectRecord = projectRecordService.getById(projectId); @@ -239,26 +238,26 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionIds = sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList()); + List sectionIds = sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList()); //查询供应商信息 QueryWrapper supplierQueryWrapper = new QueryWrapper<>(); supplierQueryWrapper.in("section_id",sectionIds); List sectionSupplierList = sectionSupplierService.list(supplierQueryWrapper); //转换成map形式方便处理数据 - Map> sectionSupplierMap = sectionSupplierList.stream().collect(Collectors.groupingBy(SectionSupplier::getSectionId)); + Map> sectionSupplierMap = sectionSupplierList.stream().collect(Collectors.groupingBy(SectionSupplier::getSectionId)); //查询物资信息 QueryWrapper meMaterialQueryWrapper = new QueryWrapper<>(); meMaterialQueryWrapper.in("section_id",sectionIds); List sectionMaterialList = sectionMaterialService.list(meMaterialQueryWrapper); //转换成map形式方便处理数据 - Map> sectionMaterialMap = sectionMaterialList.stream().collect(Collectors.groupingBy(SectionMaterial::getSectionId)); + Map> sectionMaterialMap = sectionMaterialList.stream().collect(Collectors.groupingBy(SectionMaterial::getSectionId)); //最终要插入的数据结果 List sectionSupplierAddList = new ArrayList<>(); @@ -267,15 +266,15 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl projectSectionIds) { + private void abnormal(List projectSectionIds) { Integer resultCode = ebtpMallBidApi.abnormal(projectSectionIds).getCode(); if(resultCode != ResponseEnum.SUCCESS.getCode()){ @@ -380,8 +379,8 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionMaps = projectSectionService.getFlowList(projectId); + private void callInitialize(String projectId, boolean isReviewMethod) { + Map sectionMaps = projectSectionService.getFlowList(projectId); projectRecordService.initialize(projectId,isReviewMethod,sectionMaps); } @@ -420,7 +419,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl getSendMessageStatus(List voList) { List exceptionIds = voList.stream().filter(n -> ProjectCommonUtil.IS_SEND_MESSAGE_0 == n.getIsSendMessage()) - .map(ProjectExceptionVO::getId).map(n -> String.valueOf(n)).collect(Collectors.toList()); + .map(ProjectExceptionVO::getId).collect(Collectors.toList()); BaseResponse> bidResponse = ebtpMallBidApi.getAnnoStatus(exceptionIds); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_NOT_SECTION.customValidName(bidResponse.getMessage(), !bidResponse.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(bidResponse.getMessage(), !bidResponse.isSuccess()); Map> resultMap = bidResponse.getData().stream().collect(Collectors.groupingBy(AnnoVO::getCsAnnoId)); for(ProjectExceptionVO vo : voList){ if(ProjectCommonUtil.IS_SEND_MESSAGE_0 == vo.getIsSendMessage()){ - List annoVOList = resultMap.get(vo.getId().toString()); + List annoVOList = resultMap.get(vo.getId()); if(null != annoVOList && annoVOList.size() > 0){ vo.setSendMessageStatus(annoVOList.get(0).getStatus()); }else{ @@ -470,7 +469,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl exceptionIds = new ArrayList<>(); exceptionIds.add(String.valueOf(projectException.getId())); BaseResponse> bidResponse = ebtpMallBidApi.getAnnoStatus(exceptionIds); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_NOT_SECTION.customValidName(bidResponse.getMessage(), !bidResponse.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(bidResponse.getMessage(), !bidResponse.isSuccess()); List annoVOList = bidResponse.getData(); if(null != annoVOList && annoVOList.size() > 0){ if(ProjectCommonUtil.SEND_MESSAGE_STATUS_5 == annoVOList.get(0).getStatus()){ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectSectionExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectSectionExceptionServiceImpl.java index 8ac3883..783d735 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectSectionExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectSectionExceptionServiceImpl.java @@ -21,7 +21,7 @@ public class ProjectSectionExceptionServiceImpl extends BaseServiceImpl 0; } } 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 d74b4e4..8adaa6c 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 @@ -71,7 +71,7 @@ public class ProjectRecordController{ */ @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ ProjectRecord projectRecord = projectRecordService.getById(id); @@ -129,7 +129,7 @@ public class ProjectRecordController{ */ @ApiOperation("提交整体信息") @PostMapping("/submitProject/{id}") - public BaseResponse submitProject(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse submitProject(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectRecordService.submitProject(id)); } @@ -143,7 +143,7 @@ public class ProjectRecordController{ */ @ApiOperation("查询询价项目数据") @GetMapping("/getInquiryProjectRecord/{id}") - public BaseResponse getInquiryProjectRecord(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse getInquiryProjectRecord(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectRecordService.getInquiryProjectRecord(id)); } @@ -158,7 +158,7 @@ public class ProjectRecordController{ */ @ApiOperation("项目是否可以修改信息") @PostMapping("/getProjectIsUpdate/{id}") - public BaseResponse getProjectIsUpdate(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse getProjectIsUpdate(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectRecordService.getProjectIsUpdate(id)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/ProjectRecordMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/ProjectRecordMapper.java index 167dc17..997cc17 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/ProjectRecordMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/ProjectRecordMapper.java @@ -25,5 +25,5 @@ public interface ProjectRecordMapper extends IBaseMapper { * @param id 项目ID * @return 返回结果 */ - int deletePhysical(@Param(value = "id") Long id); + int deletePhysical(@Param(value = "id") String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml index 58b6f31..b568d27 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/dao/mapper/ProjectRecordMapper.xml @@ -4,7 +4,7 @@ - + @@ -67,7 +67,7 @@ - + update biz_project_record set delete_flag="deleted" @@ -106,7 +106,7 @@ - + delete from biz_project_record where id = #{id} \ No newline at end of file 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 99ec171..3bc51f1 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 @@ -35,21 +35,21 @@ public class ProjectRecord extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "主键") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 委托单ID */ @ApiModelProperty(value = "委托单ID") @JsonSerialize(using = ToStringSerializer.class) - private Long entrustId; + private String entrustId; /** * 父项目序号 */ @ApiModelProperty(value = "父项目序号") @JsonSerialize(using = ToStringSerializer.class) - private Long parentProjectId; + private String parentProjectId; /** * 项目流水号 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java index 75f9474..a28cc55 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecordVO.java @@ -58,6 +58,6 @@ public class ProjectRecordVO extends ProjectRecord implements Serializable { private List materialList; @ApiModelProperty(value = "项目ID集合") - private List selectIds; + private List selectIds; } 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 ebf0665..d6117f0 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 @@ -46,14 +46,14 @@ public interface IProjectRecordService extends IBaseService{ * @param entrustId 委托单ID * @return 返回结果 */ - boolean assent(Long entrustId); + boolean assent(String entrustId); /** * 删除项目建档信息 * @param id 项目建档ID * @return 返回结果 */ - boolean deletePhysical(Long id); + boolean deletePhysical(String id); /** @@ -68,7 +68,7 @@ public interface IProjectRecordService extends IBaseService{ * @param id 项目ID * @return 返回结果 */ - boolean submitProject(Long id); + boolean submitProject(String id); /** * 判断项目是否是资审项目 @@ -83,21 +83,21 @@ public interface IProjectRecordService extends IBaseService{ * @param isReviewMethod 是否资审项目 * @param sectionMaps 流程ID集合 */ - void initialize(Long id, boolean isReviewMethod, Map sectionMaps); + void initialize(String id, boolean isReviewMethod, Map sectionMaps); /** * 获取询价项目信息 * @param id 项目ID * @return 返回结果 */ - ProjectRecordVO getInquiryProjectRecord(Long id); + ProjectRecordVO getInquiryProjectRecord(String id); /** * 获取项目是否可以修改 * @param id 项目ID * @return */ - boolean getProjectIsUpdate(Long id); + boolean getProjectIsUpdate(String 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 e34bbe5..32fa017 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 @@ -185,7 +185,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionMaps = projectSectionService.getFlowList(id); + Map sectionMaps = projectSectionService.getFlowList(id); initialize(id, isReviewMethod, sectionMaps); - List sectionIds = new ArrayList<>(); + List sectionIds = new ArrayList<>(); //插入标段变更记录 sectionMaps.forEach((key,value) -> sectionIds.add(key)); @@ -282,7 +282,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionMaps) { + public void initialize(String id, boolean isReviewMethod, Map sectionMaps) { BaseResponse result = ebtpMallProcessApi.initialize(id,sectionMaps,isReviewMethod); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_ERROR.customValid(!result.isSuccess()); @@ -290,7 +290,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("project_id",id); @@ -378,7 +378,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionQueryWrapper = new QueryWrapper<>(); sectionQueryWrapper.eq("project_id",id); @@ -569,7 +569,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl assembleSupplier(Long projectId,Long sectionId,List projSuppRelVOList){ + private List assembleSupplier(String projectId,String sectionId,List projSuppRelVOList){ List resultList = new ArrayList<>(); if(null != projSuppRelVOList){ for(ProjSuppRelVO projSuppRelVO:projSuppRelVOList){ @@ -608,7 +608,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl assembleMaterial(Long projectId,Long sectionId,List purpMaterialVOList){ + private List assembleMaterial(String projectId,String sectionId,List purpMaterialVOList){ List resultList = new ArrayList<>(); if(null != purpMaterialVOList){ @@ -655,7 +655,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl 0; } @@ -667,7 +667,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl addList = new ArrayList<>(); ProjectRecord projectRecord = this.getById(projectRecordVO.getId()); - Long batchNumber = PropertyUtils.getSnowflakeId(); + String batchNumber = PropertyUtils.getSnowflakeId(); addList.add(new ProjectUpdateField(projectRecord.getId(),"app_manager_id",projectRecord.getAppManagerId(),batchNumber)); addList.add(new ProjectUpdateField(projectRecord.getId(),"app_manager_name",projectRecord.getAppManagerName(),batchNumber)); addList.add(new ProjectUpdateField(projectRecord.getId(),"app_manager_tel",projectRecord.getAppManagerTel(),batchNumber)); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java index 1bd9c3b..968ed7f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java @@ -73,7 +73,7 @@ public class ProjectReEvaluationController { */ @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id) { ProjectReEvaluation projectReEvaluation = projectReEvaluationService.getById(id); @@ -87,7 +87,7 @@ public class ProjectReEvaluationController { */ @ApiOperation("删除数据") @DeleteMapping("/{id}") - public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id){ return BaseResponse.success(projectReEvaluationService.delete(id)); } @@ -99,7 +99,7 @@ public class ProjectReEvaluationController { */ @ApiOperation("提交审批") @PostMapping("/submitForApproval/{id}") - public BaseResponse submitForApproval(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse submitForApproval(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(projectReEvaluationService.submitForApproval(id)); } @@ -152,7 +152,7 @@ public class ProjectReEvaluationController { */ @ApiOperation("校验是否可以添加信息") @GetMapping("/checkIsAdd/{sectionId}") - public BaseResponse checkIsAdd(@ApiParam(value = "标段ID", required = true) @PathVariable Long sectionId) { + public BaseResponse checkIsAdd(@ApiParam(value = "标段ID", required = true) @PathVariable String sectionId) { return BaseResponse.success(projectReEvaluationService.checkRepeatReEvaluation(sectionId).getAgainType()); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml index 613a0ba..5e33730 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -26,10 +26,10 @@ - + update biz_project_re_evaluation set delete_flag="deleted" - where ID=#{id,jdbcType=BIGINT} + where ID=#{id} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluation.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluation.java index 5654d94..e496cf1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluation.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluation.java @@ -28,19 +28,19 @@ public class ProjectReEvaluation extends BaseEntity implements Serializable { * 编号 */ @ApiModelProperty(value = "编号") - private Long id; + private String id; /** * 项目ID */ @ApiModelProperty(value = "项目ID") - private Long projectId; + private String projectId; /** * 标段ID */ @ApiModelProperty(value = "标段ID") - private Long sectionId; + private String sectionId; /** * 原因 @@ -80,7 +80,7 @@ public class ProjectReEvaluation extends BaseEntity implements Serializable { * 附件组ID */ @ApiModelProperty(value = "附件组ID") - private Long uploadFileId; + private String uploadFileId; /** * 状态 0 初始化 1 提交审批 2 审批完成 @@ -89,5 +89,5 @@ public class ProjectReEvaluation extends BaseEntity implements Serializable { private Integer status; @ApiModelProperty(value = "评审室ID") - private Long assessId; + private String assessId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java index d31236a..51b82a2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java @@ -33,7 +33,7 @@ public class ProjectReEvaluationVO extends ProjectReEvaluation implements Serial private List attachmentList; @ApiModelProperty(value = "评审室ID集合") - private List assessIds; + private List assessIds; @ApiModelProperty(value = "排除状态") private Integer isNotStatus; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java index be85e53..43549c5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/IProjectReEvaluationService.java @@ -44,14 +44,14 @@ public interface IProjectReEvaluationService extends IBaseService getQueryWrapper(ProjectReEvaluationVO vo){ QueryWrapper queryWrapper = new QueryWrapper<>(); - if(null != vo.getSectionId()){ + if(StringUtils.isNotBlank(vo.getSectionId())){ queryWrapper.eq(ProjectReEvaluationField.SECTION_ID,vo.getSectionId()); } - if(null != vo.getProjectId()){ + if(StringUtils.isNotBlank(vo.getProjectId())){ queryWrapper.eq(ProjectReEvaluationField.PROJECT_ID,vo.getProjectId()); } - if(null != vo.getAssessIds()){ + if(null != vo.getAssessIds() && vo.getAssessIds().size() > 0){ queryWrapper.in(ProjectReEvaluationField.ASSESS_ID,vo.getAssessIds()); } if(null != vo.getIsNotStatus()){ @@ -130,7 +130,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl().eq(ProjectReEvaluationField.ID,id) .eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_0)); @@ -169,7 +170,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(ProjectReEvaluationField.ID,id); updateWrapper.eq(ProjectReEvaluationField.STATUS, status); @@ -256,7 +257,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl().eq(ProjectReEvaluationField.SECTION_ID,sectionId). - eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_0). - or().eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1)); + QueryWrapper evaluationQueryWrapper = new QueryWrapper<>(); + evaluationQueryWrapper.eq(ProjectReEvaluationField.SECTION_ID,sectionId); + evaluationQueryWrapper.and(wrapper -> wrapper.eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_0).or().eq(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1)); + int count = this.count(evaluationQueryWrapper); if(count > 0){ ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_FIND_STATUS_ERROR.throwException(); } BizAgainSection againSection = calibrationApi.getReEvaluationBsByBsId(String.valueOf(sectionId)).getData(); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ASSESS_ROOM_NOT_FIND.customValid(null == againSection); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ASSESS_ROOM_NOT_FIND.customValidName(againSection.getMessage(),!againSection.getAgainType()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(againSection.getMessage(),!againSection.getAgainType()); ProjectExceptionEnum.FRAME_EXCEPTION_ASSESS_ROOM_NOT_FIND.customValid(StringUtils.isEmpty(againSection.getAssessId())); + + againSection.setProjectId(section.getProjectId()); return againSection; } @@ -299,7 +303,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl response = mallProcessApi.againinitialize(evaluation.getProjectId(), evaluation.getSectionId(), roomSort); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); AgainRoomVO againRoomVO = response.getData(); //复制招标信息 response = ebtpMallBidApi.copyDocument(againRoomVO); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); //复制投标信息 response = ebtpTenderApi.reviewAgain(response.getData(),evaluation.getAssessId()); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); //复制应答信息 response = ebtpRespsApi.copyTdocByAgainRoom(response.getData()); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_NOT_FIND.customValidName(response.getMessage(),!response.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); //复制评审设置信息 BaseResponse rsmsResponse = ebtpRsmsApi.again(response.getData()); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_NOT_FIND.customValidName(rsmsResponse.getMessage(),!rsmsResponse.isSuccess()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(rsmsResponse.getMessage(),!rsmsResponse.isSuccess()); //是否专家与上次一致 如果 是 进行复制 if(StringUtils.equals(ProjectCommonUtil.IS_AGREEMENT_YES,evaluation.getIsAgreement())){ - BaseResponse juryResponse = mallProcessApi.copyJury(evaluation.getAssessId(),againRoomVO.getRoomId()); - ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RE_EVAL_NOT_FIND.customValidName(juryResponse.getMessage(),!juryResponse.isSuccess()); + BaseResponse juryResponse = ebtpRsmsApi.copyJury(evaluation.getAssessId(),againRoomVO.getRoomId()); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(juryResponse.getMessage(),!juryResponse.isSuccess()); } + sectionService.calibrationToEvaluation(evaluation.getSectionId()); } @@ -344,8 +349,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl assembleReEvaluation(List resultList) { if (null != resultList) { - List businessFileIdList = resultList.stream().map(ProjectReEvaluationVO::getUploadFileId).collect(Collectors.toList()); - Optional result = attachmentClient.findByBusinessId(JsonUtils.jsonToList(businessFileIdList, String.class)); + List businessFileIdList = resultList.stream().map(ProjectReEvaluationVO::getUploadFileId).collect(Collectors.toList()); + Optional result = attachmentClient.findByBusinessId(businessFileIdList); for (ProjectReEvaluationVO vo : resultList) { List ossFileList = null; 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 1f96827..b2b1d3a 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 @@ -71,7 +71,7 @@ public class ProjectSectionController{ */ @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ ProjectSection projectSection = projectSectionService.getById(id); @@ -115,7 +115,7 @@ public class ProjectSectionController{ */ @ApiOperation("项目标段信息查询数据") @PostMapping("/selectListByIds") - public BaseResponse> selectListByIds(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionIds") List sectionIds){ + public BaseResponse> selectListByIds(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionIds") List sectionIds){ List result = projectSectionService.selectBatchIds(sectionIds); @@ -124,124 +124,136 @@ public class ProjectSectionController{ /** * 标段修改业务模块 招标到资审投标 - * @param sectionIds 标段ID集合 + * @param sectionIds 项目标段ID集合 * @return 返回结果 */ @ApiOperation("标段修改业务模块 资审招标到资审投标") @PostMapping("/qualificationBidToTender") - public BaseResponse qualificationBidToTender(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionIds") List sectionIds){ + public BaseResponse qualificationBidToTender(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionIds") List sectionIds){ return BaseResponse.success(projectSectionService.qualificationBidToTender(sectionIds)); } /** * 标段修改业务模块 资审投标到资审开标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 资审投标到资审开标") @PostMapping("/qualificationTenderToOpening") - public BaseResponse qualificationTenderToOpening(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse qualificationTenderToOpening(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.qualificationTenderToOpening(sectionId)); } /** * 标段修改业务模块 资审开标到资审评标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 资审开标到资审评标") @PostMapping("/qualificationOpeningToEvaluation") - public BaseResponse qualificationOpeningToEvaluation(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse qualificationOpeningToEvaluation(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.qualificationOpeningToEvaluation(sectionId)); } /** * 标段修改业务模块 资审评标到资审定标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 资审评标到资审定标") @PostMapping("/qualificationEvaluationToCalibration") - public BaseResponse qualificationEvaluationToCalibration(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse qualificationEvaluationToCalibration(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.qualificationEvaluationToCalibration(sectionId)); } /** * 标段修改业务模块 资审定标到招标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 资审定标到招标") @PostMapping("/qualificationEvaluationToBid") - public BaseResponse qualificationEvaluationToBid(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse qualificationEvaluationToBid(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.qualificationEvaluationToBid(sectionId)); } /** * 标段修改业务模块 招标到投标 - * @param sectionIds 标段ID集合 + * @param sectionIds 标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 招标到投标") @PostMapping("/bidToTender") - public BaseResponse bidToTender(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionIds") List sectionIds){ + public BaseResponse bidToTender(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionIds") List sectionIds){ return BaseResponse.success(projectSectionService.bidToTender(sectionIds)); } /** * 标段修改业务模块 投标到开标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 投标到开标") @PostMapping("/tenderToOpening") - public BaseResponse tenderToOpening(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse tenderToOpening(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.tenderToOpening(sectionId)); } /** * 标段修改业务模块 开标到评标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 开标到评标") @PostMapping("/openingToEvaluation") - public BaseResponse openingToEvaluation(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse openingToEvaluation(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.openingToEvaluation(sectionId)); } /** * 标段修改业务模块 评标到定标 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 评标到定标") @PostMapping("/evaluationToCalibration") - public BaseResponse evaluationToCalibration(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse evaluationToCalibration(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.evaluationToCalibration(sectionId)); } /** * 标段修改业务模块 定标到归档 - * @param sectionId 标段ID集合 + * @param sectionId 项目标段ID * @return 返回结果 */ @ApiOperation("标段修改业务模块 定标到归档") @PostMapping("/calibrationToArchive") - public BaseResponse calibrationToArchive(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") Long sectionId){ + public BaseResponse calibrationToArchive(@ApiParam(value = "项目标段ID", required = true) @RequestParam(name = "sectionId") String sectionId){ return BaseResponse.success(projectSectionService.calibrationToArchive(sectionId)); } + /** + * 标段修改业务模块 定标到评标 + * @param sectionId 项目标段ID + * @return 返回结果 + */ + @ApiOperation("标段修改业务模块 定标到评标") + @PostMapping("/calibrationToEvaluation") + public BaseResponse calibrationToEvaluation(@ApiParam(value = "项目标段ID集合", required = true) @RequestParam(name = "sectionId") String sectionId){ + + return BaseResponse.success(projectSectionService.calibrationToEvaluation(sectionId)); + } + /** * 项目标段信息查询数据（项目标段和项目拼装数据） @@ -268,8 +280,8 @@ public class ProjectSectionController{ */ @ApiOperation("项目异常信息查询处理数据") @GetMapping("/selectEditSection") - public BaseResponse> selectEditSection(@ApiParam(value = "项目ID", required = true) @RequestParam(name = "projectId") Long projectId, - @ApiParam(value = "项目异常信息ID") @RequestParam(required = false,name = "exceptionId") Long exceptionId, + public BaseResponse> selectEditSection(@ApiParam(value = "项目ID", required = true) @RequestParam(name = "projectId") String projectId, + @ApiParam(value = "项目异常信息ID") @RequestParam(required = false,name = "exceptionId") String exceptionId, @ApiParam(value = "查看类型", required = true) @RequestParam(name = "type") String type){ List result = projectSectionService.selectEditSection(projectId,exceptionId,type); @@ -286,7 +298,7 @@ public class ProjectSectionController{ */ @ApiOperation("根据方案ID获取项目标段流程信息") @PostMapping("/getProjectFlowByPlanId") - public BaseResponse getProjectFlowByPlanId(@ApiParam(value = "标段方案ID", required = true) @RequestParam(name = "planId") Long planId){ + public BaseResponse getProjectFlowByPlanId(@ApiParam(value = "标段方案ID", required = true) @RequestParam(name = "planId") String planId){ return BaseResponse.success(projectSectionService.getProjectFlowByPlanId(planId)); } 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 5b52375..d2fad5f 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 @@ -21,14 +21,14 @@ public interface ProjectSectionMapper extends IBaseMapper { * @param projectId 项目ID * @return 返回结果 */ - int deleteByProjectId(@Param(value = "projectId") Long projectId); + int deleteByProjectId(@Param(value = "projectId") String projectId); /** * 查询标段和流程 * @param projectId 项目ID * @return 返回结果 */ - List getSectionFlowList(@Param(value = "projectId") Long projectId); + List getSectionFlowList(@Param(value = "projectId") String projectId); /** * 查询标段拼装集合信息 @@ -42,7 +42,7 @@ public interface ProjectSectionMapper extends IBaseMapper { * @param projectId 项目ID * @return 返回结果 */ - List selectEditSectionBySave(@Param(value = "projectId") Long projectId); + List selectEditSectionBySave(@Param(value = "projectId") String projectId); /** * 查询异常信息 @@ -50,7 +50,7 @@ public interface ProjectSectionMapper extends IBaseMapper { * @param exceptionId 异常ID * @return 返回结果 */ - List selectEditSectionByUpdate(@Param(value = "projectId") Long projectId, @Param(value = "exceptionId") Long exceptionId); + List selectEditSectionByUpdate(@Param(value = "projectId") String projectId, @Param(value = "exceptionId") String exceptionId); /** * 查询异常信息 @@ -58,6 +58,6 @@ public interface ProjectSectionMapper extends IBaseMapper { * @param exceptionId 异常ID * @return 返回结果 */ - List selectEditSectionBySelect(@Param(value = "projectId") Long projectId, @Param(value = "exceptionId") Long exceptionId); + List selectEditSectionBySelect(@Param(value = "projectId") String projectId, @Param(value = "exceptionId") String exceptionId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionFlowMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionFlowMapper.xml index 5737404..eb79daa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionFlowMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionFlowMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -19,7 +19,7 @@ - + update biz_project_section_flow set delete_flag="deleted" 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 32d73a2..14a055b 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 @@ -4,8 +4,8 @@ - - + + @@ -35,7 +35,8 @@ - + + @@ -48,8 +49,8 @@ - - + + @@ -79,8 +80,8 @@ - - + + @@ -94,12 +95,12 @@ - + update biz_project_section set delete_flag="deleted" where ID=#{id} - + delete from biz_project_section where project_id = #{projectId} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java index 21259bc..218f9a4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSection.java @@ -37,14 +37,14 @@ public class ProjectSection extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "主键") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 招标项目表主键 */ @ApiModelProperty(value = "招标项目表主键") @JsonSerialize(using = ToStringSerializer.class) - private Long projectId; + private String projectId; /** * 标段包业务编号：招标项目业务编号/1 @@ -224,7 +224,7 @@ public class ProjectSection extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "父标包序号，当重新招标或二次公告、变更采购方式时用于记录原先的包序号") @JsonSerialize(using = ToStringSerializer.class) - private Long parentSectionId; + private String parentSectionId; /** * 标段项目方案ID diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionFlow.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionFlow.java index 7677501..34f3add 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionFlow.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionFlow.java @@ -27,13 +27,13 @@ public class ProjectSectionFlow extends BaseEntity implements Serializable { * 编号 */ @ApiModelProperty(value = "编号") - private Long id; + private String id; /** * 标段ID */ @ApiModelProperty(value = "标段ID") - private Long sectionId; + private String sectionId; /** * 当前业务模块 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java index 1a6e913..82fd715 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java @@ -41,7 +41,7 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { */ @ApiModelProperty(value = "流程ID") @JsonSerialize(using = ToStringSerializer.class) - private Long flowId; + private String flowId; /** * 招标方式字典编号 @@ -59,7 +59,7 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { * 查询ID集合 */ @ApiModelProperty(value = "查询ID集合") - private List sectionIds; + private List sectionIds; /** * 资格审查方式|招募方式(评审次数)|竞争性谈判（参与方式） @@ -72,5 +72,5 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { */ @ApiModelProperty(value = "候审流程ID") @JsonSerialize(using = ToStringSerializer.class) - private Long qualFlowId; + private String qualFlowId; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionFlowService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionFlowService.java index 7334904..4247b58 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionFlowService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionFlowService.java @@ -21,5 +21,5 @@ public interface IProjectSectionFlowService extends IBaseService sectionIds, Integer currentBusinessModule, Integer newBusinessModule); + boolean saveSectionList(List sectionIds, Integer currentBusinessModule, Integer newBusinessModule); } 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 0089018..fbf75b9 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 @@ -23,7 +23,7 @@ public interface IProjectSectionService extends IBaseService{ * @param projectId 项目ID * @return 返回结果 */ - boolean deleteByProjectId(Long projectId); + boolean deleteByProjectId(String projectId); /** * 获取供应商信息 @@ -51,84 +51,91 @@ public interface IProjectSectionService extends IBaseService{ * @param sectionIds 查询标段ID集合 * @return */ - List selectBatchIds(List sectionIds); + List selectBatchIds(List sectionIds); /** * 查询标段集合 * @param projectId 项目ID * @return 返回map<标段ID,流程ID> */ - Map getFlowList(Long projectId); + Map getFlowList(String projectId); /** * 标段修改业务模块 资审招标到资审投标 * @param sectionIds 标段ID集合 * @return 返回结果 */ - boolean qualificationBidToTender(List sectionIds); + boolean qualificationBidToTender(List sectionIds); /** * 标段修改业务模块 资审投标到资审开标 * @param sectionId 标段ID * @return 返回结果 */ - boolean qualificationTenderToOpening(Long sectionId); + boolean qualificationTenderToOpening(String sectionId); /** * 标段修改业务模块 资审开标到资审评标 * @param sectionId 标段ID * @return 返回结果 */ - boolean qualificationOpeningToEvaluation(Long sectionId); + boolean qualificationOpeningToEvaluation(String sectionId); /** * 标段修改业务模块 资审评标到资审定标 * @param sectionId 标段ID * @return 返回结果 */ - boolean qualificationEvaluationToCalibration(Long sectionId); + boolean qualificationEvaluationToCalibration(String sectionId); /** * 标段修改业务模块 资审定标到招标 * @param sectionId 标段ID * @return 返回结果 */ - boolean qualificationEvaluationToBid(Long sectionId); + boolean qualificationEvaluationToBid(String sectionId); /** * 标段修改业务模块 招标到投标 * @param sectionIds 标段ID集合 * @return 返回结果 */ - boolean bidToTender(List sectionIds); + boolean bidToTender(List sectionIds); /** * 标段修改业务模块 投标到开标 * @param sectionId 标段ID * @return 返回结果 */ - boolean tenderToOpening(Long sectionId); + boolean tenderToOpening(String sectionId); /** * 标段修改业务模块 开标到评标 * @param sectionId 标段ID * @return 返回结果 */ - boolean openingToEvaluation(Long sectionId); + boolean openingToEvaluation(String sectionId); /** * 标段修改业务模块 评标到定标 * @param sectionId 标段ID * @return 返回结果 */ - boolean evaluationToCalibration(Long sectionId); + boolean evaluationToCalibration(String sectionId); /** * 标段修改业务模块 定标到归档 * @param sectionId 标段ID集合 * @return 返回结果 */ - boolean calibrationToArchive(Long sectionId); + boolean calibrationToArchive(String sectionId); + + /** + * 标段修改业务模块 定标到评标 + * @param sectionId 项目标段ID + * @return 返回结果 + */ + boolean calibrationToEvaluation(String sectionId); /** * 获取集合信息 @@ -144,12 +151,13 @@ public interface IProjectSectionService extends IBaseService{ * @param type 查看类型 * @return 返回结果 */ - List selectEditSection(Long projectId, Long exceptionId, String type); + List selectEditSection(String projectId, String exceptionId, String type); /** * 查询标段流程信息 * @param planId 方案ID * @return */ - SectionFlowVO getProjectFlowByPlanId(Long planId); + SectionFlowVO getProjectFlowByPlanId(String planId); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionFlowServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionFlowServiceImpl.java index be8055e..e829229 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionFlowServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionFlowServiceImpl.java @@ -21,11 +21,11 @@ public class ProjectSectionFlowServiceImpl extends BaseServiceImpl sectionIds,Integer currentBusinessModule,Integer newBusinessModule) { + public boolean saveSectionList(List sectionIds,Integer currentBusinessModule,Integer newBusinessModule) { List saveList = new ArrayList<>(); - for (Long sectionId :sectionIds){ + for (String sectionId :sectionIds){ ProjectSectionFlow sectionFlow = new ProjectSectionFlow(); sectionFlow.setId(PropertyUtils.getSnowflakeId()); sectionFlow.setSectionId(sectionId); 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 8d7106b..05eed5e 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 @@ -71,7 +71,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl 0; } @@ -79,7 +79,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl(); //查询条件拼接 - if(null != projectSectionVO.getProjectId()){ + if(StringUtils.isNotBlank(projectSectionVO.getProjectId())){ query.eq("project_id",projectSectionVO.getProjectId()); } @@ -141,22 +141,22 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectBatchIds(List sectionIds) { + public List selectBatchIds(List sectionIds) { return projectSectionMapper.selectBatchIds(sectionIds); } @Override - public Map getFlowList(Long projectId) { + public Map getFlowList(String projectId) { List sectionVOList = this.getSectionFlowList(projectId); - Map result = sectionVOList.stream().collect(Collectors.toMap(ProjectSectionVO::getId,ProjectSectionVO::getFlowId)); + Map result = sectionVOList.stream().collect(Collectors.toMap(ProjectSectionVO::getId,ProjectSectionVO::getFlowId)); return result; } @Override @Transactional(rollbackFor = Exception.class) - public boolean qualificationBidToTender(List sectionIds) { + public boolean qualificationBidToTender(List sectionIds) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.in("id",sectionIds); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_2); @@ -173,7 +173,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); @@ -192,7 +192,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); @@ -210,7 +210,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_5); @@ -227,7 +227,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_6); @@ -250,7 +250,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionMaps = new LinkedHashMap<>(); + Map sectionMaps = new LinkedHashMap<>(); sectionMaps.put(section.getId(),chooseProcess.getQualFlowId()); boolean isReviewMethod = false; @@ -261,7 +261,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl sectionIds) { + public boolean bidToTender(List sectionIds) { log.info("xid:"+ RootContext.getXID()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -280,7 +280,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_8); @@ -297,7 +297,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_9); @@ -314,7 +314,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_10); @@ -331,7 +331,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",sectionId); updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_11); @@ -346,13 +346,29 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",sectionId); + updateWrapper.eq("business_module", ProjectCommonUtil.BUSINESS_MODULE_11); + updateWrapper.set("business_module",ProjectCommonUtil.BUSINESS_MODULE_10); + + boolean result = this.update(updateWrapper); + + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_UPDATE_MODULE.customValid(!result); + + saveSectionFlow(sectionId,ProjectCommonUtil.BUSINESS_MODULE_11,ProjectCommonUtil.BUSINESS_MODULE_10); + + return result; + } + @Override public List selectAllBatchIds(ProjectSectionVO projectSection) { return projectSectionMapper.selectAllBatchIds(projectSection); } @Override - public List selectEditSection(Long projectId, Long exceptionId, String type) { + public List selectEditSection(String projectId, String exceptionId, String type) { List result = null; @@ -367,9 +383,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl query = getQueryWrapper(sectionVO); ProjectSection section = this.list(query).get(0); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_NOT_FIND.customValid(null == section); @@ -405,7 +421,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl getSectionFlowList(Long projectId){ + private List getSectionFlowList(String projectId){ return projectSectionMapper.getSectionFlowList(projectId); } - private List selectEditSectionBySave(Long projectId){ + private List selectEditSectionBySave(String projectId){ //项目异常新增时查看 return projectSectionMapper.selectEditSectionBySave(projectId); } - private List selectEditSectionByUpdate(Long projectId,Long exceptionId){ + private List selectEditSectionByUpdate(String projectId,String exceptionId){ //项目异常修改时查看 return projectSectionMapper.selectEditSectionByUpdate(projectId,exceptionId); } - private List selectEditSectionBySelect(Long projectId,Long exceptionId){ + private List selectEditSectionBySelect(String projectId,String exceptionId){ //项目异常查看 return projectSectionMapper.selectEditSectionBySelect(projectId,exceptionId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/dao/mapper/ProjectUpdateFieldMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/dao/mapper/ProjectUpdateFieldMapper.xml index 03347c6..c8fa4aa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/dao/mapper/ProjectUpdateFieldMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/dao/mapper/ProjectUpdateFieldMapper.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + update biz_project_update_field set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/entity/ProjectUpdateField.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/entity/ProjectUpdateField.java index ed7e629..5ae38ef 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/entity/ProjectUpdateField.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectupdatefield/entity/ProjectUpdateField.java @@ -29,7 +29,7 @@ public class ProjectUpdateField extends BaseEntity implements Serializable { } - public ProjectUpdateField(long projectId,String fieldName,String fieldValue,long batchNumber){ + public ProjectUpdateField(String projectId,String fieldName,String fieldValue,String batchNumber){ this.projectId = projectId; this.fieldName = fieldName; this.fieldValue = fieldValue; @@ -41,14 +41,14 @@ public class ProjectUpdateField extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "编号") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 项目编号 */ @ApiModelProperty(value = "项目编号") @JsonSerialize(using = ToStringSerializer.class) - private Long projectId; + private String projectId; /** * 字段名称 @@ -66,6 +66,6 @@ public class ProjectUpdateField extends BaseEntity implements Serializable { * 批次号 */ @ApiModelProperty(value = "批次号") - private Long batchNumber; + private String batchNumber; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/SectionMaterialMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/SectionMaterialMapper.java index d504a33..591fe31 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/SectionMaterialMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/SectionMaterialMapper.java @@ -18,5 +18,5 @@ public interface SectionMaterialMapper extends IBaseMapper { * @param projectId 项目ID * @return 返回结果 */ - int deleteByProjectId(@Param(value = "projectId") Long projectId); + int deleteByProjectId(@Param(value = "projectId") String projectId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/mapper/SectionMaterialMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/mapper/SectionMaterialMapper.xml index 3aacbd6..98f2e91 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/mapper/SectionMaterialMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/dao/mapper/SectionMaterialMapper.xml @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + update biz_section_material set delete_flag="deleted" @@ -38,7 +38,7 @@ - + delete from biz_section_material where project_id = #{projectId} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterial.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterial.java index 788a9c4..d3ed350 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterial.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/entity/SectionMaterial.java @@ -31,21 +31,21 @@ public class SectionMaterial extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "id") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 项目ID */ @ApiModelProperty(value = "项目ID") @JsonSerialize(using = ToStringSerializer.class) - private Long projectId; + private String projectId; /** * 分包标段id */ @ApiModelProperty(value = "分包标段id") @JsonSerialize(using = ToStringSerializer.class) - private Long sectionId; + private String sectionId; /** * 需求单名称 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java index a68e85d..cca3cd3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/ISectionMaterialService.java @@ -28,7 +28,7 @@ public interface ISectionMaterialService extends IBaseService{ * @param projectId 项目ID * @return 返回结果 */ - boolean deleteByProjectId(Long projectId); + boolean deleteByProjectId(String projectId); /** * 获取供应商信息 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java index 15d84ff..439b395 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionmaterial/service/impl/SectionMaterialServiceImpl.java @@ -30,7 +30,7 @@ public class SectionMaterialServiceImpl extends BaseServiceImpl 0; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/controller/SectionSupplierController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/controller/SectionSupplierController.java index b16ab6c..b39d3dd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/controller/SectionSupplierController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/controller/SectionSupplierController.java @@ -69,7 +69,7 @@ public class SectionSupplierController{ */ @ApiOperation("查询数据") @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ SectionSupplier sectionSupplierVO = sectionSupplierService.getById(id); @@ -86,7 +86,7 @@ public class SectionSupplierController{ */ @ApiOperation("查询数据") @GetMapping("getList/{sectionId}") - public BaseResponse getListBySectionId(@ApiParam(value = "标段ID", required = true) @PathVariable Long sectionId){ + public BaseResponse getListBySectionId(@ApiParam(value = "标段ID", required = true) @PathVariable String sectionId){ SectionSupplierVO sectionSupplierVO = new SectionSupplierVO(); sectionSupplierVO.setSectionId(sectionId); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/SectionSupplierMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/SectionSupplierMapper.java index 4c01b3a..ec57e1c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/SectionSupplierMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/SectionSupplierMapper.java @@ -18,5 +18,5 @@ public interface SectionSupplierMapper extends IBaseMapper { * @param projectId 项目ID * @return 返回结果 */ - int deleteByProjectId(@Param(value = "projectId") Long projectId); + int deleteByProjectId(@Param(value = "projectId") String projectId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/mapper/SectionSupplierMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/mapper/SectionSupplierMapper.xml index c8aebc9..87e062a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/mapper/SectionSupplierMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/dao/mapper/SectionSupplierMapper.xml @@ -4,13 +4,13 @@ - - - + + + - + @@ -23,7 +23,7 @@ - + update biz_section_supplier set delete_flag="deleted" @@ -31,7 +31,7 @@ - + delete from biz_section_supplier where project_id = #{projectId} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/entity/SectionSupplier.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/entity/SectionSupplier.java index 12ac867..5fe9501 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/entity/SectionSupplier.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/entity/SectionSupplier.java @@ -30,21 +30,21 @@ public class SectionSupplier extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "id") @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; /** * 项目ID */ @ApiModelProperty(value = "项目ID") @JsonSerialize(using = ToStringSerializer.class) - private Long projectId; + private String projectId; /** * 分包标段id */ @ApiModelProperty(value = "分包标段id") @JsonSerialize(using = ToStringSerializer.class) - private Long sectionId; + private String sectionId; /** * 供应商ID @@ -65,7 +65,7 @@ public class SectionSupplier extends BaseEntity implements Serializable { private String supplierName; @ApiModelProperty(value = "供应商联系人id") - private Long suppLinkManId; + private String suppLinkManId; @ApiModelProperty(value = "供应商联系人姓名") private String suppLinkManName; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/ISectionSupplierService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/ISectionSupplierService.java index f70b606..9cb777b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/ISectionSupplierService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/ISectionSupplierService.java @@ -28,7 +28,7 @@ public interface ISectionSupplierService extends IBaseService{ * @param projectId 项目ID * @return 返回结果 */ - boolean deleteByProjectId(Long projectId); + boolean deleteByProjectId(String projectId); /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/impl/SectionSupplierServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/impl/SectionSupplierServiceImpl.java index 6f458f1..d4d7547 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/impl/SectionSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/sectionsupplier/service/impl/SectionSupplierServiceImpl.java @@ -32,7 +32,7 @@ public class SectionSupplierServiceImpl extends BaseServiceImpl 1; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6dec79a..8b1a038 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -162,18 +162,6 @@ mybatis-plus: logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 type-aliases-package: com.chinaunicom.mall.ebtp.project - -# --------------feign ------------ -feign: - httpclient: - enabled: false - okhttp: - enabled: true - client: - config: - default: - connect-timeout: 20000 - read-timeout: 20000 hystrix: command: @@ -205,3 +193,13 @@ mconfig: service-name-wfap: wfap #重新评审 流程微服务 wfSectionNo: '001' wfSectionName: 采购方案审批 + +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 8cc5d74..7ccac42 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -2,10 +2,11 @@ server: port: 18012 servlet: context-path: / +# --------------seata ------------ seata: enabled: true - application-id: biz-service-ebtp-project - tx-service-group: biz-service-ebtp-project-group + application-id: ${spring.application.name} + tx-service-group: ${spring.application.name}-group enable-auto-data-source-proxy: true use-jdk-proxy: false service: @@ -18,6 +19,7 @@ seata: eureka: weight: 1 service-url: http://${eureka.instance.hostname}:8761/eureka/ + spring: aop: auto: true #开启spring的aop配置 @@ -147,7 +149,7 @@ eureka: instance: # eureka 注册路径地址 prefer-ip-address: true - hostname: localhost + hostname: 125.32.114.204 ip-address: ${eureka.instance.hostname} instance-id: ${eureka.instance.hostname}:${server.port} client: diff --git a/src/main/resources/file.conf b/src/main/resources/file.conf index d591bab..f0bc2a6 100644 --- a/src/main/resources/file.conf +++ b/src/main/resources/file.conf @@ -28,11 +28,12 @@ transport { serialization = "seata" compressor = "none" } + service { #transaction service group mapping - vgroupMapping.biz-service-ebtp-expenses-fescar-service-group = "default" + vgroupMapping.biz-service-ebtp-project-fescar-service-group = "default" #only support when registry.type=file, please don't set multiple addresses - default.grouplist = "127.0.0.1:8091" + default.grouplist = "10.242.31.158:18035" #degrade, current not support enableDegrade = false #disable seata diff --git a/src/main/resources/registry.conf b/src/main/resources/registry.conf index bd724ed..0a4eb4c 100644 --- a/src/main/resources/registry.conf +++ b/src/main/resources/registry.conf @@ -1,79 +1,15 @@ registry { - # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa - type = "eureka" - - nacos { - application = "seata-server" - serverAddr = "localhost" - namespace = "" - username = "" - password = "" - } - eureka { - serviceUrl = "http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka" - weight = "1" - } - redis { - serverAddr = "localhost:6379" - db = "0" - password = "" - timeout = "0" - } - zk { - serverAddr = "127.0.0.1:2181" - sessionTimeout = 6000 - connectTimeout = 2000 - username = "" - password = "" - } - consul { - serverAddr = "127.0.0.1:8500" - } - etcd3 { - serverAddr = "http://localhost:2379" - } - sofa { - serverAddr = "127.0.0.1:9603" - region = "DEFAULT_ZONE" - datacenter = "DefaultDataCenter" - group = "SEATA_GROUP" - addressWaitTime = "3000" - } + type = "file" + file { name = "file.conf" } } config { - # file、nacos 、apollo、zk、consul、etcd3、springCloudConfig type = "file" - - nacos { - serverAddr = "localhost" - namespace = "" - group = "SEATA_GROUP" - username = "" - password = "" - } - consul { - serverAddr = "127.0.0.1:8500" - } - apollo { - appId = "seata-server" - apolloMeta = "http://192.168.1.204:8801" - namespace = "application" - } - zk { - serverAddr = "127.0.0.1:2181" - sessionTimeout = 6000 - connectTimeout = 2000 - username = "" - password = "" - } - etcd3 { - serverAddr = "http://localhost:2379" - } + file { name = "file.conf" } -} +} \ No newline at end of file diff --git a/src/main/resources/seata.conf b/src/main/resources/seata.conf deleted file mode 100644 index e78134f..0000000 --- a/src/main/resources/seata.conf +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -client { - application.id = biz-service-ebtp-process - transaction.service.group = biz-service-ebtp-process-group -}