修改报表打印-评委打分表

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<SupplierRegisterVO> listBaseResponse = rsmsFeignService.findRegisterAndUser(bidEvalInfoDTO).getData();
         //评委
         List<MemberVO> members = listBaseResponse.stream().findFirst().get().getMembers();
+
+
+        List<String> 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<Map<String,List<ReviewConfigCategoryDTO>>> scoreRecord = rsmsFeignService.exportDetail(bidEvalCategoryDTO);
+        Map<String,List<ReviewConfigCategoryDTO>> 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();
+            String userid = members.get(i).getUserId();
-
+            List<ReviewConfigCategoryDTO> dataList = new ArrayList<>();
-            bidEvalDetailDTO.setReviewTurnId(param.getReviewTurnId());
+            for(String method : map.keySet()) {
-            bidEvalDetailDTO.setReviewType(param.getReviewType());
+                if (method.equals(userid)) {
-            bidEvalDetailDTO.setCreateBy(members.get(i).getUserId());
+                    dataList = map.get(method);
-            BaseResponse<List<ReviewConfigCategoryDTO>> scoreRecord = rsmsFeignService.findScoreRecord(bidEvalDetailDTO);
+                    break;
-            List<ReviewConfigCategoryDTO> dataList = scoreRecord.getData();
+                }
+            }
 
             // 创建表格
             Sheet sheet = wb.createSheet(members.get(i).getName());

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<Map<String,List<ReviewConfigCategoryDTO>>> exportDetail(@RequestBody BidEvalCategoryDTO bidEvalCategoryDTO);
+
+    /**
+    * 不同供应商的打分
+    *
+    * @param bidEvalDetailDTO
+    * @return
+    */
     @PostMapping("/v1/bid/eval/record/findScoreRecord")
     BaseResponse<List<ReviewConfigCategoryDTO>> findScoreRecord(@RequestBody BidEvalDetailDTO bidEvalDetailDTO);
 

src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/ExportServiceFallback.java

@@ -20,6 +20,11 @@ public class ExportServiceFallback implements FallbackFactory<RsmsFeignService>
     @Override
     public RsmsFeignService create(Throwable throwable) {
         RsmsFeignService back = new RsmsFeignService() {
+            @Override
+            public BaseResponse<Map<String, List<ReviewConfigCategoryDTO>>> exportDetail(BidEvalCategoryDTO bidEvalCategoryDTO) {
+                return null;
+            }
+
             /**
              * 不同供应商的打分
              *

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;
+
+/**
+ * <p>
+ * 评标类别表
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 评标类别表
+ * </p>
+ *
+ * @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<ReviewConfigDetailDTO> detailList;
+
+    @ApiModelProperty(value = "报价得分")
+    @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
+    private Map<String,Object> priceScoreMap;
+
+    /**
+     * 解锁的评委ID
+     */
+    @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
+    private List<String> userIds;
+
+    @ApiModelProperty(value = "评审室Id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @JsonInclude(value = JsonInclude.Include.NON_NULL)
+    private String assessRoomId;
+
+
+
+
+}