From 67af9e28ca34392e110210cee821b8e4419c7cda Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Wed, 30 Apr 2025 10:27:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=B8=8B=E8=BD=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/tool/service/impl/EpcServiceImpl.java | 11 +++-------- .../com/bonus/tool/service/impl/SouthServiceImpl.java | 2 +- .../bonus/tool/service/impl/StateGridServiceImpl.java | 7 ++++--- search-tool/src/main/resources/download/GW.ftl | 2 +- .../src/main/resources/mapper/TbCompanyPerfMapper.xml | 6 +++++- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java index 0d0b536..d16f642 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/EpcServiceImpl.java @@ -196,10 +196,8 @@ public class EpcServiceImpl implements EpcService { List comOtherList = stateGridMapper.getFileSourceList(item.getId(),TableType.TB_SUB_PEOPLE.getCode()); personFileGroup(item, comOtherList); }); - //将数据转换为模版数据 - dealWithWordData(request,response,data); - + dealWithWordData(request,response,data,"EPC.ftl"); } } @@ -215,7 +213,7 @@ public class EpcServiceImpl implements EpcService { * @param response * @param tbData */ - private void dealWithWordData(HttpServletRequest request, HttpServletResponse response,TbGwModelVo tbData) { + public void dealWithWordData(HttpServletRequest request, HttpServletResponse response, TbGwModelVo tbData, String fileName) { try { Map data = new HashMap<>(16); List> list = new ArrayList<>(); @@ -283,9 +281,6 @@ public class EpcServiceImpl implements EpcService { } } - - - // 处理公司核心人员简历信息 if (tbData.getComCoreList() != null && !tbData.getComCoreList().isEmpty()) { for (int i = 0; i < tbData.getComCoreList().size(); i++) { @@ -462,7 +457,7 @@ public class EpcServiceImpl implements EpcService { data.put("list2", list2); data.put("tbr", tbData.getCreateUser() != null ? tbData.getCreateUser() : ""); // 导出Word文档 - WordUtils.exportMillCertificateWord(request, response, data, tbData.getName(), "EPC.ftl"); + WordUtils.exportMillCertificateWord(request, response, data, tbData.getName(), fileName); } catch (Exception e) { log.error("处理EPC模版下载数据失败", e); } diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/SouthServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/SouthServiceImpl.java index cf02c3d..9540c70 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/SouthServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/SouthServiceImpl.java @@ -199,7 +199,7 @@ public class SouthServiceImpl implements SouthService { List comOtherList = stateGridMapper.getFileSourceList(item.getId(),TableType.TB_SUB_PEOPLE.getCode()); personFileGroup(item, comOtherList); }); - epcServiceImpl.downloadEpcTemp(request, response, o); + epcServiceImpl.dealWithWordData(request, response, data, "NW.ftl"); } } diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java index 47e9511..f9f5df9 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java @@ -565,6 +565,7 @@ public class StateGridServiceImpl implements StateGridService { personMap.put("jlTitle", (item.getPostName() != null ? item.getPostName() : "项目经理") + "简历及证明材料"); personMap.put("userType", item.getPostName() != null ? item.getPostName() : "项目经理"); + personMap.put("zmcl", ""); // 处理简历信息 Map jlMap = new HashMap<>(); @@ -586,9 +587,9 @@ public class StateGridServiceImpl implements StateGridService { TbCompanyPerfVo tbCompanyPerfVo = peoplePerfList.get(i); Map yjMap = new HashMap<>(); yjMap.put("date", tbCompanyPerfVo.getStartTime()+"至"+tbCompanyPerfVo.getEndTime()); - yjMap.put("proName", tbCompanyPerfVo.getProName()); - yjMap.put("gm", tbCompanyPerfVo.getLineScale()+"km"); - yjMap.put("content", tbCompanyPerfVo.getContractRang()); + yjMap.put("proName", tbCompanyPerfVo.getProName() != null ? tbCompanyPerfVo.getProName() : ""); + yjMap.put("gm", tbCompanyPerfVo.getLineScale() != null ? tbCompanyPerfVo.getLineScale()+"km" : ""); + yjMap.put("content", tbCompanyPerfVo.getContractRang() != null ? tbCompanyPerfVo.getContractRang() : ""); yjMap.put("zw", item.getPostName() != null ? item.getPostName() : ""); yjList.add(yjMap); } diff --git a/search-tool/src/main/resources/download/GW.ftl b/search-tool/src/main/resources/download/GW.ftl index f49c696..7372448 100644 --- a/search-tool/src/main/resources/download/GW.ftl +++ b/search-tool/src/main/resources/download/GW.ftl @@ -7146,7 +7146,7 @@ - ${vo.zmcl} + ${vo.zmcl!"zmcl异常"} <#if vo.imgList ?? && (vo.imgList?size>0)> diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml index bef0b80..09fc2b3 100644 --- a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml @@ -85,6 +85,10 @@ tcp.pro_name, tcp.start_time, tcp.end_time, + tcp.line_scale, + tcp.contract_rang, + tcp.owner_unit, + tcp.owner_phone, tcp.voltage FROM tb_key_people tkp @@ -99,7 +103,7 @@ and tcp.id in - + #{item}