|
|
@ -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(1).value(workInfo.getStartAndEndDate()).rowspans(1).build());
|
|
|
|
workTr.add(PersonnelResumeTd.builder().colspans(3).value(workInfo.getCompanyAndDepartment()).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(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);
|
|
|
|
datas.add(workTr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -193,8 +193,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
|
|
|
.startAndEndDate(date)
|
|
|
|
.startAndEndDate(date)
|
|
|
|
.companyAndDepartment(companyAndDept)
|
|
|
|
.companyAndDepartment(companyAndDept)
|
|
|
|
.position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw"))))
|
|
|
|
.position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw"))))
|
|
|
|
.people(rInfo.getLastname(Util.null2String(rs.getString("zmr"))))
|
|
|
|
.peopleAndMobile(rInfo.getLastname(Util.null2String(rs.getString("zmr"))) +" / " +Util.null2String(rs.getString("zmrlxfs")))
|
|
|
|
.mobile(Util.null2String(rs.getString("zmrlxfs")))
|
|
|
|
|
|
|
|
.build());
|
|
|
|
.build());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return workInfoList;
|
|
|
|
return workInfoList;
|
|
|
|