|
|
@ -182,7 +182,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
|
|
|
private List<WorkInfo> selectWorkInfo(String resourceId) {
|
|
|
|
private List<WorkInfo> selectWorkInfo(String resourceId) {
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
List<WorkInfo> workInfoList = new ArrayList<>();
|
|
|
|
List<WorkInfo> workInfoList = new ArrayList<>();
|
|
|
|
rs.executeQuery("select ksrq,jsrq,gsmc,bm,zw from uf_gzjlsh where xm1 = ?",resourceId);
|
|
|
|
rs.executeQuery("select ksrq,jsrq,gsmc,bm,zw from uf_gzjlsh where xm = ?",resourceId);
|
|
|
|
DepartmentComInfo deptComInfo = new DepartmentComInfo();
|
|
|
|
DepartmentComInfo deptComInfo = new DepartmentComInfo();
|
|
|
|
SubCompanyComInfo subComInfo = new SubCompanyComInfo();
|
|
|
|
SubCompanyComInfo subComInfo = new SubCompanyComInfo();
|
|
|
|
ResourceComInfo rInfo = new ResourceComInfo();
|
|
|
|
ResourceComInfo rInfo = new ResourceComInfo();
|
|
|
@ -191,9 +191,11 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
|
|
|
|
//String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq"));
|
|
|
|
//String date = Util.null2String(rs.getString("ksrq")) +" 至 " + Util.null2String(rs.getString("jsrq"));
|
|
|
|
String departmentName = deptComInfo.getDepartmentName(Util.null2String(rs.getString("bm")));
|
|
|
|
String departmentName = deptComInfo.getDepartmentName(Util.null2String(rs.getString("bm")));
|
|
|
|
String subCompanyname = subComInfo.getSubCompanyname(Util.null2String(rs.getString("gsmc")));
|
|
|
|
String subCompanyname = subComInfo.getSubCompanyname(Util.null2String(rs.getString("gsmc")));
|
|
|
|
|
|
|
|
String startDate = Util.null2String(rs.getString("ksrq"));
|
|
|
|
|
|
|
|
String endDate = Util.null2String(rs.getString("jsrq"));
|
|
|
|
workInfoList.add(WorkInfo.builder()
|
|
|
|
workInfoList.add(WorkInfo.builder()
|
|
|
|
.startDate(Util.null2String(rs.getString("ksrq")))
|
|
|
|
.startDate("".equals(startDate) ? startDate : startDate.substring(0,7))
|
|
|
|
.endDate(Util.null2String(rs.getString("jsrq")))
|
|
|
|
.endDate("".equals(endDate) ? endDate : endDate.substring(0,7))
|
|
|
|
.subCompany(subCompanyname)
|
|
|
|
.subCompany(subCompanyname)
|
|
|
|
.department(departmentName)
|
|
|
|
.department(departmentName)
|
|
|
|
.position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw"))))
|
|
|
|
.position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw"))))
|
|
|
|