diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java index 52cbb2e..d4c5550 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java @@ -8,13 +8,20 @@ import io.swagger.annotations.ApiModelProperty; public class ExportParame { private String assessRoomId; + private String reviewTurnId; + private String reviewTurnSort; + private String projectId; @ApiModelProperty(value = "标段id") private String sectionId; + @ApiModelProperty(value="类型id") private String reviewType; + + + public String getAssessRoomId() { return assessRoomId; } @@ -54,4 +61,12 @@ public class ExportParame { public void setReviewType(String reviewType) { this.reviewType = reviewType; } + + public String getReviewTurnSort() { + return reviewTurnSort; + } + + public void setReviewTurnSort(String reviewTurnSort) { + this.reviewTurnSort = reviewTurnSort; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java index 14227a1..3148759 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java @@ -1,63 +1,29 @@ package com.chinaunicom.mall.ebtp.extend.export.controller; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; -import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalInfoDTO; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizBidOpenroom; -import com.chinaunicom.mall.ebtp.extend.export.bean.BizSupplierRegister; -import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; -import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; -import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigCategoryDTO; -import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigDetailDTO; -import com.chinaunicom.mall.ebtp.extend.export.bean.Tdoc; +import com.chinaunicom.mall.ebtp.extend.export.bean.*; import com.chinaunicom.mall.ebtp.extend.export.services.ExportService; import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceOpen; import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceProject; import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceResps; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailJudgesSummaryVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailSummaryVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalEarlyJudgesSummaryVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.MemberVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterPriceScoreVO; -import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.*; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; - import io.swagger.annotations.Api; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; @RestController @@ -74,7 +40,7 @@ public class ExportController { @Resource private ExportServiceOpen exportServiceOpen; - + private final String ERROR_MESSAGE="导出失败，请联系管理员"; /** * 1 * 导出方法 @@ -86,19 +52,19 @@ public class ExportController { Tdoc tdocPara = new Tdoc(); tdocPara.setAssessRoomId(parame.getAssessRoomId()); - tdocPara.setTurnSort(Integer.parseInt(parame.getReviewTurnId())); - + tdocPara.setTurnSort(Integer.parseInt(parame.getReviewTurnSort())); + //开标记录数据 BaseResponse> listBaseResponse = exportServiceResps.getTenderQuoteList(tdocPara); - List list = listBaseResponse.getData(); ArrayList> maps = new ArrayList<>(); - if (list != null) { - for (int i = 0; i < list.size(); i++) { + + if (listBaseResponse != null) { + for (int i = 0; i < listBaseResponse.getData().size(); i++) { Map data = new HashMap<>(); data.put("num", (i + 1)); - data.put("tbr", list.get(i).getBidUserName()); - data.put("bj", list.get(i).getNewPrice()); + data.put("tbr", (listBaseResponse.getData().get(i).getBidUserName())); + data.put("bj", (listBaseResponse.getData().get(i).getNewPrice())); data.put("yy", ""); - data.put("sign", list.get(i).getContactName() + ":" + list.get(i).getSignTime()); + data.put("sign", (listBaseResponse.getData().get(i).getContactName()) + ":" + (listBaseResponse.getData().get(i).getSignTime())); maps.add(data); } @@ -117,10 +83,23 @@ public class ExportController { File file = new File("d:/开标记录表.docx"); Map all = new HashMap() {{ put("Record", maps); - put("time", timeList.getData().get(0).getOpingTime()); - put("mc", project.getData().getProjectName()); - put("bh", project.getData().getSectionNumber()); - put("bao", project.getData().getBidSectBizNum()); + + if (timeList.getData() != null) { + put("time", timeList.getData().get(0).getOpingTime()); + } else { + put("time", ""); + } + + if (project.getData() != null) { + put("mc", project.getData().getProjectName()); + put("bh", project.getData().getSectionNumber()); + put("bao", project.getData().getBidSectBizNum()); + } else { + put("mc", ""); + put("bh", ""); + put("bao", ""); + } + put("yuan", ""); }}; @@ -129,7 +108,6 @@ public class ExportController { XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); String fileName = new String("开标记录表.docx".getBytes("UTF-8"), "iso-8859-1"); - OutputStream os = response.getOutputStream(); response.setHeader("Content-disposition", "attachment; filename=" + fileName); template.write(os); @@ -140,38 +118,40 @@ public class ExportController { * 2 * 导出方法 * 评标委员会签字表 + * @return */ @RequestMapping(value = "/judges", method = RequestMethod.GET) @ResponseBody public void exportJudgesMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { - //项目和招标名称处理 + //项目和招标名称数据 ProjectSectionVO projectSectionVO = new ProjectSectionVO(); projectSectionVO.setId(parame.getSectionId()); BaseResponse list = exportServiceProject.selectById(projectSectionVO); - //专家人员数据 BaseResponse> listBaseResponse = exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); ArrayList> maps = new ArrayList<>(); - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("name", listBaseResponse.getData().get(i).getName()); - data.put("phone", listBaseResponse.getData().get(i).getMobile()); - maps.add(data); + if (listBaseResponse != null && list != null) { + for (int i = 0; i < listBaseResponse.getData().size(); i++) { + Map data = new HashMap<>(); + data.put("name", (listBaseResponse.getData().get(i).getName())); + data.put("phone", listBaseResponse.getData().get(i).getMobile()); + maps.add(data); + } } - //获取模板 File file = new File("d:/评标委员会签字表.docx"); - - //当前时间 - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy 年 MM 月 dd 日 "); - Map all = new HashMap() {{ put("Judges", maps); - put("time", sdf.format(date)); - put("bh", list.getData().getBidSectCode()); - put("mc", list.getData().getProjectName()); + put("time", ""); + + if (list != null) { + put("bh", list.getData().getBidSectCode()); + put("mc", list.getData().getProjectName()); + } else { + put("bh", ""); + put("mc", ""); + } }}; HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); @@ -183,6 +163,9 @@ public class ExportController { OutputStream os = response.getOutputStream(); response.setHeader("Content-disposition", "attachment; filename=" + fileName); template.write(os); + + + } @@ -195,26 +178,23 @@ public class ExportController { @ResponseBody public void exportPszjMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { - - //项目和招标名称处理 - ProjectSectionVO projectSectionVO = new ProjectSectionVO(); - projectSectionVO.setId(parame.getSectionId()); - BaseResponse list = exportServiceProject.selectById(projectSectionVO); - //专家人员数据 BaseResponse> listBaseResponse = exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); ArrayList> maps = new ArrayList<>(); - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("name", listBaseResponse.getData().get(i).getName()); - data.put("phone", listBaseResponse.getData().get(i).getMobile()); - data.put("idCard", listBaseResponse.getData().get(i).getCertificate()); - data.put("isTrue", listBaseResponse.getData().get(i).getAttitude() == 1 ? "是" : "否"); - data.put("time", listBaseResponse.getData().get(i).getLoginTime()); - maps.add(data); + if (listBaseResponse != null && listBaseResponse.getData() != null) { + for (int i = 0; i < listBaseResponse.getData().size(); i++) { + Map data = new HashMap<>(); + data.put("name", listBaseResponse.getData().get(i).getName()); + data.put("phone", listBaseResponse.getData().get(i).getMobile()); + data.put("idCard", listBaseResponse.getData().get(i).getCertificate()); + data.put("isTrue", listBaseResponse.getData().get(i).getAttitude() == 1 ? "是" : "否"); + data.put("time", listBaseResponse.getData().get(i).getLoginTime()); + maps.add(data); + } } + File file = new File("d:/评审专家签到表.docx"); Map all = new HashMap() {{ put("table", maps); @@ -239,7 +219,6 @@ public class ExportController { */ @RequestMapping(value = "/pbbg", method = RequestMethod.GET) @ResponseBody - //todo 暂未完成 public void exportAllMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { //表一假数据 @@ -266,11 +245,14 @@ public class ExportController { //专家人员数据 BaseResponse> listBaseResponse = exportService.queryReportPrintByRoomId(parame.getAssessRoomId()); ArrayList> list3 = new ArrayList<>(); - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("num", (i + 1)); - data.put("name", listBaseResponse.getData().get(i).getName()); - list3.add(data); + if (listBaseResponse != null && listBaseResponse.getData() != null) { + for (int i = 0; i < listBaseResponse.getData().size(); i++) { + Map data = new HashMap<>(); + data.put("num", (i + 1)); + data.put("name", listBaseResponse.getData().get(i).getName()); + list3.add(data); + } + } @@ -295,7 +277,6 @@ public class ExportController { } - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); bidEvalDetailDTO.setAssessRoomId(parame.getAssessRoomId()); bidEvalDetailDTO.setReviewTurnId(parame.getReviewTurnId()); @@ -341,10 +322,10 @@ public class ExportController { List> list6 = new ArrayList<>(); for (int i = 0; i < all1.size(); i++) { Map map = new HashMap<>(); - map.put("num", (i+1)); + map.put("num", (i + 1)); map.put("tbr", all1.get(i).getSupplierRegisterName()); - map.put("js", all1.get(i).getServiceAllScore()); - map.put("sw", all1.get(i).getBusinessAllScore()); + map.put("js", all1.get(i).getServiceAllScore()); + map.put("sw", all1.get(i).getBusinessAllScore()); list6.add(map); } @@ -365,10 +346,10 @@ public class ExportController { List> list8 = new ArrayList<>(); for (int i = 0; i < all1.size(); i++) { Map map = new HashMap<>(); - map.put("num", (i+1)); + map.put("num", (i + 1)); map.put("tbr", all1.get(i).getSupplierRegisterName()); - map.put("sw", all1.get(i).getBusinessAllScore()); - map.put("js", all1.get(i).getServiceAllScore()); + map.put("sw", all1.get(i).getBusinessAllScore()); + map.put("js", all1.get(i).getServiceAllScore()); map.put("jg", all1.get(i).getPriceAllScore()); map.put("zhdf", all1.get(i).getAllScore()); map.put("bj", ""); @@ -424,11 +405,9 @@ public class ExportController { //文件模板从数据库或者项目位置取得 File file = new File("d:/评标专家承诺书.docx"); - XWPFTemplate template = XWPFTemplate.compile(file); String fileName = new String("评标专家承诺书.docx".getBytes("UTF-8"), "iso-8859-1"); - OutputStream os = response.getOutputStream(); response.setHeader("Content-disposition", "attachment; filename=" + fileName); template.write(os); @@ -439,137 +418,141 @@ public class ExportController { * 6 * 导出方法 * 打分汇总 + * @return */ @RequestMapping(value = "dfhz", method = RequestMethod.GET) @ResponseBody - public void exportDfMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { - - BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); - bidEvalDetailDTO.setAssessRoomId(parame.getAssessRoomId()); - bidEvalDetailDTO.setReviewTurnId(parame.getReviewTurnId()); - bidEvalDetailDTO.setReviewType(parame.getReviewType()); - BaseResponse>> list = exportService.findCategoryResultSummary(bidEvalDetailDTO); - - - //商务数据 - List list1 = list.getData().get("1"); - //服务数据 - List list2 = list.getData().get("5"); - //价格数据 - List list3 = list.getData().get("0"); - + public BaseResponse exportDfMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { BidEvalInfoDTO bidEvalInfoDTO = new BidEvalInfoDTO(); bidEvalInfoDTO.setAssessRoomId(parame.getAssessRoomId()); bidEvalInfoDTO.setReviewTurnId(parame.getReviewTurnId()); bidEvalInfoDTO.setReviewType(parame.getReviewType()); + //所有评委数据源 + BaseResponse> judges = exportService.findRegisterAndUser(bidEvalInfoDTO); +// List memberall= exportService.findRegisterAndUser(bidEvalInfoDTO).getData().stream().findFirst().get().getMembers(); - //所有评委 - List memberall = exportService.findRegisterAndUser(bidEvalInfoDTO).getData().stream().findFirst().get().getMembers(); + BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); + bidEvalDetailDTO.setAssessRoomId(parame.getAssessRoomId()); + bidEvalDetailDTO.setReviewTurnId(parame.getReviewTurnId()); + bidEvalDetailDTO.setReviewType(parame.getReviewType()); + //所有类型打分数据源 + BaseResponse>> list = exportService.findCategoryResultSummary(bidEvalDetailDTO); + if (list != null && judges != null) { + //所有评委 + List memberall = judges.getData().stream().findFirst().get().getMembers(); + //商务数据 + List list1 = list.getData().get("1"); + //服务数据 + List list2 = list.getData().get("5"); + //价格数据 + List list3 = list.getData().get("0"); + // 打分综合汇总 + List all = new ArrayList<>(); - // 综合汇总 - List all = new ArrayList<>(); - list1.stream().forEach(o -> { - BidEvalDetailSummaryVO object = new BidEvalDetailSummaryVO(); - object.setSupplierRegisterId(o.getSupplierRegisterId()); - object.setSupplierRegisterName(o.getSupplierRegisterName()); - object.setBusinessAllScore(o.getFinalScore()); - all.add(object); - }); - all.stream().forEach(x -> { - - list2.stream().forEach(y -> { - if (x.getSupplierRegisterId().equals(y.getSupplierRegisterId())) { - x.setServiceAllScore(y.getFinalScore()); - } - ; + list1.stream().forEach(o -> { + BidEvalDetailSummaryVO object = new BidEvalDetailSummaryVO(); + object.setSupplierRegisterId(o.getSupplierRegisterId()); + object.setSupplierRegisterName(o.getSupplierRegisterName()); + object.setBusinessAllScore(o.getFinalScore()); + all.add(object); }); - list3.stream().forEach(z -> { - if (x.getSupplierRegisterId().equals(z.getSupplierRegisterId())) { - x.setPriceAllScore(z.getFinalScore()); - } - ; + all.stream().forEach(x -> { + + list2.stream().forEach(y -> { + if (x.getSupplierRegisterId().equals(y.getSupplierRegisterId())) { + x.setServiceAllScore(y.getFinalScore()); + } + ; + }); + + list3.stream().forEach(z -> { + if (x.getSupplierRegisterId().equals(z.getSupplierRegisterId())) { + x.setPriceAllScore(z.getFinalScore()); + } + ; + }); + + BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); + x.setAllScore(allPrice); }); - BigDecimal allPrice = (x.getBusinessAllScore().add(x.getServiceAllScore()).add(x.getPriceAllScore())).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_UP); - x.setAllScore(allPrice); - }); - - //所有专家 - Map members = list1.get(0).getScoreMap(); - //列头 - StringBuffer titles0 = new StringBuffer("投标人名称,投标序号"); - ArrayList strings = new ArrayList<>(); - //专家信息 添加到列头 - members.forEach((k, v) -> { -// titles0.append("," + k); - memberall.forEach(x -> { - if (k.equals(x.getUserId())) { - titles0.append("," + x.getName()); - } + //参与打分评委 + Map members = list1.get(0).getScoreMap(); + //列头 + StringBuffer titles0 = new StringBuffer("投标人名称,投标序号"); + ArrayList strings = new ArrayList<>(); + //评委专家信息添加到列头 根据参加打分专家的id到所有专家列表中查询名字 + List finalMemberall = memberall; + members.forEach((k, v) -> { + finalMemberall.forEach(x -> { + if (k.equals(x.getUserId())) { + titles0.append("," + x.getName()); + } + }); + strings.add(v.getCreateBy()); }); - strings.add(v.getCreateBy()); - }); - //添加最后一列 - titles0.append(",平均分"); - //最终的列头 - String titles = titles0.toString(); + //添加最后一列 + titles0.append(",平均分"); + //最终的列头 + String titles = titles0.toString(); - // 创建工作簿 - SXSSFWorkbook wb = new SXSSFWorkbook(); - //表格样式 - CellStyle cellStyle = wb.createCellStyle(); - //水平居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - //垂直居中 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - //边框 - cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle.setBorderRight(BorderStyle.THIN);//右边框 - //渲染所有数据表格 - List createList = null; - /** - * 一共4个表，固定循环4次 - */ - for (int k = 0; k < 4; k++) { - // 创建表格 - Sheet sheet = null; - if (k == 0) { - sheet = wb.createSheet("商务得分"); - } else if (k == 1) { - sheet = wb.createSheet("服务得分"); - } else if (k == 2) { - sheet = wb.createSheet("价格得分"); - titles = "投标人名称,投标序号,价格得分"; + // 创建工作簿 + SXSSFWorkbook wb = new SXSSFWorkbook(); + //表格样式 + CellStyle cellStyle = wb.createCellStyle(); + //水平居中 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //垂直居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + //边框 + cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 + cellStyle.setBorderTop(BorderStyle.THIN);//上边框 + cellStyle.setBorderRight(BorderStyle.THIN);//右边框 - } else { - sheet = wb.createSheet("评分汇总表"); - titles = "投标人名称,投标序号,商务得分,服务得分,价格得分,综合得分"; + //渲染所有数据表格 + List createList = null; + /** + * 一共4个表，固定循环4次 + */ + for (int k = 0; k < 4; k++) { + // 创建表格 + Sheet sheet = null; + if (k == 0) { + sheet = wb.createSheet("商务得分"); + } else if (k == 1) { + sheet = wb.createSheet("服务得分"); + } else if (k == 2) { + sheet = wb.createSheet("价格得分"); + titles = "投标人名称,投标序号,价格得分"; - } - sheet.createFreezePane(1, 1); + } else { + sheet = wb.createSheet("评分汇总表"); + titles = "投标人名称,投标序号,商务得分,服务得分,价格得分,综合得分"; - //最右侧列值 - Integer index = (titles.split(",").length) - 1; - //行 - int rowIndex = 0; - //列 - int colIndex = 0; + } + sheet.createFreezePane(1, 1); - // 1行 表头 - CellRangeAddress region1 = new CellRangeAddress(0, 0, 0, index); - sheet.addMergedRegion(region1); - Row title1 = sheet.createRow(rowIndex++); - Cell titleCell1 = title1.createCell(0); - title1.setHeightInPoints(35); - titleCell1.setCellValue("打分汇总表"); - titleCell1.setCellStyle(cellStyle); - // 2行 + //最右侧列值 + Integer index = (titles.split(",").length) - 1; + //行 + int rowIndex = 0; + //列 + int colIndex = 0; + + // 1行 表头 + CellRangeAddress region1 = new CellRangeAddress(0, 0, 0, index); + sheet.addMergedRegion(region1); + Row title1 = sheet.createRow(rowIndex++); + Cell titleCell1 = title1.createCell(0); + title1.setHeightInPoints(35); + titleCell1.setCellValue("打分汇总表"); + titleCell1.setCellStyle(cellStyle); + // 2行 /* CellRangeAddress region2 = new CellRangeAddress(1, 1, 0, index); sheet.addMergedRegion(region2); Row title2 = sheet.createRow(rowIndex++); @@ -581,120 +564,127 @@ public class ExportController { Row title3 = sheet.createRow(rowIndex++); Cell titleCell3 = title3.createCell(0); titleCell3.setCellValue("招标编号 bh123456");*/ - //4行 得分标题 - CellRangeAddress region4 = new CellRangeAddress(1, 1, 0, index); - sheet.addMergedRegion(region4); - Row title4 = sheet.createRow(rowIndex++); - Cell titleCell4 = title4.createCell(0); - if (k == 0) { - titleCell4.setCellValue("商务得分"); - createList = list1; - } else if (k == 1) { - titleCell4.setCellValue("服务得分"); - createList = list2; - } else if (k == 2) { - titleCell4.setCellValue("价格得分"); - createList = list3; - } else { - titleCell4.setCellValue("评分汇总"); - } - - //5行 列头 - Row titleRow5 = sheet.createRow(rowIndex++); - // 设置高度为30 - titleRow5.setHeightInPoints(30); - for (String title : titles.split(",")) { - sheet.setColumnWidth(colIndex, 17 * 256); - Cell titleCell = titleRow5.createCell(colIndex++); - titleCell.setCellValue(title); - //设置样式 - titleCell.setCellStyle(cellStyle); - } - //6行 数据行 - int num = 1; - if (k == 3) { - for (int i = 0; i < all.size(); i++) { - //3为最终汇总表 - Row titleRowN = sheet.createRow(rowIndex++); - colIndex = 0; - //投标人名称 - Cell cell = titleRowN.createCell(colIndex++); - cell.setCellStyle(cellStyle); - cell.setCellValue(all.get(i).getSupplierRegisterName()); - //序号 - Cell cell1 = titleRowN.createCell(colIndex++); - cell1.setCellStyle(cellStyle); - cell1.setCellValue(num++); - //商务汇总 - Cell cell2 = titleRowN.createCell(colIndex++); - cell2.setCellStyle(cellStyle); - cell2.setCellValue(all.get(i).getBusinessAllScore().toString()); - //服务汇总 - Cell cell3 = titleRowN.createCell(colIndex++); - cell3.setCellStyle(cellStyle); - cell3.setCellValue(all.get(i).getServiceAllScore().toString()); - //价格汇总 - Cell cell4 = titleRowN.createCell(colIndex++); - cell4.setCellStyle(cellStyle); - cell4.setCellValue(all.get(i).getPriceAllScore().toString()); - //综合得分 - Cell cell5 = titleRowN.createCell(colIndex++); - cell5.setCellStyle(cellStyle); - cell5.setCellValue(all.get(i).getAllScore().toString()); + //4行 得分标题 + CellRangeAddress region4 = new CellRangeAddress(1, 1, 0, index); + sheet.addMergedRegion(region4); + Row title4 = sheet.createRow(rowIndex++); + Cell titleCell4 = title4.createCell(0); + if (k == 0) { + titleCell4.setCellValue("商务得分"); + createList = list1; + } else if (k == 1) { + titleCell4.setCellValue("服务得分"); + createList = list2; + } else if (k == 2) { + titleCell4.setCellValue("价格得分"); + createList = list3; + } else { + titleCell4.setCellValue("评分汇总"); } - } else { - for (int i = 0; i < createList.size(); i++) { - colIndex = 0; - Row titleRowN = sheet.createRow(rowIndex++); - //投标人名称 - Cell cell = titleRowN.createCell(colIndex++); - cell.setCellStyle(cellStyle); - cell.setCellValue(createList.get(i).getSupplierRegisterName()); - //序号 - Cell cell1 = titleRowN.createCell(colIndex++); - cell1.setCellStyle(cellStyle); - cell1.setCellValue(num++); - if (k == 2) { - //价格得分 2时无专家评分，有最终评分 - Cell cellN1 = titleRowN.createCell(colIndex++); - cellN1.setCellStyle(cellStyle); - cellN1.setCellValue(createList.get(i).getFinalScore().toString()); - } else { - //所有专家 - for (int j = 0; j < createList.get(i).getScoreMap().size(); j++) { - Map scoreMap = createList.get(i).getScoreMap(); - //获取专家的顺序 - if (scoreMap != null) { - String score = null; - for (String string : strings) { - if (scoreMap.get(string) != null) { - score = (scoreMap.get(string).getScore()).toString(); - } else { - score = "无"; + + //5行 列头 + Row titleRow5 = sheet.createRow(rowIndex++); + // 设置高度为30 + titleRow5.setHeightInPoints(30); + for (String title : titles.split(",")) { + sheet.setColumnWidth(colIndex, 17 * 256); + Cell titleCell = titleRow5.createCell(colIndex++); + titleCell.setCellValue(title); + //设置样式 + titleCell.setCellStyle(cellStyle); + } + //6行 数据行 + int num = 1; + if (k == 3) { + for (int i = 0; i < all.size(); i++) { + //3为最终汇总表 + Row titleRowN = sheet.createRow(rowIndex++); + colIndex = 0; + //投标人名称 + Cell cell = titleRowN.createCell(colIndex++); + cell.setCellStyle(cellStyle); + cell.setCellValue(all.get(i).getSupplierRegisterName()); + //序号 + Cell cell1 = titleRowN.createCell(colIndex++); + cell1.setCellStyle(cellStyle); + cell1.setCellValue(num++); + //商务汇总 + Cell cell2 = titleRowN.createCell(colIndex++); + cell2.setCellStyle(cellStyle); + cell2.setCellValue(all.get(i).getBusinessAllScore().toString()); + //服务汇总 + Cell cell3 = titleRowN.createCell(colIndex++); + cell3.setCellStyle(cellStyle); + cell3.setCellValue(all.get(i).getServiceAllScore().toString()); + //价格汇总 + Cell cell4 = titleRowN.createCell(colIndex++); + cell4.setCellStyle(cellStyle); + cell4.setCellValue(all.get(i).getPriceAllScore().toString()); + //综合得分 + Cell cell5 = titleRowN.createCell(colIndex++); + cell5.setCellStyle(cellStyle); + cell5.setCellValue(all.get(i).getAllScore().toString()); + } + } else { + for (int i = 0; i < createList.size(); i++) { + colIndex = 0; + Row titleRowN = sheet.createRow(rowIndex++); + //投标人名称 + Cell cell = titleRowN.createCell(colIndex++); + cell.setCellStyle(cellStyle); + cell.setCellValue(createList.get(i).getSupplierRegisterName()); + //序号 + Cell cell1 = titleRowN.createCell(colIndex++); + cell1.setCellStyle(cellStyle); + cell1.setCellValue(num++); + if (k == 2) { + //价格得分 2时无专家评分，有最终评分 + Cell cellN1 = titleRowN.createCell(colIndex++); + cellN1.setCellStyle(cellStyle); + cellN1.setCellValue(createList.get(i).getFinalScore().toString()); + } else { + //所有专家 + for (int j = 0; j < createList.get(i).getScoreMap().size(); j++) { + Map scoreMap = createList.get(i).getScoreMap(); + //获取专家的顺序 + if (scoreMap != null) { + String score = null; + for (String string : strings) { + if (scoreMap.get(string) != null) { + score = (scoreMap.get(string).getScore()).toString(); + } else { + score = "无"; + } + Cell cellN = titleRowN.createCell(colIndex++); + cellN.setCellStyle(cellStyle); + cellN.setCellValue(score); } - Cell cellN = titleRowN.createCell(colIndex++); - cellN.setCellStyle(cellStyle); - cellN.setCellValue(score); + } + } - - + //平均分 + Cell cellN1 = titleRowN.createCell(colIndex++); + cellN1.setCellStyle(cellStyle); + cellN1.setCellValue(createList.get(i).getFinalScore().toString()); } - //平均分 - Cell cellN1 = titleRowN.createCell(colIndex++); - cellN1.setCellStyle(cellStyle); - cellN1.setCellValue(createList.get(i).getFinalScore().toString()); } } } + + + String filename = "打分汇总表.xls"; + filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); + response.reset(); + response.setContentType("application/octet-stream;charset=utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes("UTF-8"), "ISO8859-1"))); + wb.write(response.getOutputStream()); } - String filename = "打分汇总表.xls"; - filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); - response.reset(); - response.setContentType("application/octet-stream;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes("UTF-8"), "ISO8859-1"))); - wb.write(response.getOutputStream()); + + return BaseResponse.fail(ERROR_MESSAGE); + + } @@ -706,7 +696,7 @@ public class ExportController { */ @RequestMapping(value = "/jgdf", method = RequestMethod.GET) @ResponseBody - public void exportJgdfMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { + public BaseResponse exportJgdfMessage(ExportParame parame, HttpServletRequest request, HttpServletResponse response) throws IOException { List titles = new LinkedList(); titles.add("序号"); @@ -731,168 +721,176 @@ public class ExportController { projectSectionVO.setId(parame.getSectionId()); BaseResponse list = exportServiceProject.selectById(projectSectionVO); - //价格数据 + BidEvalDetailDTO bidEvalDetailDTO = new BidEvalDetailDTO(); bidEvalDetailDTO.setReviewTurnId(parame.getReviewTurnId()); bidEvalDetailDTO.setReviewType(parame.getReviewType()); bidEvalDetailDTO.setAssessRoomId(parame.getAssessRoomId()); - + //价格数据 BaseResponse> listBaseResponse = exportService.findPriceScoreRecord(bidEvalDetailDTO); - //最小价格 - BigDecimal minPrice = listBaseResponse.getData().stream().map(SupplierRegisterPriceScoreVO::getBidContent).min((x1, x2) -> x1.compareTo(x2)).get(); - //平均价格 - BigDecimal avgPrice = listBaseResponse.getData().stream().map(SupplierRegisterPriceScoreVO::getBidContent).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(listBaseResponse.getData().size()), 2, BigDecimal.ROUND_HALF_UP); + //组装价格数据 - ArrayList> maps = new ArrayList<>(); - for (int i = 0; i < listBaseResponse.getData().size(); i++) { - Map data = new HashMap<>(); - data.put("num", i + 1); - data.put("ydName", listBaseResponse.getData().get(i).getSupplierRegisterName()); - data.put("tbPrice", listBaseResponse.getData().get(i).getBidContent()); - data.put("psPrice", listBaseResponse.getData().get(i).getEvaluatingContent()); - if (i == 0) { - data.put("lowPrice", minPrice); - data.put("avgPrice", avgPrice); - } else { - data.put("lowPrice", ""); - data.put("avgPrice", ""); - } - data.put("jgScore", listBaseResponse.getData().get(i).getPriceScore()); - maps.add(data); - } + if(listBaseResponse!=null && listBaseResponse.getData() !=null){ + //最小价格 + BigDecimal minPrice = listBaseResponse.getData().stream().map(SupplierRegisterPriceScoreVO::getBidContent).min((x1, x2) -> x1.compareTo(x2)).get(); + //平均价格 + BigDecimal avgPrice = listBaseResponse.getData().stream().map(SupplierRegisterPriceScoreVO::getBidContent).reduce(BigDecimal.ZERO, BigDecimal::add). + divide(BigDecimal.valueOf(listBaseResponse.getData().size()), 2, BigDecimal.ROUND_HALF_UP); - // 创建工作簿 - SXSSFWorkbook wb = new SXSSFWorkbook(); - //表格样式 - CellStyle cellStyle = wb.createCellStyle(); - //水平居中 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - //垂直居中 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - //边框 - cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + ArrayList> maps = new ArrayList<>(); - // 创建表格， - Sheet sheet = wb.createSheet("价格打分"); - sheet.createFreezePane(1, 1); - - int rowIndex = 0; - int colIndex = 0; - - // 价格打分 - CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6); - sheet.addMergedRegion(region); - Row title0 = sheet.createRow(rowIndex++); - Cell titleCell0 = title0.createCell(0); - title0.setHeightInPoints(35); - titleCell0.setCellValue("价格打分表"); - titleCell0.setCellStyle(cellStyle); - //项目名称 - CellRangeAddress region1 = new CellRangeAddress(1, 1, 0, 6); - sheet.addMergedRegion(region1); - Row title1 = sheet.createRow(rowIndex++); - Cell titleCell1 = title1.createCell(0); - titleCell1.setCellValue("项目名称 : " + list.getData().getProjectName()); - //招标编号 - CellRangeAddress region2 = new CellRangeAddress(2, 2, 0, 6); - sheet.addMergedRegion(region2); - Row title2 = sheet.createRow(rowIndex++); - Cell titleCell2 = title2.createCell(0); - titleCell2.setCellValue("招标编号 : " + list.getData().getBidSectName()); - - //标题行 - Row titleRow = sheet.createRow(rowIndex++); - // 设置高度为30 - titleRow.setHeightInPoints(30); - - for (String title : titles) { - sheet.setColumnWidth(colIndex, 17 * 256); - Cell titleCell = titleRow.createCell(colIndex++); - titleCell.setCellValue(title); - //设置样式 - titleCell.setCellStyle(cellStyle); - } - - - // 遍历结果数据 - for (Map item : maps) { - // 创建数据行 - Row activityRow = sheet.createRow(rowIndex++); - // 重置列索引 - colIndex = 0; - for (String key : keys) { - String value = item.get(key).toString(); - Cell valueCell = activityRow.createCell(colIndex++); - valueCell.setCellValue(value); - valueCell.setCellStyle(cellStyle);//设置样式 + for (int i = 0; i < listBaseResponse.getData().size(); i++) { + Map data = new HashMap<>(); + data.put("num", i + 1); + data.put("ydName", listBaseResponse.getData().get(i).getSupplierRegisterName()); + data.put("tbPrice", listBaseResponse.getData().get(i).getBidContent()); + data.put("psPrice", listBaseResponse.getData().get(i).getEvaluatingContent()); + if (i == 0) { + data.put("lowPrice", minPrice); + data.put("avgPrice", avgPrice); + } else { + data.put("lowPrice", ""); + data.put("avgPrice", ""); + } + data.put("jgScore", listBaseResponse.getData().get(i).getPriceScore()); + maps.add(data); } - } + // 创建工作簿 + SXSSFWorkbook wb = new SXSSFWorkbook(); + //表格样式 + CellStyle cellStyle = wb.createCellStyle(); + //水平居中 + cellStyle.setAlignment(HorizontalAlignment.CENTER); + //垂直居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + //边框 + cellStyle.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle.setBorderLeft(BorderStyle.THIN);//左边框 + cellStyle.setBorderTop(BorderStyle.THIN);//上边框 + cellStyle.setBorderRight(BorderStyle.THIN);//右边框 + // 创建表格， + Sheet sheet = wb.createSheet("价格打分"); + sheet.createFreezePane(1, 1); - CellRangeAddress region3 = new CellRangeAddress(4, (4 + maps.size() - 1), 4, 4); - sheet.addMergedRegion(region3); + int rowIndex = 0; + int colIndex = 0; - CellRangeAddress region4 = new CellRangeAddress(4, (4 + maps.size() - 1), 5, 5); - sheet.addMergedRegion(region4); + // 价格打分 + CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6); + sheet.addMergedRegion(region); + Row title0 = sheet.createRow(rowIndex++); + Cell titleCell0 = title0.createCell(0); + title0.setHeightInPoints(35); + titleCell0.setCellValue("价格打分表"); + titleCell0.setCellStyle(cellStyle); + //项目名称 + CellRangeAddress region1 = new CellRangeAddress(1, 1, 0, 6); + sheet.addMergedRegion(region1); + Row title1 = sheet.createRow(rowIndex++); + Cell titleCell1 = title1.createCell(0); + titleCell1.setCellValue("项目名称 : " + list.getData().getProjectName()); + //招标编号 + CellRangeAddress region2 = new CellRangeAddress(2, 2, 0, 6); + sheet.addMergedRegion(region2); + Row title2 = sheet.createRow(rowIndex++); + Cell titleCell2 = title2.createCell(0); + titleCell2.setCellValue("招标编号 : " + list.getData().getBidSectName()); + //标题行 + Row titleRow = sheet.createRow(rowIndex++); + // 设置高度为30 + titleRow.setHeightInPoints(30); - //价格打分说明 - CellStyle cellStyle0 = wb.createCellStyle(); - //边框 - cellStyle0.setBorderBottom(BorderStyle.THIN); //下边框 - cellStyle0.setBorderLeft(BorderStyle.THIN);//左边框 - cellStyle0.setBorderTop(BorderStyle.THIN);//上边框 - cellStyle0.setBorderRight(BorderStyle.THIN);//右边框 - cellStyle0.setVerticalAlignment(VerticalAlignment.CENTER); - String description = "价格打分说明 ："; - CellRangeAddress region5 = new CellRangeAddress((4 + maps.size()), (4 + maps.size()), 0, 6); - sheet.addMergedRegion(region5); - Row titleLast2 = sheet.createRow(rowIndex++); - titleLast2.setHeightInPoints(40); - for (int i = 0; i < 7; i++) { - Cell valueCell = titleLast2.createCell(i); - if (i == 0) { - valueCell.setCellValue(description); - } else { - valueCell.setCellValue(""); + for (String title : titles) { + sheet.setColumnWidth(colIndex, 17 * 256); + Cell titleCell = titleRow.createCell(colIndex++); + titleCell.setCellValue(title); + //设置样式 + titleCell.setCellStyle(cellStyle); } - valueCell.setCellStyle(cellStyle0); + + + // 遍历结果数据 + for (Map item : maps) { + // 创建数据行 + Row activityRow = sheet.createRow(rowIndex++); + // 重置列索引 + colIndex = 0; + for (String key : keys) { + String value = item.get(key).toString(); + Cell valueCell = activityRow.createCell(colIndex++); + valueCell.setCellValue(value); + valueCell.setCellStyle(cellStyle);//设置样式 + } + + } + + + CellRangeAddress region3 = new CellRangeAddress(4, (4 + maps.size() - 1), 4, 4); + sheet.addMergedRegion(region3); + + CellRangeAddress region4 = new CellRangeAddress(4, (4 + maps.size() - 1), 5, 5); + sheet.addMergedRegion(region4); + + + //价格打分说明 + CellStyle cellStyle0 = wb.createCellStyle(); + //边框 + cellStyle0.setBorderBottom(BorderStyle.THIN); //下边框 + cellStyle0.setBorderLeft(BorderStyle.THIN);//左边框 + cellStyle0.setBorderTop(BorderStyle.THIN);//上边框 + cellStyle0.setBorderRight(BorderStyle.THIN);//右边框 + cellStyle0.setVerticalAlignment(VerticalAlignment.CENTER); + String description = "价格打分说明 ："; + CellRangeAddress region5 = new CellRangeAddress((4 + maps.size()), (4 + maps.size()), 0, 6); + sheet.addMergedRegion(region5); + Row titleLast2 = sheet.createRow(rowIndex++); + titleLast2.setHeightInPoints(40); + for (int i = 0; i < 7; i++) { + Cell valueCell = titleLast2.createCell(i); + if (i == 0) { + valueCell.setCellValue(description); + } else { + valueCell.setCellValue(""); + } + valueCell.setCellStyle(cellStyle0); + } + + + //签名行 + Row titleLast1 = sheet.createRow(rowIndex++); + Cell titleCellLast1 = titleLast1.createCell(0); + titleCellLast1.setCellValue("全体委员签字 ："); + CellRangeAddress region6 = new CellRangeAddress((4 + maps.size() + 1), (4 + maps.size() + 1), 0, 6); + sheet.addMergedRegion(region6); + //时间行 + CellStyle cellStyle1 = wb.createCellStyle(); + cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); + cellStyle1.setAlignment(HorizontalAlignment.RIGHT); + Row title6 = sheet.createRow(rowIndex++); + Cell titleCell6 = title6.createCell(0); + Date date = new Date(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy 年 MM 月 dd 日 "); + titleCell6.setCellValue("日期: " + sdf.format(date)); + titleCell6.setCellStyle(cellStyle1); + CellRangeAddress region7 = new CellRangeAddress(rowIndex - 1, rowIndex - 1, 0, 6); + sheet.addMergedRegion(region7); + + String filename = "价格打分.xls"; + filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); + response.reset(); + response.setContentType("application/octet-stream;charset=utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes("UTF-8"), "ISO8859-1"))); + wb.write(response.getOutputStream()); + } - - //签名行 - Row titleLast1 = sheet.createRow(rowIndex++); - Cell titleCellLast1 = titleLast1.createCell(0); - titleCellLast1.setCellValue("全体委员签字 ："); - CellRangeAddress region6 = new CellRangeAddress((4 + maps.size() + 1), (4 + maps.size() + 1), 0, 6); - sheet.addMergedRegion(region6); - //时间行 - CellStyle cellStyle1 = wb.createCellStyle(); - cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); - cellStyle1.setAlignment(HorizontalAlignment.RIGHT); - Row title6 = sheet.createRow(rowIndex++); - Cell titleCell6 = title6.createCell(0); - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy 年 MM 月 dd 日 "); - titleCell6.setCellValue("日期: " + sdf.format(date)); - titleCell6.setCellStyle(cellStyle1); - CellRangeAddress region7 = new CellRangeAddress(rowIndex - 1, rowIndex - 1, 0, 6); - sheet.addMergedRegion(region7); - - String filename = "价格打分.xls"; - filename = filename.substring(0, filename.lastIndexOf('.')) + filename.substring(filename.lastIndexOf('.')); - response.reset(); - response.setContentType("application/octet-stream;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String(filename.getBytes("UTF-8"), "ISO8859-1"))); - wb.write(response.getOutputStream()); - + return BaseResponse.fail(ERROR_MESSAGE); } @@ -918,6 +916,7 @@ public class ExportController { bidEvalInfoDTO.setReviewType(parame.getReviewType()); //供应商 List listBaseResponse = exportService.findRegisterAndUser(bidEvalInfoDTO).getData(); + //列头 StringBuffer titles0 = new StringBuffer("序号,评审因素,评审标准"); //供应商 顺序 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx index cf4db72..809e86d 100644 Binary files a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx and b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/model/开标记录表.docx differ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java index 94930e1..3e52402 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/services/ExportServiceOpen.java @@ -36,7 +36,6 @@ public interface ExportServiceOpen { * @return */ @ApiOperation("查询数据") -// @GetMapping("/v1/bizbidopenroom/list") @PostMapping ("/v1/bizbidopenroom/getPostlist") BaseResponse> list(@ApiParam(value = "查询对象数据", required = false) BizBidOpenroom bizBidOpenroom);