From ab3ac0312023c8028a1cba666be16d7c2df256be Mon Sep 17 00:00:00 2001 From: zhangyx <1254353766@qq.com> Date: Thu, 29 Apr 2021 09:40:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E6=89=93?= =?UTF-8?q?=E5=8D=B0-=E8=AF=84=E5=A7=94=E6=89=93=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZjgrExportServiceImpl.java | 33 +++++++---- .../extend/feign/client/RsmsFeignService.java | 17 ++++-- .../client/factory/ExportServiceFallback.java | 5 ++ .../extend/feign/entity/BidEvalCategory.java | 56 +++++++++++++++++++ .../feign/entity/BidEvalCategoryDTO.java | 55 ++++++++++++++++++ 5 files changed, 148 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategory.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategoryDTO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java index 45972ad..acf8e34 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjgrExportServiceImpl.java @@ -5,12 +5,8 @@ import com.chinaunicom.mall.ebtp.extend.export.bean.*; import com.chinaunicom.mall.ebtp.extend.feign.client.ProjectFeignService; import com.chinaunicom.mall.ebtp.extend.feign.client.RsmsFeignService; import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; -import com.chinaunicom.mall.ebtp.extend.feign.entity.BidEvalDetailVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.*; import com.chinaunicom.mall.ebtp.extend.export.vo.MemberVO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.SupplierRegisterVO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.ProjectSectionVO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.ReviewConfigCategoryDTO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.ReviewConfigDetailDTO; import lombok.SneakyThrows; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; @@ -68,6 +64,18 @@ public class ZjgrExportServiceImpl implements ExportService { List listBaseResponse = rsmsFeignService.findRegisterAndUser(bidEvalInfoDTO).getData(); //评委 List members = listBaseResponse.stream().findFirst().get().getMembers(); + + + List userList = new ArrayList<>(); + for (int i = 0; i < members.size(); i++) { + String userid = members.get(i).getUserId(); + userList.add(userid); + } + BidEvalCategoryDTO bidEvalCategoryDTO = new BidEvalCategoryDTO(); + bidEvalCategoryDTO.setAssessRoomId(param.getAssessRoomId()).setUserIds(userList); + BaseResponse>> scoreRecord = rsmsFeignService.exportDetail(bidEvalCategoryDTO); + Map> map = scoreRecord.getData(); + //列头 StringBuffer titles0 = new StringBuffer("分类,项目名称,标准说明,分值"); @@ -97,13 +105,14 @@ public class ZjgrExportServiceImpl implements ExportService { cellStyle.setBorderRight(BorderStyle.THIN);//右边框 //Sheet for (int i = 0; i < members.size(); i++) { - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); - - bidEvalDetailDTO.setReviewTurnId(param.getReviewTurnId()); - bidEvalDetailDTO.setReviewType(param.getReviewType()); - bidEvalDetailDTO.setCreateBy(members.get(i).getUserId()); - BaseResponse> scoreRecord = rsmsFeignService.findScoreRecord(bidEvalDetailDTO); - List dataList = scoreRecord.getData(); + String userid = members.get(i).getUserId(); + List dataList = new ArrayList<>(); + for(String method : map.keySet()) { + if (method.equals(userid)) { + dataList = map.get(method); + break; + } + } // 创建表格 Sheet sheet = wb.createSheet(members.get(i).getName()); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java index 6eac2a1..324f79e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RsmsFeignService.java @@ -5,13 +5,9 @@ import com.chinaunicom.mall.ebtp.extend.export.bean.ArchiveFileReturnVO; import com.chinaunicom.mall.ebtp.extend.export.bean.ArchiveLink; import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalInfoDTO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.BidEvalDetailSummaryVO; +import com.chinaunicom.mall.ebtp.extend.feign.entity.*; import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterPriceScoreVO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.SupplierRegisterVO; import com.chinaunicom.mall.ebtp.extend.feign.client.factory.ExportServiceFallback; -import com.chinaunicom.mall.ebtp.extend.feign.entity.JuryPrintVO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.ResultDetailVO; -import com.chinaunicom.mall.ebtp.extend.feign.entity.ReviewConfigCategoryDTO; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; @@ -29,9 +25,18 @@ public interface RsmsFeignService { /** * 不同供应商的打分 * - * @param bidEvalDetailDTO + * @param bidEvalCategoryDTO * @return */ + @PostMapping("/v1/bid/report/exportDetail") + BaseResponse>> exportDetail(@RequestBody BidEvalCategoryDTO bidEvalCategoryDTO); + + /** + * 不同供应商的打分 + * + * @param bidEvalDetailDTO + * @return + */ @PostMapping("/v1/bid/eval/record/findScoreRecord") BaseResponse> findScoreRecord(@RequestBody BidEvalDetailDTO bidEvalDetailDTO); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java index 2093056..b826f33 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java @@ -20,6 +20,11 @@ public class ExportServiceFallback implements FallbackFactory @Override public RsmsFeignService create(Throwable throwable) { RsmsFeignService back = new RsmsFeignService() { + @Override + public BaseResponse>> exportDetail(BidEvalCategoryDTO bidEvalCategoryDTO) { + return null; + } + /** * 不同供应商的打分 * diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategory.java new file mode 100644 index 0000000..feb5eae --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategory.java @@ -0,0 +1,56 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 评标类别表 + *

+ * + * @author dino + * @since 2020-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEvalCategory对象", description="评标类别表DTO") +@TableName(value = "biz_rsms_bid_eval_category",autoResultMap = true) +public class BidEvalCategory extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "编号") + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + @ApiModelProperty(value = "评标主表id（biz_rsms_bid_eval_info）") + @JsonSerialize(using = ToStringSerializer.class) + private String bidEvalId; + + @ApiModelProperty(value = "详审项类别：0：报价；1：商务；2：技术；4：工程报价 ；5：服务。初审项类别：0：形式评审；1：资格审查项；2：响应性评审；3：商务审查项；4: 技术审查项；5: 服务审查项；6: 其他审查项") + private String category; + + @ApiModelProperty(value = "评审配置类别表ID(biz_rsms_review_config_category)") + @JsonSerialize(using = ToStringSerializer.class) + private String categoryId; + + @ApiModelProperty(value = "评委类别状态 1，未提交；2，已提交") + private String judgesStatus; + + @ApiModelProperty(value = "评委姓名") + private String judgesName; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategoryDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategoryDTO.java new file mode 100644 index 0000000..498e245 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/BidEvalCategoryDTO.java @@ -0,0 +1,55 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.List; +import java.util.Map; + +/** + *

+ * 评标类别表 + *

+ * + * @author dino + * @since 2020-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEvalCategoryDTO对象", description="评标类别表") +public class BidEvalCategoryDTO extends BidEvalCategory implements Serializable { + + private static final Long serialVersionUID = 1L; + + + @ApiModelProperty(value = "评分配置集合") + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private List detailList; + + @ApiModelProperty(value = "报价得分") + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private Map priceScoreMap; + + /** + * 解锁的评委ID + */ + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private List userIds; + + @ApiModelProperty(value = "评审室Id") + @JsonSerialize(using = ToStringSerializer.class) + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String assessRoomId; + + + + +}