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

Merge branch 'uat' into 'master'

Browse Source 
解决报表打印bug

See merge request eshop/biz_service_ebtp_extend!84
This commit is contained in:
付庆吉
2022-05-27 11:13:01 +08:00
parent 95a7749aa8 f0e414713c
commit 70a5ed5ed8
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignImpl.java
View File

@ -25,9 +25,9 @@ import java.util.Map;
/** /**
* 评标委员会签字表 * 评审专家签到
*/ */
@Service("judgesSign") @Service("judgesSignIn")
@Slf4j @Slf4j
public class JudgesSignImpl implements ExportService { public class JudgesSignImpl implements ExportService {
@ -47,13 +47,13 @@ public class JudgesSignImpl implements ExportService {
*/ */
@Override @Override
public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) {
log.info("评标委员会签字表，ExportParam = {}", JsonUtils.objectToJson(param)); log.info("评审专家签到，ExportParam = {}", JsonUtils.objectToJson(param));
//项目和招标名称数据 //项目和招标名称数据
ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId()); ProjectSectionVO section = commonFeignService.projectGetSectionById(param.getSectionId());
log.info("评标委员会签字表 {}，查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(section)); log.info("评审专家签到 {}，查询项目信息 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(section));
//专家人员数据 //专家人员数据
List<JuryPrintVO> list = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); List<JuryPrintVO> list = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId());
log.info("评标委员会签字表 {}，查询专家人员数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(list)); log.info("评审专家签到 {}，查询专家人员数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(list));
ArrayList<Map<String, Object>> maps = new ArrayList<>(); ArrayList<Map<String, Object>> maps = new ArrayList<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
@ -80,7 +80,7 @@ public class JudgesSignImpl implements ExportService {
XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); XWPFTemplate template = XWPFTemplate.compile(file, config).render(all);
//导出的表格名称 //导出的表格名称
String dictName = commonFeignService.exportDictName(param.getId(), "评标委员会签字表") + ".docx"; String dictName = commonFeignService.exportDictName(param.getId(), "评审专家签到表") + ".docx";
String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
this.write(template, fileName, response); this.write(template, fileName, response);

10
src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/JudgesSignInImpl.java
View File

@ -23,9 +23,9 @@ import java.util.*;
/** /**
* 评审专家签到表 * 评审承诺书确认记录
*/ */
@Service("judgesSignIn") @Service("judgesSign")
@Slf4j @Slf4j
public class JudgesSignInImpl implements ExportService { public class JudgesSignInImpl implements ExportService {
@Autowired @Autowired
@ -43,10 +43,10 @@ public class JudgesSignInImpl implements ExportService {
@SneakyThrows @SneakyThrows
@Override @Override
public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) { public void doExport(ExportParam param, HttpServletRequest request, HttpServletResponse response) {
log.info("评审专家签到表，ExportParam = {}", JsonUtils.objectToJson(param)); log.info("评审承诺书确认记录，ExportParam = {}", JsonUtils.objectToJson(param));
//专家人员数据 //专家人员数据
List<JuryPrintVO> list = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId()); List<JuryPrintVO> list = commonFeignService.rsmsQueryReportPrintByRoomId(param.getAssessRoomId());
log.info("评标委员会签字表 {}，查询专家人员数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(list)); log.info("评审承诺书确认记录 {}，查询专家人员数据 = {}", param.getAssessRoomId(), JsonUtils.objectToJson(list));
ArrayList<Map<String, Object>> maps = new ArrayList<>(); ArrayList<Map<String, Object>> maps = new ArrayList<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
@ -69,7 +69,7 @@ public class JudgesSignInImpl implements ExportService {
Configure config = Configure.builder().bind("table", policy).build(); Configure config = Configure.builder().bind("table", policy).build();
XWPFTemplate template = XWPFTemplate.compile(file, config).render(all); XWPFTemplate template = XWPFTemplate.compile(file, config).render(all);
//导出的表格名称 //导出的表格名称
String dictName = commonFeignService.exportDictName(param.getId(), "评审专家签到表") + ".docx"; String dictName = commonFeignService.exportDictName(param.getId(), "评审承诺书确认记录表") + ".docx";
String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); String fileName = new String(dictName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
this.write(template, fileName, response); this.write(template, fileName, response);

BIN
src/main/resources/model/评审专家签到表.docx
View File

Binary file not shown.

BIN
src/main/resources/model/评审承诺书确认记录表.docx Normal file
View File

Binary file not shown.

BIN
src/main/resources/model/评标委员会签字表.docx
View File

Binary file not shown.