From e62a21cf296de946dd5a2b97676bc4c267d67ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 2 Mar 2021 16:38:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizbidshared/entity/BizBidShared.java | 6 +++++ .../service/impl/BizBidSharedServiceImpl.java | 24 +++++++++++++++++-- src/main/resources/application-test.yml | 1 + 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java index 4463214..ee8f73a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java @@ -72,4 +72,10 @@ public class BizBidShared extends BaseEntity implements Serializable { @ApiModelProperty("逻辑删除，normal表示正常（默认），deleted表示删除") private String deleteFlag; + @TableField(exist = false) + private String fileName; + + @TableField(exist = false) + private String fileSuffix; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java index 2a0dde6..ef694e6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java @@ -1,19 +1,27 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.service.impl; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api.AttachmentClient; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.extend.bizbidshared.dao.BizBidSharedMapper; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO; import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + /** * 对数据表 biz_bid_shared 操作的 serviceImpl * @@ -22,6 +30,8 @@ import org.springframework.stereotype.Service; @Service public class BizBidSharedServiceImpl extends BaseServiceImpl implements IBizBidSharedService { + @Autowired + private AttachmentClient attachmentClient; @Override public IPage getList(BizBidSharedVO bizBidNotice) { @@ -29,7 +39,17 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); + Page page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); + + List collect = page.getRecords().stream().map(BizBidShared::getSharedFile).distinct().collect(Collectors.toList()); + Optional optional = attachmentClient.findByBusinessId(collect); + optional.ifPresent(o -> { + page.getRecords().forEach(r -> { + Optional first = o.get(r.getSharedFile()).stream().findFirst(); + first.ifPresent(f -> r.setFileName(f.getFilename()).setFileSuffix(FileUtil.getSuffix(f.getFilename()))); + }); + }); + return page; } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 4b1921b..8499d2e 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -148,6 +148,7 @@ mconfig: project: biz-service-ebtp-project #项目服务 resps: biz-service-ebtp-resps #应答结构化服务 rsms: biz-service-ebtp-rsms #评审结构化服务 + tender: biz-service-ebtp-tender #投标服务 # 用户暴露给 prometheus 的健康数据 management: endpoints: From 30bb9e97521ac74f3780735e2a0a904b52988dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 2 Mar 2021 18:39:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizBidSharedRecordController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java index 0f3d726..8b5d35b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java @@ -1,9 +1,12 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.controller; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; +import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedService; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service.IBizBidSharedRecordService; @@ -20,6 +23,8 @@ import javax.validation.Valid; @RequestMapping("/v1/bizbidsharedrecord") public class BizBidSharedRecordController { + @Resource + private IBaseCacheUserService iBaseCacheUserService; @Resource private IBizBidSharedRecordService ibizBidSharedRecordService; @@ -47,9 +52,14 @@ public class BizBidSharedRecordController { @PostMapping("/add") public BaseResponse insert( @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared) { + BaseCacheUser cacheUser = iBaseCacheUserService.getCacheUser(); BizBidSharedRecord bizBidSharedRecord = new BizBidSharedRecord(); bizBidSharedRecord.setId(PropertyUtils.getSnowflakeId()); bizBidSharedRecord.setRecordId(bizBidShared.getId()); + bizBidSharedRecord.setRecordAccount(cacheUser.getLoginName()); + bizBidSharedRecord.setRecordName(cacheUser.getFullName()); + bizBidSharedRecord.setRecordRole(cacheUser.getRoleIds()); + bizBidSharedRecord.setRecordStaff(cacheUser.getUserId()); boolean save = ibizBidSharedRecordService.save(bizBidSharedRecord); return BaseResponse.success(save); @@ -65,7 +75,6 @@ public class BizBidSharedRecordController { @PutMapping("") public BaseResponse update( @ApiParam(value = "对象数据", required = true) @RequestBody BizBidSharedRecord bizBidSharedRecord) { - return BaseResponse.success(ibizBidSharedRecordService.updateById(bizBidSharedRecord)); } From 3ecf2c8f73167fe88745b3961d50dc26f1832f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 2 Mar 2021 19:12:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/export/service/impl/BizExportDictServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java index 3448b0c..f3123a6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java @@ -57,7 +57,10 @@ public class BizExportDictServiceImpl extends BaseServiceImpl> resultsMap = new HashMap<>(); //是否包含开标阶段 - boolean toInitialOpenRoom = "procurement_mode_1".equals(proj.getBidMethodDict()) || "procurement_mode_2".equals(proj.getBidMethodDict()); + boolean toInitialOpenRoom = false; + if ("procurement_mode_1".equals(proj.getBidMethodDict()) || "procurement_mode_2".equals(proj.getBidMethodDict())) { + toInitialOpenRoom = !"examination_method_1".equals(proj.getExaminationMethodDict()) && !"examination_method_3".equals(proj.getExaminationMethodDict()); + } if ("procurement_mode_3".equals(proj.getBidMethodDict())) { if ("selection_method_1".equals(proj.getBiddingSignDict())) { toInitialOpenRoom = true; From 3bd17e9125662f83b519094a4ba42d2d99193d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Wed, 3 Mar 2021 14:10:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../export/service/impl/BizExportDictServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java index f3123a6..0b7ede0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java @@ -57,10 +57,8 @@ public class BizExportDictServiceImpl extends BaseServiceImpl> resultsMap = new HashMap<>(); //是否包含开标阶段 - boolean toInitialOpenRoom = false; - if ("procurement_mode_1".equals(proj.getBidMethodDict()) || "procurement_mode_2".equals(proj.getBidMethodDict())) { - toInitialOpenRoom = !"examination_method_1".equals(proj.getExaminationMethodDict()) && !"examination_method_3".equals(proj.getExaminationMethodDict()); - } + //是否包含开标阶段 + boolean toInitialOpenRoom = "procurement_mode_1".equals(proj.getBidMethodDict()) || "procurement_mode_2".equals(proj.getBidMethodDict()); if ("procurement_mode_3".equals(proj.getBidMethodDict())) { if ("selection_method_1".equals(proj.getBiddingSignDict())) { toInitialOpenRoom = true;