电子报聘-人员基本信息增加字段，政治面貌

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -130,6 +130,9 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
 
 
         //经纪人审批基本信息
         //经纪人审批基本信息
         PractitionerHiringBasicInfo practitionerHiringBasicInfo = agmsHiringDalService.findPractitionerHiringBasicInfo(hiringBasicInfoId);
         PractitionerHiringBasicInfo practitionerHiringBasicInfo = agmsHiringDalService.findPractitionerHiringBasicInfo(hiringBasicInfoId);
+        Map<String, String> mdCodeMap = systemConfigService.getKeyValueMap("PoliticalOutlook");
+        String politicalOutlook = practitionerHiringBasicInfo.getPoliticalOutlook();
+        practitionerHiringBasicInfo.setPoliticalOutlook(mdCodeMap != null ? mdCodeMap.get(politicalOutlook) : null);
         //审批经纪人关系
         //审批经纪人关系
         PractitionerHiringMemberShip practitionerHiringMemberShip = agmsHiringDalService.findPractitionerHiringMemberShip(hiringBasicInfoId);
         PractitionerHiringMemberShip practitionerHiringMemberShip = agmsHiringDalService.findPractitionerHiringMemberShip(hiringBasicInfoId);
         //审批经纪人工作经历
         //审批经纪人工作经历

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -431,11 +431,11 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         Long approvingStatus = requestVO.getApprovingStatus();
         Long approvingStatus = requestVO.getApprovingStatus();
 
 
         //等保调整
         //等保调整
-//        List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId,null);
-//        if(null == findByObjSortable ){
-//            responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
-//            return responseVO;
-//        }
+        List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId,null);
+        if(null == findByObjSortable ){
+            responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
+            return responseVO;
+        }
         List<HiringListInfo> hiringListInfoList;
         List<HiringListInfo> hiringListInfoList;
         if (Long.valueOf("0").equals(approvingStatus)) {
         if (Long.valueOf("0").equals(approvingStatus)) {
             // 当前经纪人的待审批记录
             // 当前经纪人的待审批记录
@@ -649,6 +649,9 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
             Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
             //基本信息
             //基本信息
             AclPractitionerHiringBasicInfo hiringBasicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
             AclPractitionerHiringBasicInfo hiringBasicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
+            Map<String, String> mdCodeMap = systemConfigService.getKeyValueMap("PoliticalOutlook");
+            String politicalOutlook = hiringBasicInfo.getPoliticalOutlook();
+            hiringBasicInfo.setPoliticalOutlook(mdCodeMap != null ? mdCodeMap.get(politicalOutlook) : null);
             //组织关系
             //组织关系
             AclPractitionerHiringMembership hiringMemberShip = practitionerHiringDalService.queryHiringMemberShip(hiringBasicInfoId);
             AclPractitionerHiringMembership hiringMemberShip = practitionerHiringDalService.queryHiringMemberShip(hiringBasicInfoId);
             //工作经历
             //工作经历

yd-api/src/main/java/com/yd/rmi/cache/SystemConfigService.java

@@ -186,9 +186,31 @@ public class SystemConfigService implements CommandLineRunner{
 			}
 			}
 		}
 		}
 		return false;
 		return false;
-	} 
-	
-	
+	}
+
+	public Map<String, String> getKeyValueMap(String configType) {
+		Map<String, String> keyValueMap = null;
+
+		Element element = systemConfigCache.get(configType);
+		if (element != null && element.getObjectValue() != null) {
+			keyValueMap = (Map<String, String>) element.getObjectValue();
+		} else {
+			MdCode mdCode = new MdCode();
+			mdCode.setCodeType(configType);
+			mdCode.setIsActive(1);
+			List<MdCode> mdCodeList = mdCodeService.findByMdCode(mdCode);
+			if (mdCodeList != null && mdCodeList.size() > 0) {
+				keyValueMap = new HashMap<String, String>();
+				for (MdCode md : mdCodeList) {
+					keyValueMap.put(md.getCodeCode(), md.getCodeName());
+				}
+			}
+			element = new Element(configType, keyValueMap);
+			systemConfigCache.put(element);
+		}
+		return keyValueMap;
+	}
+
 	/**
 	/**
 	 * 试算因子对应保费
 	 * 试算因子对应保费
 	 * @param elements 试算因子
 	 * @param elements 试算因子