综治中心字典值迁移到手机端

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/APPComprehensiveTPreventionOrganizationController.java

@@ -43,8 +43,8 @@ public class APPComprehensiveTPreventionOrganizationController {
             Map<String, Object> comprehensiveLevelLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);
             for (HashMap<String, Object> row:
                  rows) {
-                row.put("OrganizationTypeLabel",comprehensiveOrganizationTypeLabel.get(row.get("OrganizationType").toString()));
-                row.put("LevelLabel",comprehensiveLevelLabel.get(row.get("Level").toString()));
+                row.put("organizationTypeLabel",comprehensiveOrganizationTypeLabel.get(row.get("organizationType").toString()));
+                row.put("levelLabel",comprehensiveLevelLabel.get(row.get("level").toString()));
             }
             return AjaxResult.success(tableDataInfo.getRows());
         }else{

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/APPComprehensiveTPreventionTeam.java

@@ -42,11 +42,11 @@ public class APPComprehensiveTPreventionTeam {
             Map<String, Object> comprehensiveCodeLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
             Map<String, Object> comprehensiveEducationLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
             for (HashMap<String ,Object> row:rows) {
-                row.put("GenderLabel",comprehensiveGenderLabel.get(row.get("Gender").toString()));
-                row.put("NationLabel",comprehensiveNationLabel.get(row.get("Nation").toString()));
-                row.put("PoliticalOutlookLabel",comprehensivePoliticalOutlookLabel.get(row.get("PoliticalOutlook").toString()));
-                row.put("EducationLabel",comprehensiveEducationLabel.get(row.get("Education").toString()));
-                row.put("CodeLabel",comprehensiveCodeLabel.get(row.get("Code").toString()));
+                row.put("genderLabel",comprehensiveGenderLabel.get(row.get("gender").toString()));
+                row.put("nationLabel",comprehensiveNationLabel.get(row.get("nation").toString()));
+                row.put("politicalOutlookLabel",comprehensivePoliticalOutlookLabel.get(row.get("politicalOutlook").toString()));
+                row.put("educationLabel",comprehensiveEducationLabel.get(row.get("education").toString()));
+                row.put("codeLabel",comprehensiveCodeLabel.get(row.get("code").toString()));
             }
             return AjaxResult.success(tableDataInfo.getRows());
         }else{

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppHousingEstateController.java

@@ -88,7 +88,7 @@ public class AppHousingEstateController extends BaseController {
      */
     @GetMapping("/comprehensivehousingestate/getHousingEstate")
     public AjaxResult getHousingEstate(ComprehensiveHousingEstate housingEstate) {
-        return remoteHousingEstateService.getHousingEstate(housingEstate);
+        return remoteHousingEstateService.getHousingEstate(housingEstate.getEstateName());
     }
 
 

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppTeamController.java

@@ -50,12 +50,12 @@ public class AppTeamController extends BaseController {
             Map<String, Object> comprehensiveEducationLabel = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
             for (HashMap<String, Object> row:
                     rows ) {
-                row.put("GenderLabel",comprehensiveGenderLabel.get(row.get("Gender").toString()));
-                row.put("NationLabel",comprehensiveNationLabel.get(row.get("Nation").toString()));
-                row.put("PoliticalOutlookLabel",comprehensivePoliticalOutlookLabel.get(row.get("PoliticalOutlook").toString()));
-                row.put("LevelLabel",comprehensiveLevelLabel.get(row.get("Level").toString()));
-                row.put("DutiesLabel",comprehensiveDutiesLabel.get(row.get("Duties").toString()));
-                row.put("EducationLabel",comprehensiveEducationLabel.get(row.get("Education").toString()));
+                row.put("genderLabel",comprehensiveGenderLabel.get(row.get("gender").toString()));
+                row.put("nationLabel",comprehensiveNationLabel.get(row.get("nation").toString()));
+                row.put("politicalOutlookLabel",comprehensivePoliticalOutlookLabel.get(row.get("politicalOutlook").toString()));
+                row.put("levelLabel",comprehensiveLevelLabel.get(row.get("level").toString()));
+                row.put("dutiesLabel",comprehensiveDutiesLabel.get(row.get("duties").toString()));
+                row.put("educationLabel",comprehensiveEducationLabel.get(row.get("education").toString()));
 
             }
             return AjaxResult.success(tableDataInfo.getRows());