diff --git a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java index 3552fae..2a243bb 100644 --- a/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/shkjsecond/service/impl/PersonnelResumeServiceImpl.java @@ -182,7 +182,7 @@ 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 from uf_gzjlsh where xm1 = ?",resourceId); + rs.executeQuery("select ksrq,jsrq,gsmc,bm,zw from uf_gzjlsh where xm = ?",resourceId); DepartmentComInfo deptComInfo = new DepartmentComInfo(); SubCompanyComInfo subComInfo = new SubCompanyComInfo(); 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 departmentName = deptComInfo.getDepartmentName(Util.null2String(rs.getString("bm"))); 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() - .startDate(Util.null2String(rs.getString("ksrq"))) - .endDate(Util.null2String(rs.getString("jsrq"))) + .startDate("".equals(startDate) ? startDate : startDate.substring(0,7)) + .endDate("".equals(endDate) ? endDate : endDate.substring(0,7)) .subCompany(subCompanyname) .department(departmentName) .position(jobTitlesComInfo.getJobTitlesname(Util.null2String(rs.getString("zw"))))