diff --git a/src/com/engine/shkjsecond/entity/WorkInfo.java b/src/com/engine/shkjsecond/entity/WorkInfo.java index 9ad2b6a..c25b042 100644 --- a/src/com/engine/shkjsecond/entity/WorkInfo.java +++ b/src/com/engine/shkjsecond/entity/WorkInfo.java @@ -24,7 +24,6 @@ public class WorkInfo { private String position; - private String people; + private String peopleAndMobile; - private String mobile; } diff --git a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java index 0c25008..772641c 100644 --- a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java @@ -123,7 +123,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu 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.getPosition()).rowspans(1).build()); - workTr.add(PersonnelResumeTd.builder().colspans(2).value(workInfo.getPeople() + " / "+workInfo.getMobile()).rowspans(1).build()); + workTr.add(PersonnelResumeTd.builder().colspans(2).value(workInfo.getPeopleAndMobile()).rowspans(1).build()); datas.add(workTr); } @@ -193,8 +193,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu .startAndEndDate(date) .companyAndDepartment(companyAndDept) .position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw")))) - .people(rInfo.getLastname(Util.null2String(rs.getString("zmr")))) - .mobile(Util.null2String(rs.getString("zmrlxfs"))) + .peopleAndMobile(rInfo.getLastname(Util.null2String(rs.getString("zmr"))) +" / " +Util.null2String(rs.getString("zmrlxfs"))) .build()); } return workInfoList;