|
|
@@ -311,7 +311,7 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
case "星级": o = ob.getStarName(); break;
|
|
|
case "入职时间": o = ob.getEntryTimes(); break;
|
|
|
case "转正时间": o = ob.getPromotionTimes(); break;
|
|
|
- case "年龄": o = ob.getAge().toString(); break;
|
|
|
+ case "年龄": o = ob.getAge()==null?"":ob.getAge().toString(); break;
|
|
|
case "性别": o = ob.getSex()==0?"男":"女"; break;
|
|
|
case "婚否": o = ob.getMarriageName(); break;
|
|
|
case "子女": o = ob.getSon().toString()+"/"+ob.getGirl().toString(); break;
|
|
|
@@ -333,7 +333,7 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
case "联系电话": o = ob.getMobile(); break;
|
|
|
case "办公室电话": o = ob.getFixedTel(); break;
|
|
|
case "出生日期": o = ob.getBirthdays(); break;
|
|
|
- case "出生月份": o = ob.getMonth().toString(); break;
|
|
|
+ case "出生月份": o = ob.getMonth()==null?"":ob.getMonth().toString(); break;
|
|
|
case "身份证号码": o = ob.getIdCard(); break;
|
|
|
case "身份证发证地": o = ob.getCertificationAuthority(); break;
|
|
|
case "户籍所在地": o = ob.getResidenceName(); break;
|