From 7262056632afb2f8b8a8bde8c5e47c96795d541b Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Fri, 8 Mar 2024 15:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=9D=87=E8=A1=A1=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnbalancedQuotationProjectMapper.xml | 3 +++ .../UnbalancedQuotationProjectServiceImpl.java | 7 +++---- .../vo/UnbalancedQuotationProjectVO.java | 18 ++++++++++++++++++ src/main/resources/application-local.yml | 9 ++++++++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/dao/mapper/UnbalancedQuotationProjectMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/dao/mapper/UnbalancedQuotationProjectMapper.xml index b628369..b3d5d7a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/dao/mapper/UnbalancedQuotationProjectMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/dao/mapper/UnbalancedQuotationProjectMapper.xml @@ -40,6 +40,9 @@ SELECT distinct room.id , + room.tp_id projectId, + room.section_id sectionId, + room.id assessRoomId, xm.project_name projectName, bd.bid_sect_name bidSectName, xm.ebp_project_number ebpProjectNumber, diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/service/impl/UnbalancedQuotationProjectServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/service/impl/UnbalancedQuotationProjectServiceImpl.java index 4f9ecbb..b86f258 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/service/impl/UnbalancedQuotationProjectServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/service/impl/UnbalancedQuotationProjectServiceImpl.java @@ -8,10 +8,9 @@ import com.chinaunicom.mall.ebtp.project.unbalancedQuotation.dao.UnbalancedQuota import com.chinaunicom.mall.ebtp.project.unbalancedQuotation.entity.UnbalancedQuotationProject; import com.chinaunicom.mall.ebtp.project.unbalancedQuotation.service.IUnbalancedQuotationProjectService; import com.chinaunicom.mall.ebtp.project.unbalancedQuotation.vo.UnbalancedQuotationProjectVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - /** * 对数据表 biz_unbalanced_quotation_project 操作的 serviceImpl * @auto.generated @@ -20,9 +19,9 @@ import javax.annotation.Resource; @Service public class UnbalancedQuotationProjectServiceImpl extends ServiceImpl implements IUnbalancedQuotationProjectService { - @Resource + @Autowired private UnbalancedQuotationProjectMapper projectMapper; - @Resource + @Autowired private IBaseCacheUserService userService; @Override diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/vo/UnbalancedQuotationProjectVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/vo/UnbalancedQuotationProjectVO.java index 369a475..9352a07 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/vo/UnbalancedQuotationProjectVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/unbalancedQuotation/vo/UnbalancedQuotationProjectVO.java @@ -39,6 +39,24 @@ public class UnbalancedQuotationProjectVO extends BaseEntity implements Serializ @ApiModelProperty(value = "主键") @JsonSerialize(using = ToStringSerializer.class) private String id; + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private String projectId; + + /** + * 分包标段id + */ + @ApiModelProperty(value = "分包标段id") + private String sectionId; + + /** + * + */ + @ApiModelProperty(value = "") + private String assessRoomId; + /** * 招标项目名称 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 39838f3..a8ec12e 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -115,6 +115,13 @@ mybatis-plus: logic-not-delete-value: 1 # 逻辑未删除值 +check: + porject: + name-value: 33333 + num-value: 33333 + length: 2000 + checkBoolen: false + hystrix: command: default: @@ -177,8 +184,8 @@ management: mongo: enabled: false - client: + notification-url: http://10.242.31.158:8806/auth/sso/cloudPortal?return=https://uat-uscm.chinaunicom.cn:18022/redirect?page=subscription?id={{id}}&source=supplier clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 allow: apis: