diff --git a/WEB-INF/prop/wysecond.properties b/WEB-INF/prop/wysecond.properties index 1323c79..c9c022a 100644 --- a/WEB-INF/prop/wysecond.properties +++ b/WEB-INF/prop/wysecond.properties @@ -1,142 +1,142 @@ -####### 基本信息 ########### -#员工类别 -workPeopleType=field53 -#在岗状态 -workStatus=field54 -#政治面貌 -policy=field55 -#座机号码 -landNumber=field45 -#办公邮箱 -officeEmail=field46 -#职务(新) -position=field56 -#人员类别 -personType=field57 +####### \u57FA\u672C\u4FE1\u606F ########### +#\u5458\u5DE5\u7C7B\u522B +workPeopleType=field1 +#\u5728\u5C97\u72B6\u6001 +workStatus=field2 +#\u653F\u6CBB\u9762\u8C8C +policy=field3 +#\u5EA7\u673A\u53F7\u7801 +landNumber=field6 +#\u529E\u516C\u90AE\u7BB1 +officeEmail=field7 +#\u804C\u52A1(\u65B0) +position=field58 +#\u4EBA\u5458\u7C7B\u522B +personType=field63 -####### 个人信息 ########### -#年龄 -age=field33 -#民族 -nation=field48 -#出生地 -birthplace=field58 -#户籍地址 -residenceAddress=field6 -#现通讯地址 -currentAddress=field59 -#户口类别 -residenceType=field60 -#婚姻状况新 -maritalStatus=field61 -#领证时间 -marryDate=field62 -#宗教信仰 -religious=field63 -#入团时间 -joinLeagueDate=field64 -#参加党派时间 -joinPartyDate=field27 -#联系住址 -contactAddress=field65 -#移动电话 -mobile=field66 -#个人邮箱 -email=field67 -#紧急联系人姓名 -emergencyName=field70 -#紧急联系人关系 -emergencyType=field71 -#紧急联系人电话 -emergencyPhone=field72 -#最高学历 -highEducation=field73 -#最高学位 -highDegree=field74 -#最高学历/学位专业 -highMajor=field75 -#毕业院校类型 -schollType=field68 -#专业技术资格名称 -jobCall=field52 -#最高学历(学位)毕业学校 -schoolName=field69 +####### \u4E2A\u4EBA\u4FE1\u606F ########### +#\u5E74\u9F84 +age=field9 +#\u6C11\u65CF +nation=field59 +#\u51FA\u751F\u5730 +birthplace=field38 +#\u6237\u7C4D\u5730\u5740 +residenceAddress=field39 +#\u73B0\u901A\u8BAF\u5730\u5740 +currentAddress=field40 +#\u6237\u53E3\u7C7B\u522B +residenceType=field10 +#\u5A5A\u59FB\u72B6\u51B5\u65B0 +maritalStatus=field60 +#\u9886\u8BC1\u65F6\u95F4 +marryDate=field41 +#\u5B97\u6559\u4FE1\u4EF0 +religious=field11 +#\u5165\u56E2\u65F6\u95F4 +joinLeagueDate=field12 +#\u53C2\u52A0\u515A\u6D3E\u65F6\u95F4 +joinPartyDate=field42 +#\u8054\u7CFB\u4F4F\u5740 +contactAddress=field4 +#\u79FB\u52A8\u7535\u8BDD +mobile=field7 +#\u4E2A\u4EBA\u90AE\u7BB1 +email=field5 +#\u7D27\u6025\u8054\u7CFB\u4EBA\u59D3\u540D +emergencyName=field6 +#\u7D27\u6025\u8054\u7CFB\u4EBA\u5173\u7CFB +emergencyType=field13 +#\u7D27\u6025\u8054\u7CFB\u4EBA\u7535\u8BDD +emergencyPhone=field14 +#\u6700\u9AD8\u5B66\u5386 +highEducation=field43 +#\u6700\u9AD8\u5B66\u4F4D +highDegree=field44 +#\u6700\u9AD8\u5B66\u5386/\u5B66\u4F4D\u4E13\u4E1A +highMajor=field15 +#\u6BD5\u4E1A\u9662\u6821\u7C7B\u578B +schollType=field16 +#\u4E13\u4E1A\u6280\u672F\u8D44\u683C\u540D\u79F0 +jobCall=field45 +#\u6700\u9AD8\u5B66\u5386\uFF08\u5B66\u4F4D\uFF09\u6BD5\u4E1A\u5B66\u6821 +schoolName=field46 -####### 工作信息 ########### -#银行卡号 -cardNumber=field6 -#银行开户行全称 -bankName=field38 -#杭州市高层次人才信息 -highPersonType=field51 -#个人身份 -identity=field76 -#扣减社会工龄 -socialWorkYear=field77 -#党内职务 -partyPosition=field39 -#工会职务 -tradePosition=field40 -#试用期开始日期 -trialStartDate=field62 -#试用期截止日期 -trialEndDate=field64 -#转正日期 -regularDate=field78 -#首次参加工作时间 -workStartDate=field27 -#是否应届生入职 -graduatesJoin=field79 -#专业技术资格系列 -proTechnical=field80 -#专业技术资格级别 -proLevel=field81 -#业务职务序列 -postionType=field49 -#业务职务层级 -postion=field50 -#派驻起始时间 -beStartDate=field82 -#派驻终止时间 -beEndDate=field83 -#劳动关系所属单位 -belongUnit=field41 -#实习开始日期 -interStartDate=field84 -#派驻人员所属单位担任职务/岗位 -beJob=field45 -#实习到期日期 -interEndDate=field85 -#实习最后工作日 -interLastDay=field86 -#在读学历 -onDegree=field36 -#在读专业 -onMajor=field46 -#在读院校类型 -onSchollType=field87 -#在读院校 -onSchollName=field58 -#涉密等级 -classifiedLevel=field88 -#加入当前部门时间 -joinDeptDate=field89 -#加入当前岗位时间 -joinJobDate=field90 -#岗位类别 -jobType=field91 -#职业技能等级 -skillLevel=field92 -#所属班组 -belongTeam=field59 -#是否为班组长 -teamLeader=field93 -#钉钉id -dingId=field5 +####### \u5DE5\u4F5C\u4FE1\u606F ########### +#\u94F6\u884C\u5361\u53F7 +cardNumber=field4 +#\u94F6\u884C\u5F00\u6237\u884C\u5168\u79F0 +bankName=field7 +#\u676D\u5DDE\u5E02\u9AD8\u5C42\u6B21\u4EBA\u624D\u4FE1\u606F +highPersonType=field17 +#\u4E2A\u4EBA\u8EAB\u4EFD +identity=field18 +#\u6263\u51CF\u793E\u4F1A\u5DE5\u9F84 +socialWorkYear=field19 +#\u515A\u5185\u804C\u52A1 +partyPosition=field14 +#\u5DE5\u4F1A\u804C\u52A1 +tradePosition=field15 +#\u8BD5\u7528\u671F\u5F00\u59CB\u65E5\u671F +trialStartDate=field64 +#\u8BD5\u7528\u671F\u622A\u6B62\u65E5\u671F +trialEndDate=field61 +#\u8F6C\u6B63\u65E5\u671F +regularDate=field12 +#\u9996\u6B21\u53C2\u52A0\u5DE5\u4F5C\u65F6\u95F4 +workStartDate=field42 +#\u662F\u5426\u5E94\u5C4A\u751F\u5165\u804C +graduatesJoin=field20 +#\u4E13\u4E1A\u6280\u672F\u8D44\u683C\u7CFB\u5217 +proTechnical=field21 +#\u4E13\u4E1A\u6280\u672F\u8D44\u683C\u7EA7\u522B +proLevel=field22 +#\u4E1A\u52A1\u804C\u52A1\u5E8F\u5217 +postionType=field65 +#\u4E1A\u52A1\u804C\u52A1\u5C42\u7EA7 +postion=field67 +#\u6D3E\u9A7B\u8D77\u59CB\u65F6\u95F4 +beStartDate=field41 +#\u6D3E\u9A7B\u7EC8\u6B62\u65F6\u95F4 +beEndDate=field47 +#\u52B3\u52A8\u5173\u7CFB\u6240\u5C5E\u5355\u4F4D +belongUnit=field37 +#\u5B9E\u4E60\u5F00\u59CB\u65E5\u671F +interStartDate=field48 +#\u6D3E\u9A7B\u4EBA\u5458\u6240\u5C5E\u5355\u4F4D\u62C5\u4EFB\u804C\u52A1/\u5C97\u4F4D +beJob=field38 +#\u5B9E\u4E60\u5230\u671F\u65E5\u671F +interEndDate=field49 +#\u5B9E\u4E60\u6700\u540E\u5DE5\u4F5C\u65E5 +interLastDay=field50 +#\u5728\u8BFB\u5B66\u5386 +onDegree=field62 +#\u5728\u8BFB\u4E13\u4E1A +onMajor=field40 +#\u5728\u8BFB\u9662\u6821\u7C7B\u578B +onSchollType=field51 +#\u5728\u8BFB\u9662\u6821 +onSchollName=field46 +#\u6D89\u5BC6\u7B49\u7EA7 +classifiedLevel=field52 +#\u52A0\u5165\u5F53\u524D\u90E8\u95E8\u65F6\u95F4 +joinDeptDate=field53 +#\u52A0\u5165\u5F53\u524D\u5C97\u4F4D\u65F6\u95F4 +joinJobDate=field54 +#\u5C97\u4F4D\u7C7B\u522B +jobType=field55 +#\u804C\u4E1A\u6280\u80FD\u7B49\u7EA7 +skillLevel=field56 +#\u6240\u5C5E\u73ED\u7EC4 +belongTeam=field5 +#\u662F\u5426\u4E3A\u73ED\u7EC4\u957F +teamLeader=field57 +#\u9489\u9489id +dingId=field68 -#人员快照建模表modeId -modeId=417 +#\u4EBA\u5458\u5FEB\u7167\u5EFA\u6A21\u8868modeId +modeId=77 diff --git a/src/com/engine/wysecond/entity/resume/PersonnelResumePo.java b/src/com/engine/wysecond/entity/resume/PersonnelResumePo.java index 189d938..b50ccdd 100644 --- a/src/com/engine/wysecond/entity/resume/PersonnelResumePo.java +++ b/src/com/engine/wysecond/entity/resume/PersonnelResumePo.java @@ -35,6 +35,7 @@ public class PersonnelResumePo { private String sex; private String birthday; private String resourceImageId; + private String policy; private String nation; private String nativePlace; @@ -46,6 +47,7 @@ public class PersonnelResumePo { private String department; private String jobTitle; private String postionLevel; + private String position; private String fullHighEducational; private String fullHighMajor; diff --git a/src/com/engine/wysecond/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/wysecond/service/impl/PersonnelResumeServiceImpl.java index f3f226e..9b64aae 100644 --- a/src/com/engine/wysecond/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/wysecond/service/impl/PersonnelResumeServiceImpl.java @@ -45,6 +45,8 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu resultMap.put("fullHighMajor",personnelResumePo.getFullHighMajor()); resultMap.put("fullHighSchool",personnelResumePo.getFullHighSchool()); resultMap.put("fullHighDegree",personnelResumePo.getFullHighDegree()); + resultMap.put("policy",personnelResumePo.getPolicy()); + resultMap.put("position",personnelResumePo.getPosition()); resultMap.put("notfullHighEducational",personnelResumePo.getNotfullHighEducational()); resultMap.put("notfullHighMajor",personnelResumePo.getNotfullHighMajor()); @@ -138,14 +140,17 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu String highPersonType = rs.getPropValue("wysecond", "highPersonType"); String jobCall = rs.getPropValue("wysecond", "jobCall"); String postion = rs.getPropValue("wysecond", "postion"); + String position = rs.getPropValue("wysecond", "position"); + String policy = rs.getPropValue("wysecond", "policy"); DepartmentComInfo dept = new DepartmentComInfo(); JobTitlesComInfo job = new JobTitlesComInfo(); rs.executeQuery("SELECT h.id, workcode, lastname, sex, birthday, resourceimageid, b."+nation+" as nation, nativeplace, \n" + " companystartdate, b."+joinPartyDate+" as joinPartyDate, c."+workStartDate+" as workStartDate, c."+highPersonType+" as highPersonType, \n" + - " b."+jobCall+" as jobCall,departmentid, jobTitle, c."+postion+" as postion FROM hrmresource h \n" + + " b."+jobCall+" as jobCall,departmentid, jobTitle, c."+postion+" as postion,d."+position+" as position, d."+policy+" as policy FROM hrmresource h \n" + " LEFT JOIN cus_fielddata b on b.id = h.id and b.scopeid = 1 and b.scope = 'HrmCustomFieldByInfoType' \n" + " LEFT JOIN cus_fielddata c on c.id = h.id and c.scopeid = 3 and c.scope = 'HrmCustomFieldByInfoType' \n" + + " LEFT JOIN cus_fielddata d on d.id = h.id and d.scopeid = -1 and d.scope = 'HrmCustomFieldByInfoType' \n" + "where h.id = ?",resourceId); PersonnelResumePo personnelResumePo = PersonnelResumePo.builder().build(); if (rs.next()) { @@ -165,6 +170,8 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu personnelResumePo.setDepartment(dept.getDepartmentName(Util.null2String(rs.getString("departmentid")))); personnelResumePo.setJobTitle(job.getJobTitlesname(Util.null2String(rs.getString("jobTitle")))); personnelResumePo.setPostionLevel(selectPostionLevel(Util.null2String(rs.getString("postion")))); + personnelResumePo.setPosition(selectItemValue(position,Util.getIntValue(rs.getString("position")),String.valueOf(user.getLanguage()))); + personnelResumePo.setPolicy(selectItemValue(policy,Util.getIntValue(rs.getString("policy")),String.valueOf(user.getLanguage()))); //全日制最高学历 //全日制最高学历毕业院校