Merge remote-tracking branch 'origin/dev' into dev

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

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

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

@@ -649,9 +649,6 @@ 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

@@ -211,6 +211,28 @@ public class SystemConfigService implements CommandLineRunner{
 		return keyValueMap;
 		return keyValueMap;
 	}
 	}
 
 
+	public Map<String,String> geMdCodeIdMap(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.getId().toString(), md.getCodeName());
+				}
+			}
+			element = new Element(configType,keyValueMap);
+			systemConfigCache.put(element);
+		}
+		return keyValueMap;
+	}
+
 	/**
 	/**
 	 * 试算因子对应保费
 	 * 试算因子对应保费
 	 * @param elements 试算因子
 	 * @param elements 试算因子

yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml

@@ -12,7 +12,7 @@
         <result column="practitionerBirthdate" jdbcType="VARCHAR" property="practitionerBirthdate"/>
         <result column="practitionerBirthdate" jdbcType="VARCHAR" property="practitionerBirthdate"/>
         <result column="provinceName" jdbcType="VARCHAR" property="provinceName"/>
         <result column="provinceName" jdbcType="VARCHAR" property="provinceName"/>
         <result column="cityName" jdbcType="VARCHAR" property="cityName"/>
         <result column="cityName" jdbcType="VARCHAR" property="cityName"/>
-        <result column="political_outlook" jdbcType="VARCHAR" property="politicalOutlook"/>
+        <result column="politicalOutlook" jdbcType="VARCHAR" property="politicalOutlook"/>
         <result column="residentAddress" jdbcType="VARCHAR" property="residentAddress"/>
         <result column="residentAddress" jdbcType="VARCHAR" property="residentAddress"/>
         <result column="wechatId" jdbcType="VARCHAR" property="wechatId"/>
         <result column="wechatId" jdbcType="VARCHAR" property="wechatId"/>
         <result column="wechatQRcodeOssPath" jdbcType="VARCHAR" property="wechatQRcodeOssPath"/>
         <result column="wechatQRcodeOssPath" jdbcType="VARCHAR" property="wechatQRcodeOssPath"/>