From 1a883fba7256ceb493fc293bb986ffc38f9637cd Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 9 Apr 2025 13:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=9B=E8=99=B9=E7=AE=80=E5=8E=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/shkjsecond/entity/WorkInfo.java | 8 +++- .../impl/PersonnelResumeServiceImpl.java | 37 ++++++++++--------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/com/engine/shkjsecond/entity/WorkInfo.java b/src/com/engine/shkjsecond/entity/WorkInfo.java index c25b042..3813f9b 100644 --- a/src/com/engine/shkjsecond/entity/WorkInfo.java +++ b/src/com/engine/shkjsecond/entity/WorkInfo.java @@ -20,7 +20,13 @@ public class WorkInfo { private String startAndEndDate; - private String companyAndDepartment; + private String startDate; + + private String endDate; + + private String subCompany; + + private String department; private String position; diff --git a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java index 35b0f71..3552fae 100644 --- a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java @@ -120,18 +120,20 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu for (WorkInfo workInfo : workInfos){ List workTr = new ArrayList<>(); - workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getStartAndEndDate()).rowspans(1).build()); - workTr.add(PersonnelResumeTd.builder().colspans(3).value(workInfo.getCompanyAndDepartment()).rowspans(1).build()); + workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getStartDate()).rowspans(1).build()); + workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getEndDate()).rowspans(1).build()); + workTr.add(PersonnelResumeTd.builder().colspans(3).value(workInfo.getSubCompany()).rowspans(1).build()); + workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getDepartment()).rowspans(1).build()); workTr.add(PersonnelResumeTd.builder().colspans(1).value(workInfo.getPosition()).rowspans(1).build()); - workTr.add(PersonnelResumeTd.builder().colspans(2).value(workInfo.getPeopleAndMobile()).rowspans(1).build()); datas.add(workTr); } columns.add(PersonnelResumeTd.builder().colspans(1).value("工作经历(在盛虹工作经历)").rowspans(workInfos.size()+1).build()); - columns.add(PersonnelResumeTd.builder().colspans(1).value("起止时间").rowspans(1).build()); - columns.add(PersonnelResumeTd.builder().colspans(3).value("公司名称/部门").rowspans(1).build()); - columns.add(PersonnelResumeTd.builder().colspans(1).value("职位").rowspans(1).build()); - columns.add(PersonnelResumeTd.builder().colspans(2).value("证明人及联系方式").rowspans(1).build()); + columns.add(PersonnelResumeTd.builder().colspans(1).value("开始日期").rowspans(1).build()); + columns.add(PersonnelResumeTd.builder().colspans(1).value("结束日期").rowspans(1).build()); + columns.add(PersonnelResumeTd.builder().colspans(3).value("公司").rowspans(1).build()); + columns.add(PersonnelResumeTd.builder().colspans(1).value("部门").rowspans(1).build()); + columns.add(PersonnelResumeTd.builder().colspans(1).value("岗位").rowspans(1).build()); tables.add(PersonnelResumeTable.builder().columns(columns).datas(datas).build()); @@ -163,7 +165,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu private List selectFamilyInfo(String resourceId) { RecordSet rs = new RecordSet(); List familyInfoList = new ArrayList<>(); - rs.executeQuery("select jtcyxm,gx,nl,gzdw,zw,lxdh from uf_jtqk where xm = ?",resourceId); + rs.executeQuery("select jtcyxm,gx,nl,gzdw,zw,lxdh from uf_jtqk where xm1 = ?",resourceId); while (rs.next()) { familyInfoList.add(FamilyInfo.builder() .lastName(Util.null2String(rs.getString("jtcyxm"))) @@ -180,20 +182,21 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu private List selectWorkInfo(String resourceId) { RecordSet rs = new RecordSet(); List workInfoList = new ArrayList<>(); - rs.executeQuery("select ksrq,jsrq,gsmc,bm,zw,zmr,zmrlxfs from uf_gzjlsh where xm = ?",resourceId); + rs.executeQuery("select ksrq,jsrq,gsmc,bm,zw from uf_gzjlsh where xm1 = ?",resourceId); DepartmentComInfo deptComInfo = new DepartmentComInfo(); SubCompanyComInfo subComInfo = new SubCompanyComInfo(); ResourceComInfo rInfo = new ResourceComInfo(); JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo(); while (rs.next()) { - String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq")); - String bm = deptComInfo.getDepartmentName(Util.null2String(rs.getString("bm"))); - String companyAndDept = subComInfo.getSubCompanyname(Util.null2String(rs.getString("gsmc"))) + " / " + bm; + //String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq")); + String departmentName = deptComInfo.getDepartmentName(Util.null2String(rs.getString("bm"))); + String subCompanyname = subComInfo.getSubCompanyname(Util.null2String(rs.getString("gsmc"))); workInfoList.add(WorkInfo.builder() - .startAndEndDate(date) - .companyAndDepartment(companyAndDept) + .startDate(Util.null2String(rs.getString("ksrq"))) + .endDate(Util.null2String(rs.getString("jsrq"))) + .subCompany(subCompanyname) + .department(departmentName) .position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw")))) - .peopleAndMobile(rInfo.getLastname(Util.null2String(rs.getString("zmr"))) +" / " +Util.null2String(rs.getString("zmrlxfs"))) .build()); } return workInfoList; @@ -220,10 +223,10 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu RecordSet rs = new RecordSet(); EducationLevelComInfo eduComInfo = new EducationLevelComInfo(); ResourceComInfo resourceComInfo = new ResourceComInfo(); - String workcode = resourceComInfo.getWorkcode(resourceId); + //String workcode = resourceComInfo.getWorkcode(resourceId); List educationInfoList = new ArrayList<>(); - rs.executeQuery("select ksrq,jsrq,byyx,xl,xw,zy from uf_jyjl where bh = ?",workcode); + rs.executeQuery("select ksrq,jsrq,byyx,xl,xw,zy from uf_jyjl where xm1 = ?",resourceId); while (rs.next()) { String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq")); String educationalAndDegree = eduComInfo.getEducationLevelname(Util.null2String(rs.getString("xl"))) +" / "