Pārlūkot izejas kodu

手机端字典项常量替换

LiuHaoNan 1 gadu atpakaļ
vecāks
revīzija
29facd07cc

+ 1 - 1
src/main/java/com/sooka/sponest/mobile/comprehensive/ConflictDefuseController/AppConflictResolutionController.java

@@ -48,7 +48,7 @@ public class AppConflictResolutionController extends BaseController {
         R<ConflictResolution> edit = remoteConflictResolutionService.selectConflictResolutionById(id);
         R<ConflictResolution> edit = remoteConflictResolutionService.selectConflictResolutionById(id);
         if(HttpStatus.SUCCESS == edit.getCode()){
         if(HttpStatus.SUCCESS == edit.getCode()){
             ConflictResolution conflictResolution = edit.getData();
             ConflictResolution conflictResolution = edit.getData();
-            conflictResolution.setMainPersonIdCodeLabel(DictUtils.getDictDataByValue("comprehensive_certificate_code", conflictResolution.getMainPersonIdCode()));
+            conflictResolution.setMainPersonIdCodeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, conflictResolution.getMainPersonIdCode()));
             conflictResolution.setMainPersonGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, conflictResolution.getMainPersonGender()));
             conflictResolution.setMainPersonGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, conflictResolution.getMainPersonGender()));
             conflictResolution.setMainPersonNationalityLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, conflictResolution.getMainPersonNationality()));
             conflictResolution.setMainPersonNationalityLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, conflictResolution.getMainPersonNationality()));
             conflictResolution.setMainPersonEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, conflictResolution.getMainPersonEducation()));
             conflictResolution.setMainPersonEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, conflictResolution.getMainPersonEducation()));

+ 1 - 1
src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/APPComprehensiveTPreventionTeam.java

@@ -50,7 +50,7 @@ public class APPComprehensiveTPreventionTeam {
             comprehensiveTPreventionTeam.setGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, comprehensiveTPreventionTeam.getGender()));
             comprehensiveTPreventionTeam.setGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, comprehensiveTPreventionTeam.getGender()));
             comprehensiveTPreventionTeam.setNationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, comprehensiveTPreventionTeam.getNation()));
             comprehensiveTPreventionTeam.setNationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, comprehensiveTPreventionTeam.getNation()));
             comprehensiveTPreventionTeam.setPoliticalOutlookLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS, comprehensiveTPreventionTeam.getPoliticalOutlook()));
             comprehensiveTPreventionTeam.setPoliticalOutlookLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLITICAL_STATUS, comprehensiveTPreventionTeam.getPoliticalOutlook()));
-            comprehensiveTPreventionTeam.setCodeLabel(DictUtils.getDictDataByValue("comprehensive_certificate_code", comprehensiveTPreventionTeam.getCode()));
+            comprehensiveTPreventionTeam.setCodeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, comprehensiveTPreventionTeam.getCode()));
             comprehensiveTPreventionTeam.setEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, comprehensiveTPreventionTeam.getEducation()));
             comprehensiveTPreventionTeam.setEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, comprehensiveTPreventionTeam.getEducation()));
 
 
             return AjaxResult.success(comprehensiveTPreventionTeam);
             return AjaxResult.success(comprehensiveTPreventionTeam);

+ 2 - 2
src/main/java/com/sooka/sponest/mobile/comprehensive/socialPolicingController/AppVictimController.java

@@ -36,7 +36,7 @@ public class AppVictimController {
         Integer pageSize = pageDomain.getPageSize();
         Integer pageSize = pageDomain.getPageSize();
         String type = victim.getType();
         String type = victim.getType();
         TableDataInfo list = victimService.getList(pageNum, pageSize, type);
         TableDataInfo list = victimService.getList(pageNum, pageSize, type);
-        Map<String, Object> certificateCode = DictUtils.getDictCacheToMap("comprehensive_certificate_code");//证件代码
+        Map<String, Object> certificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);//证件代码
         Map<String, Object> sex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);//性别
         Map<String, Object> sex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);//性别
 
 
 
 
@@ -86,7 +86,7 @@ public class AppVictimController {
         if("200".equals(edit.get("code").toString())){
         if("200".equals(edit.get("code").toString())){
             HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
             HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
 
 
-            data.put("identityCodeLabel",DictUtils.getDictDataByValue("comprehensive_certificate_code",data.get("identityCode").toString()));
+            data.put("identityCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE,data.get("identityCode").toString()));
             data.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX,data.get("gender").toString()));
             data.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX,data.get("gender").toString()));
             data.put("nationalityRegionLabel",null == data.get("nationalityRegion")? "":DictUtils.getDictDataByValue("comprehensive_internation",data.get("nationalityRegion").toString()));
             data.put("nationalityRegionLabel",null == data.get("nationalityRegion")? "":DictUtils.getDictDataByValue("comprehensive_internation",data.get("nationalityRegion").toString()));
             data.put("nationLabel",null == data.get("nation")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION,data.get("nation").toString()));
             data.put("nationLabel",null == data.get("nation")? "":DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION,data.get("nation").toString()));