From ea22378df0b0dada19c23137f5039b10297d1d0c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 29 Dec 2022 17:49:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/hrmresource/bo/ResourceBO.java | 2 +- .../entity/resume/po/PersonnelResumePO.java | 17 +++++-- .../mapper/resource/HrmResourceMapper.xml | 4 +- .../impl/PersonnelResumeServiceImpl.java | 46 +++++++++---------- 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java b/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java index 016f65e7..2c0cefca 100644 --- a/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java +++ b/src/com/engine/organization/entity/hrmresource/bo/ResourceBO.java @@ -26,7 +26,7 @@ public class ResourceBO { tree.setName(item.getLastName()); tree.setPid("0"); tree.setSelected(false); - tree.setType("3"); + tree.setType("4"); tree.setParentComp(null == item.getJobId() ? "0" : item.getJobId().toString()); tree.setOrderNum(null == item.getDspOrder() ? 0 : item.getDspOrder()); return tree; diff --git a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java index 4eba90f1..d5d603ff 100644 --- a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java +++ b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java @@ -1,13 +1,15 @@ package com.engine.organization.entity.resume.po; import lombok.Data; +import net.coobird.thumbnailator.Thumbnails; import org.apache.commons.lang3.StringUtils; import org.apache.poi.util.IOUtils; import weaver.file.ImageFileManager; +import weaver.general.GCONST; import weaver.general.Util; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; +import java.nio.file.Files; import java.util.Base64; /** @@ -54,11 +56,20 @@ public class PersonnelResumePO { ImageFileManager manager = new ImageFileManager(); manager.getImageFileInfoById(Util.getIntValue(image)); InputStream inputStream = manager.getInputStream(); + String imageStr = ""; try { - return "data:image/" + manager.getImageFileType() + ";base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(inputStream)); + String outPutPath = GCONST.getRootPath() + "hrm" + File.separator + "import" + File.separator + "template" + File.separator + + manager.getImageFileName(); + File f = new File(outPutPath); + Thumbnails.of(inputStream).forceSize(100, 120).toFile(f); + InputStream fileInputStream = Files.newInputStream(f.toPath()); + imageStr = "data:image/" + manager.getImageFileType() + ";base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(fileInputStream)); + // 删除文件 + f.delete(); } catch (IOException e) { throw new RuntimeException(e); } + return imageStr; } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 1d5e20e2..22e9c4b5 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -43,8 +43,8 @@ companystartdate, workstartdate, certificatenum as idCard, - homeaddress as address, - telephone, + residentplace as address, + mobile as telephone, email from hrmresource h inner join hrmdepartment a on a.id = h.departmentid diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index bc886a4b..b5c4a6bd 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -106,12 +106,12 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu columns1.add(PersonnelResumeColumn.builder().name("住房公积金").colspans(1).rowspans(1).build()); columns1.add(PersonnelResumeColumn.builder().name("企业年金").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().name("2022-10-02").colspans(2).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().name("80").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().name("36").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().name("360").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().name("180").colspans(1).rowspans(1).build()); - datas1.add(PersonnelResumeColumn.builder().name("20000").colspans(1).rowspans(1).build()); + datas1.add(PersonnelResumeColumn.builder().value("2022-10-02").colspans(2).rowspans(1).build()); + datas1.add(PersonnelResumeColumn.builder().value("80").colspans(1).rowspans(1).build()); + datas1.add(PersonnelResumeColumn.builder().value("36").colspans(1).rowspans(1).build()); + datas1.add(PersonnelResumeColumn.builder().value("360").colspans(1).rowspans(1).build()); + datas1.add(PersonnelResumeColumn.builder().value("180").colspans(1).rowspans(1).build()); + datas1.add(PersonnelResumeColumn.builder().value("20000").colspans(1).rowspans(1).build()); tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(columns1).datas(Collections.singletonList(datas1)).build()); columns2.add(PersonnelResumeColumn.builder().name("关系").colspans(2).rowspans(1).build()); @@ -120,23 +120,23 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu columns2.add(PersonnelResumeColumn.builder().name("联系电话").colspans(1).rowspans(1).build()); columns2.add(PersonnelResumeColumn.builder().name("住址").colspans(2).rowspans(1).build()); - datas2.add(PersonnelResumeColumn.builder().name("父子").colspans(2).rowspans(1).build()); - datas2.add(PersonnelResumeColumn.builder().name("徐晓").colspans(1).rowspans(1).build()); - datas2.add(PersonnelResumeColumn.builder().name("北凉王").colspans(1).rowspans(1).build()); - datas2.add(PersonnelResumeColumn.builder().name("1589756859").colspans(1).rowspans(1).build()); - datas2.add(PersonnelResumeColumn.builder().name("江苏省南京市北凉军营").colspans(2).rowspans(1).build()); - - datas3.add(PersonnelResumeColumn.builder().name("母子").colspans(2).rowspans(1).build()); - datas3.add(PersonnelResumeColumn.builder().name("吴素").colspans(1).rowspans(1).build()); - datas3.add(PersonnelResumeColumn.builder().name("北凉王妃").colspans(1).rowspans(1).build()); - datas3.add(PersonnelResumeColumn.builder().name("15897566487").colspans(1).rowspans(1).build()); - datas3.add(PersonnelResumeColumn.builder().name("江苏省南京市北凉龙雀军团").colspans(2).rowspans(1).build()); - - datas4.add(PersonnelResumeColumn.builder().name("女儿").colspans(2).rowspans(1).build()); - datas4.add(PersonnelResumeColumn.builder().name("徐念凉").colspans(1).rowspans(1).build()); - datas4.add(PersonnelResumeColumn.builder().name("北凉公主").colspans(1).rowspans(1).build()); - datas4.add(PersonnelResumeColumn.builder().name("15897566587").colspans(1).rowspans(1).build()); - datas4.add(PersonnelResumeColumn.builder().name("莽荒之地").colspans(2).rowspans(1).build()); + datas2.add(PersonnelResumeColumn.builder().value("父子").colspans(2).rowspans(1).build()); + datas2.add(PersonnelResumeColumn.builder().value("徐晓").colspans(1).rowspans(1).build()); + datas2.add(PersonnelResumeColumn.builder().value("北凉王").colspans(1).rowspans(1).build()); + datas2.add(PersonnelResumeColumn.builder().value("1589756859").colspans(1).rowspans(1).build()); + datas2.add(PersonnelResumeColumn.builder().value("江苏省南京市北凉军营").colspans(2).rowspans(1).build()); + + datas3.add(PersonnelResumeColumn.builder().value("母子").colspans(2).rowspans(1).build()); + datas3.add(PersonnelResumeColumn.builder().value("吴素").colspans(1).rowspans(1).build()); + datas3.add(PersonnelResumeColumn.builder().value("北凉王妃").colspans(1).rowspans(1).build()); + datas3.add(PersonnelResumeColumn.builder().value("15897566487").colspans(1).rowspans(1).build()); + datas3.add(PersonnelResumeColumn.builder().value("江苏省南京市北凉龙雀军团").colspans(2).rowspans(1).build()); + + datas4.add(PersonnelResumeColumn.builder().value("女儿").colspans(2).rowspans(1).build()); + datas4.add(PersonnelResumeColumn.builder().value("徐念凉").colspans(1).rowspans(1).build()); + datas4.add(PersonnelResumeColumn.builder().value("北凉公主").colspans(1).rowspans(1).build()); + datas4.add(PersonnelResumeColumn.builder().value("15897566587").colspans(1).rowspans(1).build()); + datas4.add(PersonnelResumeColumn.builder().value("莽荒之地").colspans(2).rowspans(1).build()); List> objects = new ArrayList<>(); objects.add(datas2); objects.add(datas3);