|
|
@@ -179,13 +179,34 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
|
|
|
params.put("aid", TokenManager.getAdminId());
|
|
|
}
|
|
|
- return (Pagination<OutPersonnelListBo>) findPage("selectPersonnelByList", "selectPersonnelByCount",
|
|
|
+ Pagination<OutPersonnelListBo>p=(Pagination<OutPersonnelListBo>) findPage("selectPersonnelByList", "selectPersonnelByCount",
|
|
|
params, i.getPageNo(), i.getPageSize());
|
|
|
+ //处理省市区的转换
|
|
|
+ for (OutPersonnelListBo ob : (List<OutPersonnelListBo>)p.getList()) {
|
|
|
+ String residenceName=districtTransformation(ob.getResidenceProvince(),ob.getResidenceCity(),ob.getResidenceArea(),
|
|
|
+ ob.getResidenceAddress(), "");
|
|
|
+ String nativePlaceName =districtTransformation(ob.getNativePlaceProvince(),ob.getNativePlaceCity(),null,null, "");
|
|
|
+ String nowName=districtTransformation(ob.getNowProvince(),ob.getNowCity(),ob.getNowArea(),
|
|
|
+ ob.getNowAddress(), "");
|
|
|
+ ob.setResidenceName(residenceName);
|
|
|
+ ob.setNativePlaceName(nativePlaceName);
|
|
|
+ ob.setNowName(nowName);
|
|
|
+ }
|
|
|
+
|
|
|
+ return p;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public OutPersonnelBo selectBypdId(Integer id) {
|
|
|
OutPersonnelBo op= personnelDossierMapper.selectBypdId(id);
|
|
|
+ String residenceName=districtTransformation(op.getResidenceProvince(),op.getResidenceCity(),op.getResidenceArea(),
|
|
|
+ op.getResidenceAddress(), "");
|
|
|
+ String nativePlaceName =districtTransformation(op.getNativePlaceProvince(),op.getNativePlaceCity(),null,null, "");
|
|
|
+ String nowName=districtTransformation(op.getNowProvince(),op.getNowCity(),op.getNowArea(),
|
|
|
+ op.getNowAddress(), "");
|
|
|
+ op.setResidenceName(residenceName);
|
|
|
+ op.setNativePlaceName(nativePlaceName);
|
|
|
+ op.setNowName(nowName);
|
|
|
op.setContactList(personnelContactMapper.selectBypdId(id));
|
|
|
PersonnelEntry pe=personnelEntryMapper.selectByPrimaryKey(id);
|
|
|
op.setPersonnelEntry(pe);
|
|
|
@@ -212,11 +233,6 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
//根据列表编写文档
|
|
|
XSSFSheet sheet =wb.getSheetAt(0);
|
|
|
for (OutPersonnelListBo ob : (List<OutPersonnelListBo>)list) {
|
|
|
- //处理省市区的转换
|
|
|
- String residenceName=districtTransformation(ob.getResidenceProvince(),ob.getResidenceCity(),ob.getResidenceArea(),
|
|
|
- ob.getResidenceAddress(), "");
|
|
|
- String nowName=districtTransformation(ob.getNowProvince(),ob.getNowCity(),ob.getNowArea(),
|
|
|
- ob.getNowAddress(), "");
|
|
|
//新增一行
|
|
|
XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
|
|
|
|
|
|
@@ -263,8 +279,8 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
case "出生月份": o = ob.getMonth().toString(); break;
|
|
|
case "身份证号码": o = ob.getIdCard(); break;
|
|
|
case "身份证发证地": o = ob.getCertificationAuthority(); break;
|
|
|
- case "户籍所在地": o = residenceName; break;
|
|
|
- case "现住址": o = nowName; break;
|
|
|
+ case "户籍所在地": o = ob.getResidenceName(); break;
|
|
|
+ case "现住址": o = ob.getNowName(); break;
|
|
|
case "紧急联系人": o = ob.getEmergencyContact(); break;
|
|
|
case "紧急联系人电话": o = ob.getEmergencyMobile(); break;
|
|
|
default: o = ""; break;
|
|
|
@@ -295,7 +311,7 @@ public class PersonnelServiceImpl extends BaseMybatisDao<PersonnelDossierMapper
|
|
|
if (p!=null) {
|
|
|
for (ProvinceBo pb : plist) {
|
|
|
if (pb.getId().equals(p)) {
|
|
|
- residenceName+=pb.getName();
|
|
|
+ residenceName+=pb.getName()+"省";
|
|
|
break;
|
|
|
}
|
|
|
}
|