liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
517612449@qq.com
2021-03-03 15:22:48 +08:00
parent 478fd7ef43 3bd17e9125
commit d95abed510
5 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java
View File

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

24
src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java
View File

@ -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<BizBidSharedMapper, BizBidShared> implements IBizBidSharedService {
@Autowired
private AttachmentClient attachmentClient;
@Override
public IPage<BizBidShared> getList(BizBidSharedVO bizBidNotice) {
@ -29,7 +39,17 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl<BizBidSharedMapper,
wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName())
.like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole());
return this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper);
Page<BizBidShared> page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper);
List<String> collect = page.getRecords().stream().map(BizBidShared::getSharedFile).distinct().collect(Collectors.toList());
Optional<AttachmentDetail> optional = attachmentClient.findByBusinessId(collect);
optional.ifPresent(o -> {
page.getRecords().forEach(r -> {
Optional<AttachmentEntity> first = o.get(r.getSharedFile()).stream().findFirst();
first.ifPresent(f -> r.setFileName(f.getFilename()).setFileSuffix(FileUtil.getSuffix(f.getFilename())));
});
});
return page;
}

11
src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java
View File

@ -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<Boolean> 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<Boolean> update(
@ApiParam(value = "对象数据", required = true) @RequestBody BizBidSharedRecord bizBidSharedRecord) {
return BaseResponse.success(ibizBidSharedRecordService.updateById(bizBidSharedRecord));
}

1
src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java
View File

@ -57,6 +57,7 @@ public class BizExportDictServiceImpl extends BaseServiceImpl<BizExportDictMappe
Map<String, List<BizExportDict>> resultsMap = new HashMap<>();
//是否包含开标阶段
//是否包含开标阶段
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())) {

1
src/main/resources/application-test.yml
View File

@ -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: