From 33e9073e1c866e76a4ed5a20fa281e394fedf686 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 29 Dec 2022 15:52:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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 --- .../resume/po/PersonnelResumeColumn.java | 22 +++++ .../entity/resume/po/PersonnelResumePO.java | 79 +++++++++++++++++ .../resume/po/PersonnelResumeTable.java | 23 +++++ .../mapper/resource/HrmResourceMapper.java | 3 + .../mapper/resource/HrmResourceMapper.xml | 22 +++++ .../service/PersonnelResumeService.java | 8 ++ .../impl/PersonnelResumeServiceImpl.java | 86 +++++++++++++++++++ .../web/PersonnelResumeController.java | 16 ++++ .../wrapper/PersonnelResumeWrapper.java | 4 + 9 files changed, 263 insertions(+) create mode 100644 src/com/engine/organization/entity/resume/po/PersonnelResumeColumn.java create mode 100644 src/com/engine/organization/entity/resume/po/PersonnelResumePO.java create mode 100644 src/com/engine/organization/entity/resume/po/PersonnelResumeTable.java diff --git a/src/com/engine/organization/entity/resume/po/PersonnelResumeColumn.java b/src/com/engine/organization/entity/resume/po/PersonnelResumeColumn.java new file mode 100644 index 00000000..0f6cc06e --- /dev/null +++ b/src/com/engine/organization/entity/resume/po/PersonnelResumeColumn.java @@ -0,0 +1,22 @@ +package com.engine.organization.entity.resume.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/12/29 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class PersonnelResumeColumn { + private String name; + private String value; + private Integer colspans; + private Integer rowspans; +} diff --git a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java new file mode 100644 index 00000000..4eba90f1 --- /dev/null +++ b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java @@ -0,0 +1,79 @@ +package com.engine.organization.entity.resume.po; + +import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.util.IOUtils; +import weaver.file.ImageFileManager; +import weaver.general.Util; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Base64; + +/** + * @author:dxfeng + * @createTime: 2022/12/29 + * @version: 1.0 + */ +@Data +public class PersonnelResumePO { + private String lastName; + private String sex; + private String birthday; + // resourceImageId; + private String image; + private String nativePlace; + // policy; + private String politics; + // departmentid; + private String department; + // maritalStatus; + private String marriage; + private String jobTitle; + private String companyStartDate; + private String workStartDate; + // certificatenum + private String idCard; + // homeaddress + private String address; + private String telephone; + private String email; + private String selfStatement; + + public String getSex() { + if ("1".equals(sex)) { + return "女"; + } + return "男"; + } + + public String getImage() { + if (StringUtils.isBlank(image)) { + return ""; + } + ImageFileManager manager = new ImageFileManager(); + manager.getImageFileInfoById(Util.getIntValue(image)); + InputStream inputStream = manager.getInputStream(); + try { + return "data:image/" + manager.getImageFileType() + ";base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(inputStream)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + + public String getMarriage() { + if (StringUtils.isBlank(marriage)) { + return "未婚"; + } + switch (marriage) { + case "1": + return "已婚"; + case "2": + return "离异"; + case "0": + default: + return "未婚"; + } + } +} diff --git a/src/com/engine/organization/entity/resume/po/PersonnelResumeTable.java b/src/com/engine/organization/entity/resume/po/PersonnelResumeTable.java new file mode 100644 index 00000000..012e656f --- /dev/null +++ b/src/com/engine/organization/entity/resume/po/PersonnelResumeTable.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.resume.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author:dxfeng + * @createTime: 2022/12/29 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class PersonnelResumeTable { + private String title; + private List columns; + private List> datas; +} diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 866eaa98..09ec695f 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -1,6 +1,7 @@ package com.engine.organization.mapper.resource; import com.engine.organization.entity.hrmresource.po.ResourcePO; +import com.engine.organization.entity.resume.po.PersonnelResumePO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,4 +18,6 @@ public interface HrmResourceMapper { List listByFilter(@Param("resourcePO") ResourcePO resourcePO); + PersonnelResumePO getPersonnelResumeById(@Param("id") Integer id); + } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 87206743..1d5e20e2 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -29,6 +29,28 @@ and jobtitle = #{resourcePO.jobtitle} + diff --git a/src/com/engine/organization/service/PersonnelResumeService.java b/src/com/engine/organization/service/PersonnelResumeService.java index cedc5cf7..28b83ab2 100644 --- a/src/com/engine/organization/service/PersonnelResumeService.java +++ b/src/com/engine/organization/service/PersonnelResumeService.java @@ -18,6 +18,14 @@ public interface PersonnelResumeService { */ Map getSearchTree(SearchTreeParams params); + /** + * 获取人员简历列表 + * + * @param uId + * @return + */ + Map getResumeList(Integer uId); + /** * 获取列表页面按钮信息 * diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index 192e0a75..bc886a4b 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -10,6 +10,9 @@ import com.engine.organization.entity.hrmresource.bo.ResourceBO; import com.engine.organization.entity.hrmresource.po.ResourcePO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.entity.resume.po.PersonnelResumeColumn; +import com.engine.organization.entity.resume.po.PersonnelResumePO; +import com.engine.organization.entity.resume.po.PersonnelResumeTable; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.enums.ModuleTypeEnum; @@ -19,6 +22,7 @@ import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.resource.HrmResourceMapper; import com.engine.organization.service.PersonnelResumeService; import com.engine.organization.util.MenuBtn; +import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.detach.DetachUtil; import com.engine.organization.util.page.PageUtil; @@ -63,6 +67,88 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu return SearchTreeUtil.getSearchTree(type, treeList); } + @Override + public Map getResumeList(Integer uId) { + Map resultMap = new HashMap<>(); + // 根据ID查询用户信息 + PersonnelResumePO personnelResumePO = getHrmResourceMapper().getPersonnelResumeById(uId); + OrganizationAssert.notNull(personnelResumePO, "未找到对应人员"); + resultMap.put("lastName", Util.null2String(personnelResumePO.getLastName())); + resultMap.put("sex", Util.null2String(personnelResumePO.getSex())); + resultMap.put("birthday", Util.null2String(personnelResumePO.getBirthday())); + resultMap.put("image", Util.null2String(personnelResumePO.getImage())); + resultMap.put("native", Util.null2String(personnelResumePO.getNativePlace())); + resultMap.put("politics", Util.null2String(personnelResumePO.getPolitics())); + resultMap.put("department", Util.null2String(personnelResumePO.getDepartment())); + resultMap.put("marriage", Util.null2String(personnelResumePO.getMarriage())); + resultMap.put("jobtitle", Util.null2String(personnelResumePO.getJobTitle())); + resultMap.put("companystartdate", Util.null2String(personnelResumePO.getCompanyStartDate())); + resultMap.put("workstartdate", Util.null2String(personnelResumePO.getWorkStartDate())); + resultMap.put("idCard", Util.null2String(personnelResumePO.getIdCard())); + resultMap.put("address", Util.null2String(personnelResumePO.getAddress())); + resultMap.put("telephone", Util.null2String(personnelResumePO.getTelephone())); + resultMap.put("email", Util.null2String(personnelResumePO.getEmail())); + resultMap.put("selfStatement", ""); + + // 简历相关表格，待拓展 + List tables = new ArrayList<>(); + List columns1 = new ArrayList<>(); + List columns2 = new ArrayList<>(); + + List datas1 = new ArrayList<>(); + List datas2 = new ArrayList<>(); + List datas3 = new ArrayList<>(); + List datas4 = new ArrayList<>(); + columns1.add(PersonnelResumeColumn.builder().name("首次参保时间").colspans(2).rowspans(1).build()); + columns1.add(PersonnelResumeColumn.builder().name("养老保险").colspans(1).rowspans(1).build()); + columns1.add(PersonnelResumeColumn.builder().name("医疗保险").colspans(1).rowspans(1).build()); + columns1.add(PersonnelResumeColumn.builder().name("失业保险").colspans(1).rowspans(1).build()); + 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()); + tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(columns1).datas(Collections.singletonList(datas1)).build()); + + columns2.add(PersonnelResumeColumn.builder().name("关系").colspans(2).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("姓名").colspans(1).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("工作单位及职务").colspans(1).rowspans(1).build()); + 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()); + List> objects = new ArrayList<>(); + objects.add(datas2); + objects.add(datas3); + objects.add(datas4); + tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(columns2).datas(objects).build()); + + + resultMap.put("tables", tables); + + return resultMap; + } + @Override public Map hasRight() { Map resultMap = new HashMap<>(); diff --git a/src/com/engine/organization/web/PersonnelResumeController.java b/src/com/engine/organization/web/PersonnelResumeController.java index d3fe3002..f09053b3 100644 --- a/src/com/engine/organization/web/PersonnelResumeController.java +++ b/src/com/engine/organization/web/PersonnelResumeController.java @@ -7,6 +7,7 @@ import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.PersonnelResumeWrapper; +import weaver.general.Util; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -59,4 +60,19 @@ public class PersonnelResumeController { } + @GET + @Path("/getResumeList") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getResumeList(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + Integer uId = Integer.parseInt(Util.null2String(map.get("id"))); + return ReturnResult.successed(getPersonnelResumeWrapper(user).getResumeList(uId)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + + } + } diff --git a/src/com/engine/organization/wrapper/PersonnelResumeWrapper.java b/src/com/engine/organization/wrapper/PersonnelResumeWrapper.java index 0ec90153..460b3fc2 100644 --- a/src/com/engine/organization/wrapper/PersonnelResumeWrapper.java +++ b/src/com/engine/organization/wrapper/PersonnelResumeWrapper.java @@ -26,4 +26,8 @@ public class PersonnelResumeWrapper extends OrganizationWrapper { public Map hasRight() { return getPersonnelResumeService(user).hasRight(); } + + public Map getResumeList(Integer uId) { + return getPersonnelResumeService(user).getResumeList(uId); + } } From ea22378df0b0dada19c23137f5039b10297d1d0c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 29 Dec 2022 17:49:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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 | 42 +++++++++---------- 4 files changed, 38 insertions(+), 27 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()); + 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().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()); + 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().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()); + 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); From 702092c5a261dec174d7e29acecb7d91a82efda9 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 30 Dec 2022 09:39:16 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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/resume/po/PersonnelResumePO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java index d5d603ff..1206bf87 100644 --- a/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java +++ b/src/com/engine/organization/entity/resume/po/PersonnelResumePO.java @@ -61,6 +61,16 @@ public class PersonnelResumePO { String outPutPath = GCONST.getRootPath() + "hrm" + File.separator + "import" + File.separator + "template" + File.separator + manager.getImageFileName(); File f = new File(outPutPath); + if (!f.exists()) { + String substring = outPutPath.substring(0, outPutPath.lastIndexOf(File.separator)); + File file = new File(substring); + if (file.mkdirs()) { + boolean newFile = f.createNewFile(); + if (!newFile) { + throw new IOException(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)); From c41716318d390b9ee196b2ed8caf5ebd267c70d3 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 30 Dec 2022 10:16:48 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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/resume/po/HrmFamilyInfoPO.java | 21 +++++++++ .../mapper/resource/HrmResourceMapper.java | 3 ++ .../mapper/resource/HrmResourceMapper.xml | 19 +++++--- .../impl/PersonnelResumeServiceImpl.java | 47 +++++++++---------- 4 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 src/com/engine/organization/entity/resume/po/HrmFamilyInfoPO.java diff --git a/src/com/engine/organization/entity/resume/po/HrmFamilyInfoPO.java b/src/com/engine/organization/entity/resume/po/HrmFamilyInfoPO.java new file mode 100644 index 00000000..f70a854a --- /dev/null +++ b/src/com/engine/organization/entity/resume/po/HrmFamilyInfoPO.java @@ -0,0 +1,21 @@ +package com.engine.organization.entity.resume.po; + +import lombok.Data; + +/** + * @author:dxfeng + * @createTime: 2022/12/30 + * @version: 1.0 + */ +@Data +public class HrmFamilyInfoPO { + private Integer resourceId; + private String member; + private String title; + private String company; + private String jobTitle; + private String address; + private String uuid; + private String birthday; + private Integer whetherChildren; +} diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 09ec695f..e303bd30 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -1,6 +1,7 @@ package com.engine.organization.mapper.resource; import com.engine.organization.entity.hrmresource.po.ResourcePO; +import com.engine.organization.entity.resume.po.HrmFamilyInfoPO; import com.engine.organization.entity.resume.po.PersonnelResumePO; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,6 @@ public interface HrmResourceMapper { PersonnelResumePO getPersonnelResumeById(@Param("id") Integer id); + List getHrmFamilyInfoByUser(@Param("resourceId") Integer resourceId); + } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 22e9c4b5..8dae95f3 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -34,23 +34,28 @@ select lastname, sex, birthday, - resourceimageid as image, + resourceimageid as image, nativeplace, - policy as politics, + policy as politics, a.departmentname as department, - maritalstatus as marriage, - b.jobtitlename as jobTitle, + maritalstatus as marriage, + b.jobtitlename as jobTitle, companystartdate, workstartdate, - certificatenum as idCard, - residentplace as address, - mobile as telephone, + certificatenum as idCard, + residentplace as address, + mobile as telephone, email from hrmresource h inner join hrmdepartment a on a.id = h.departmentid inner join hrmjobtitles b on b.id = h.jobtitle where h.id = #{id} + diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index b5c4a6bd..ca98eb7f 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -10,6 +10,7 @@ import com.engine.organization.entity.hrmresource.bo.ResourceBO; import com.engine.organization.entity.hrmresource.po.ResourcePO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.entity.resume.po.HrmFamilyInfoPO; import com.engine.organization.entity.resume.po.PersonnelResumeColumn; import com.engine.organization.entity.resume.po.PersonnelResumePO; import com.engine.organization.entity.resume.po.PersonnelResumeTable; @@ -114,33 +115,29 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu 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()); - columns2.add(PersonnelResumeColumn.builder().name("姓名").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("工作单位及职务").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("联系电话").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("住址").colspans(2).rowspans(1).build()); + // 家庭情况 + columns2.add(PersonnelResumeColumn.builder().name("成员").colspans(1).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("称谓").colspans(1).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("工作单位").colspans(2).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("职务").colspans(1).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("地址").colspans(2).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("出生日期").colspans(1).rowspans(1).build()); + columns2.add(PersonnelResumeColumn.builder().name("是否子女").colspans(1).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 hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId); List> objects = new ArrayList<>(); - objects.add(datas2); - objects.add(datas3); - objects.add(datas4); + + for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) { + List datas = new ArrayList<>(); + datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); + datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getTitle()).colspans(1).rowspans(1).build()); + datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getCompany()).colspans(2).rowspans(1).build()); + datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getJobTitle()).colspans(1).rowspans(1).build()); + datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getAddress()).colspans(2).rowspans(1).build()); + datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getBirthday()).colspans(1).rowspans(1).build()); + datas.add(PersonnelResumeColumn.builder().value(1 == hrmFamilyInfoPO.getWhetherChildren() ? "是" : "否").colspans(1).rowspans(1).build()); + objects.add(datas); + } tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(columns2).datas(objects).build()); From df57b4e71fa4e0dcf8395c3cf5b7251d3186b76c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 30 Dec 2022 10:20:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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 --- .../impl/PersonnelResumeServiceImpl.java | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index ca98eb7f..05d465b0 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -93,52 +93,48 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu // 简历相关表格，待拓展 List tables = new ArrayList<>(); - List columns1 = new ArrayList<>(); - List columns2 = new ArrayList<>(); + List insurancesTitles = new ArrayList<>(); + List familyInfoTitles = new ArrayList<>(); - List datas1 = new ArrayList<>(); - List datas2 = new ArrayList<>(); - List datas3 = new ArrayList<>(); - List datas4 = new ArrayList<>(); - columns1.add(PersonnelResumeColumn.builder().name("首次参保时间").colspans(2).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("养老保险").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("医疗保险").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("失业保险").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("住房公积金").colspans(1).rowspans(1).build()); - columns1.add(PersonnelResumeColumn.builder().name("企业年金").colspans(1).rowspans(1).build()); + List insuranceDatas = new ArrayList<>(); + insurancesTitles.add(PersonnelResumeColumn.builder().name("首次参保时间").colspans(2).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("养老保险").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("医疗保险").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("失业保险").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("住房公积金").colspans(1).rowspans(1).build()); + insurancesTitles.add(PersonnelResumeColumn.builder().name("企业年金").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()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("2022-10-02").colspans(2).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("80").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("36").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("360").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("180").colspans(1).rowspans(1).build()); + insuranceDatas.add(PersonnelResumeColumn.builder().value("20000").colspans(1).rowspans(1).build()); + tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(insurancesTitles).datas(Collections.singletonList(insuranceDatas)).build()); // 家庭情况 - columns2.add(PersonnelResumeColumn.builder().name("成员").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("称谓").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("工作单位").colspans(2).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("职务").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("地址").colspans(2).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("出生日期").colspans(1).rowspans(1).build()); - columns2.add(PersonnelResumeColumn.builder().name("是否子女").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("成员").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("称谓").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("工作单位").colspans(2).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("职务").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("地址").colspans(2).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("出生日期").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("是否子女").colspans(1).rowspans(1).build()); List hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId); List> objects = new ArrayList<>(); - for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) { - List datas = new ArrayList<>(); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getTitle()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getCompany()).colspans(2).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getJobTitle()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getAddress()).colspans(2).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getBirthday()).colspans(1).rowspans(1).build()); - datas.add(PersonnelResumeColumn.builder().value(1 == hrmFamilyInfoPO.getWhetherChildren() ? "是" : "否").colspans(1).rowspans(1).build()); - objects.add(datas); + List familyInfoDatas = new ArrayList<>(); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getTitle()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getCompany()).colspans(2).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getJobTitle()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getAddress()).colspans(2).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getBirthday()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(1 == hrmFamilyInfoPO.getWhetherChildren() ? "是" : "否").colspans(1).rowspans(1).build()); + objects.add(familyInfoDatas); } - tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(columns2).datas(objects).build()); + tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(familyInfoTitles).datas(objects).build()); resultMap.put("tables", tables); From 687b580494dcbb7524ed7b0cda58d9d8742f12a9 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 30 Dec 2022 10:38:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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 --- .../service/impl/PersonnelResumeServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index 05d465b0..7e565f33 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -113,25 +113,22 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu tables.add(PersonnelResumeTable.builder().title("二、社会保险及住房公积金缴纳情况（单位/元）").columns(insurancesTitles).datas(Collections.singletonList(insuranceDatas)).build()); // 家庭情况 - familyInfoTitles.add(PersonnelResumeColumn.builder().name("成员").colspans(1).rowspans(1).build()); - familyInfoTitles.add(PersonnelResumeColumn.builder().name("称谓").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("关系").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("姓名").colspans(1).rowspans(1).build()); familyInfoTitles.add(PersonnelResumeColumn.builder().name("工作单位").colspans(2).rowspans(1).build()); familyInfoTitles.add(PersonnelResumeColumn.builder().name("职务").colspans(1).rowspans(1).build()); - familyInfoTitles.add(PersonnelResumeColumn.builder().name("地址").colspans(2).rowspans(1).build()); - familyInfoTitles.add(PersonnelResumeColumn.builder().name("出生日期").colspans(1).rowspans(1).build()); - familyInfoTitles.add(PersonnelResumeColumn.builder().name("是否子女").colspans(1).rowspans(1).build()); + familyInfoTitles.add(PersonnelResumeColumn.builder().name("住址").colspans(2).rowspans(1).build()); + List hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId); List> objects = new ArrayList<>(); for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) { List familyInfoDatas = new ArrayList<>(); - familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getTitle()).colspans(1).rowspans(1).build()); + familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getMember()).colspans(1).rowspans(1).build()); familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getCompany()).colspans(2).rowspans(1).build()); familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getJobTitle()).colspans(1).rowspans(1).build()); familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getAddress()).colspans(2).rowspans(1).build()); - familyInfoDatas.add(PersonnelResumeColumn.builder().value(hrmFamilyInfoPO.getBirthday()).colspans(1).rowspans(1).build()); - familyInfoDatas.add(PersonnelResumeColumn.builder().value(1 == hrmFamilyInfoPO.getWhetherChildren() ? "是" : "否").colspans(1).rowspans(1).build()); objects.add(familyInfoDatas); } tables.add(PersonnelResumeTable.builder().title("三、家庭成员信息（包括父母、配偶、子女）").columns(familyInfoTitles).datas(objects).build()); From dde1d0d0dbce14133f79e5e681d871f6b58f825c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 30 Dec 2022 10:40:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E7=9B=B8=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 --- .../service/impl/PersonnelResumeServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index 7e565f33..3b26cf91 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -148,15 +148,15 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu // 新增 topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build()); topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build()); resultMap.put("topMenu", topMenuList); // 新增 rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build()); rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("MergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("AllExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build()); resultMap.put("rightMenu", rightMenuList); return resultMap;