app字典调整

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

@@ -11,11 +11,12 @@ import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.domain.ConflictResolution;
 import com.sooka.sponest.comprehensive.api.comprehensiveConflictDefuse.service.RemoteConflictResolutionService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/AppConflictResolutionController")
@@ -33,7 +34,34 @@ public class AppConflictResolutionController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteConflictResolutionService.selectConflictResolutionList(pageNum, pageSize, conflictResolution.getTemp(),conflictResolution.getEventName(),conflictResolution.getMainPersonName(),conflictResolution.getResolutionResponsibleName());
         if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+            Map<String,Object> comprehensiveSex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
+            Map<String,Object> comprehensiveNation = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATION);
+            Map<String,Object> comprehensiveEducationalBackground = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND);
+            Map<String,Object> comprehensiveEventSize = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_EVENT_SIZE);
+
+
+            Map<String,Object> comprehensiveEventType = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_EVENT_TYPE);
+            Map<String,Object> comprehensivePartiesInvolved = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_PARTIES_INVOLVED);
+            Map<String,Object> comprehensiveWaysResolving = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_WAYS_RESOLVING);
+
+            for (Map<String, Object> row : rows) {
+                row.put("mainPersonIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode,MapUtils.getString(row,"mainPersonIdCode")));
+                row.put("mainPersonGenderLabel",MapUtils.getString(comprehensiveSex,MapUtils.getString(row,"mainPersonGender")));
+                row.put("mainPersonNationalityLabel",MapUtils.getString(comprehensiveNation,MapUtils.getString(row,"mainPersonNationality")));
+                row.put("mainPersonEducationLabel",MapUtils.getString(comprehensiveEducationalBackground,MapUtils.getString(row,"mainPersonEducation")));
+                row.put("eventScaleLabel",MapUtils.getString(comprehensiveEventSize,MapUtils.getString(row,"eventScale")));
+                row.put("resolutionSuccessLabel",!MapUtils.getString(row,"resolutionSuccess").isEmpty()?("1".equals(conflictResolution.getResolutionSuccess())?"是":"否"):"");
+
+                row.put("eventCategoryLabel",MapUtils.getString(comprehensiveEventType,MapUtils.getString(row,"eventCategory")));
+                row.put("mainPersonCategoryLabel",MapUtils.getString(comprehensivePartiesInvolved,MapUtils.getString(row,"mainPersonCategory")));
+                row.put("resolutionMethodLabel",MapUtils.getString(comprehensiveWaysResolving,MapUtils.getString(row,"resolutionMethod")));
+
+
+            }
+
+            return AjaxResult.success(rows);
         } else {
             return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
         }
@@ -48,11 +76,23 @@ public class AppConflictResolutionController extends BaseController {
         R<ConflictResolution> edit = remoteConflictResolutionService.selectConflictResolutionById(id);
         if(HttpStatus.SUCCESS == edit.getCode()){
             ConflictResolution conflictResolution = edit.getData();
+            Map<String,Object> comprehensiveEventType = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_EVENT_TYPE);
+            Map<String,Object> comprehensivePartiesInvolved = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_PARTIES_INVOLVED);
+            Map<String,Object> comprehensiveWaysResolving = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_WAYS_RESOLVING);
+
+
             conflictResolution.setMainPersonIdCodeLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, conflictResolution.getMainPersonIdCode()));
             conflictResolution.setMainPersonGenderLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX, conflictResolution.getMainPersonGender()));
             conflictResolution.setMainPersonNationalityLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATION, conflictResolution.getMainPersonNationality()));
             conflictResolution.setMainPersonEducationLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EDUCATIONAL_BACKGROUND, conflictResolution.getMainPersonEducation()));
+            conflictResolution.setEventScaleLabel(DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_EVENT_SIZE, conflictResolution.getEventScale()));
             conflictResolution.setResolutionSuccessLabel(!conflictResolution.getResolutionSuccess().isEmpty()?("1".equals(conflictResolution.getResolutionSuccess())?"是":"否"):"");
+
+            conflictResolution.setEventCategoryLabel(MapUtils.getString(comprehensiveEventType,conflictResolution.getEventCategory()));
+            conflictResolution.setMainPersonCategoryLabel(MapUtils.getString(comprehensivePartiesInvolved,conflictResolution.getMainPersonCategory()));
+            conflictResolution.setResolutionMethodLabel(MapUtils.getString(comprehensiveWaysResolving,conflictResolution.getResolutionMethod()));
+
+
             return AjaxResult.success(conflictResolution);
         }else{
             return AjaxResult.error(edit.getCode(), edit.getMsg());

src/main/java/com/sooka/sponest/mobile/comprehensive/RoadCaseController/AppRoadProtectionController.java

@@ -57,13 +57,13 @@ public class AppRoadProtectionController extends BaseController {
     @GetMapping("/RoadProtection/edit")
     public AjaxResult getInfo(String id) {
         AjaxResult ajaxResult =   remoteRoadProtectionService.selectComprehensiveRoadProtectionById(id);
-        if("200".equals(String.valueOf(ajaxResult.get("code")))){
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
             HashMap<String,Object> comprehensiveRoadProtection = (HashMap<String, Object>) ajaxResult.get("data");
             comprehensiveRoadProtection.put("routeTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LINE_TYPE, MapUtils.getString(comprehensiveRoadProtection,"routeType")));
             comprehensiveRoadProtection.put("publicSecurityHazardLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLICING_LEVEL,MapUtils.getString(comprehensiveRoadProtection,"publicSecurityHazardLevel")));
             return AjaxResult.success(comprehensiveRoadProtection);
         }else{
-            return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
         }
 
     }

src/main/java/com/sooka/sponest/mobile/comprehensive/actualPeopleController/AppOverseasPersonInfoController.java

@@ -1,17 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.actualPeopleController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.domain.ComprehensiveRhfOverseasPersonInfo;
 import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service.RemoteOverseasPersonInfoService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 境外人员App
@@ -36,7 +41,26 @@ public class AppOverseasPersonInfoController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteOverseasPersonInfoService.selectComprehensiveRhfOverseasPersonInfoList(pageNum, pageSize, comprehensiveRhfOverseasPersonInfo.getIdentityNumber(), comprehensiveRhfOverseasPersonInfo.getPhone());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//2260
+            Map<String,Object> comprehensiveSex = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SEX);
+            Map<String,Object> comprehensiveInternation = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_INTERNATION);
+            Map<String,Object> comprehensiveReligiousBelief = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF);
+            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+            Map<String,Object> comprehensiveComingToChinaPurpose = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_COMING_TO_CHINA_PURPOSE);
+            Map<String,Object> comprehensiveOccupationalCategory = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY);
+
+            for (Map<String, Object> row : rows) {
+                row.put("genderLabel",comprehensiveSex.get(MapUtils.getString(row,"gender")));
+                row.put("nativePlaceLabel",comprehensiveInternation.get(MapUtils.getString(row,"nativePlace")));
+                row.put("religiousBeliefLabel",comprehensiveReligiousBelief.get(MapUtils.getString(row,"religiousBelief")));
+                row.put("identityCodeLabel",comprehensiveCertificateCode.get(MapUtils.getString(row,"identityCode")));
+                row.put("purposeComingChinaLabel",comprehensiveComingToChinaPurpose.get(MapUtils.getString(row,"purposeComingChina")));
+                row.put("occupationalCategoryLabel",comprehensiveOccupationalCategory.get(MapUtils.getString(row,"occupationalCategory")));
+                row.put("focusPeopleLabel",null == row.get("focusPeople")?"":(MapUtils.getInteger(row,"focusPeople")== 1?"是":"否"));
+                row.put("currentResidencePlaceLabel",comprehensiveCityCode.get(MapUtils.getString(row,"currentResidencePlace")));
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -48,7 +72,25 @@ public class AppOverseasPersonInfoController extends BaseController {
      */
     @GetMapping("/info/edit")
     public AjaxResult getInfo(String id) {
-        return remoteOverseasPersonInfoService.selectComprehensiveRhfOverseasPersonInfoById(id);
+        AjaxResult ajaxResult =  remoteOverseasPersonInfoService.selectComprehensiveRhfOverseasPersonInfoById(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            HashMap<String,Object> comprehensiveRhfOverseasPersonInfo = (HashMap<String, Object>) ajaxResult.get("data");
+            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
+
+            comprehensiveRhfOverseasPersonInfo.put("genderLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SEX,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"gender")));
+            comprehensiveRhfOverseasPersonInfo.put("nativePlaceLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_INTERNATION,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"nativePlace")));
+            comprehensiveRhfOverseasPersonInfo.put("religiousBeliefLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"religiousBelief")));
+            comprehensiveRhfOverseasPersonInfo.put("identityCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"identityCode")));
+            comprehensiveRhfOverseasPersonInfo.put("purposeComingChinaLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_COMING_TO_CHINA_PURPOSE,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"purposeComingChina")));
+            comprehensiveRhfOverseasPersonInfo.put("occupationalCategoryLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY,MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"occupationalCategory")));
+            comprehensiveRhfOverseasPersonInfo.put("focusPeopleLabel",null == comprehensiveRhfOverseasPersonInfo.get("focusPeople")?"":(MapUtils.getInteger(comprehensiveRhfOverseasPersonInfo,"focusPeople")== 1?"是":"否"));
+            comprehensiveRhfOverseasPersonInfo.put("currentResidencePlaceLabel",comprehensiveCityCode.get(MapUtils.getString(comprehensiveRhfOverseasPersonInfo,"currentResidencePlace")));
+
+            return AjaxResult.success(comprehensiveRhfOverseasPersonInfo);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
+
     }
 
     /**

src/main/java/com/sooka/sponest/mobile/comprehensive/actualPeopleController/AppRentalHousingController.java

@@ -1,17 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.actualPeopleController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.domain.ComprehensiveRhfRentalHousing;
 import com.sooka.sponest.comprehensive.api.comprehensiveActualPeople.service.RemoteRentalHousingService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 出租房App
@@ -36,7 +41,20 @@ public class AppRentalHousingController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteRentalHousingService.selectComprehensiveRhfRentalHousingList(pageNum, pageSize, comprehensiveRhfRentalHousing.getName(), comprehensiveRhfRentalHousing.getHouseNumber(), comprehensiveRhfRentalHousing.getPhone());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> comprehensiveBuildingUse = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_BUILDING_USE);
+            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+            Map<String,Object> comprehensiveRentalUse = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RENTAL_USE);
+            Map<String,Object> comprehensiveHazardType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_HAZARD_TYPE);
+            for (Map<String, Object> row : rows) {
+
+                row.put("buildingUseLabel",comprehensiveBuildingUse.get(MapUtils.getString(row,"buildingUse")));
+                row.put("identityCodeLabel",comprehensiveCertificateCode.get(MapUtils.getString(row,"identityCode")));
+                row.put("rentalUseLabel",comprehensiveRentalUse.get(MapUtils.getString(row,"rentalUse")));
+                row.put("hiddenDangerTypeLabel",comprehensiveHazardType.get(MapUtils.getString(row,"hiddenDangerType")));
+
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -48,7 +66,20 @@ public class AppRentalHousingController extends BaseController {
      */
     @GetMapping("/housing/edit")
     public AjaxResult getInfo(String id) {
-        return remoteRentalHousingService.selectComprehensiveRhfRentalHousingById(id);
+        AjaxResult ajaxResult = remoteRentalHousingService.selectComprehensiveRhfRentalHousingById(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+
+            HashMap<String,Object> comprehensiveRhfRentalHousing = (HashMap<String, Object>) ajaxResult.get("data");
+            comprehensiveRhfRentalHousing.put("buildingUseLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_BUILDING_USE, MapUtils.getString(comprehensiveRhfRentalHousing,"buildingUse")));
+            comprehensiveRhfRentalHousing.put("identityCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveRhfRentalHousing,"identityCode")));
+            comprehensiveRhfRentalHousing.put("rentalUseLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_RENTAL_USE, MapUtils.getString(comprehensiveRhfRentalHousing,"rentalUse")));
+            comprehensiveRhfRentalHousing.put("hiddenDangerTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_HAZARD_TYPE, MapUtils.getString(comprehensiveRhfRentalHousing,"hiddenDangerType")));
+
+            return AjaxResult.success(comprehensiveRhfRentalHousing);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
+
     }
 
     /**

src/main/java/com/sooka/sponest/mobile/comprehensive/nonPublicEconomicOrganizationsController/APPComprehensiveNonPublicEconomicOrganizationsController.java

@@ -1,16 +1,21 @@
 package com.sooka.sponest.mobile.comprehensive.nonPublicEconomicOrganizationsController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveNonPublicEconomicOrganizations;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveNonPublicEconomicOrganizationsService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -34,7 +39,24 @@ public class APPComprehensiveNonPublicEconomicOrganizationsController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = comprehensiveNonPublicEconomicOrganizationsService.list(pageNum, pageSize, comprehensiveNonPublicEconomicOrganizations.getEnterpriseName(), comprehensiveNonPublicEconomicOrganizations.getRegistrationNumbe(), comprehensiveNonPublicEconomicOrganizations.getLegalPersonIdNumber());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows= (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> comprehensiveBusinessCategory = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_BUSINESS_CATEGORY);
+            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+            Map<String,Object> comprehensiveSecurityRisks = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SECURITY_RISKS);
+            Map<String,Object> comprehensiveLevelOfAttention = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION);
+            for (Map<String, Object> row : rows) {
+                row.put("enterpriseCategoryLabel",MapUtils.getString(comprehensiveBusinessCategory, MapUtils.getString(row,"enterpriseCategory")));
+                row.put("legalPersonIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode, MapUtils.getString(row,"legalPersonIdCode")));
+                row.put("safetyHazardsTypeLabel",MapUtils.getString(comprehensiveSecurityRisks, MapUtils.getString(row,"safetyHazardsType")));
+                row.put("attentivenessLabel",MapUtils.getString(comprehensiveLevelOfAttention, MapUtils.getString(row,"attentiveness")));
+                row.put("conditionsEstablishmentLabel",MapUtils.getLong(row,"conditionsEstablishment")==0?"否":"是");
+                row.put("communistOrganizationLabel",MapUtils.getLong(row,"communistOrganization")==0?"否":"是");
+                row.put("tradeUnionLabel",MapUtils.getLong(row,"tradeUnion")==0?"否":"是");
+                row.put("communistYouthLeagueLabel",MapUtils.getLong(row,"communistYouthLeague")==0?"否":"是");
+                row.put("womenFederationLabel",MapUtils.getLong(row,"womenFederation")==0?"否":"是");
+                row.put("hazardousIndustryLabel",MapUtils.getLong(row,"hazardousIndustry")==0?"否":"是");
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -46,7 +68,26 @@ public class APPComprehensiveNonPublicEconomicOrganizationsController {
      */
     @GetMapping("/ComprehensiveNonPublicEconomicOrganizations/edit")
     public AjaxResult getInfo(String id) {
-        return AjaxResult.success(comprehensiveNonPublicEconomicOrganizationsService.edit(id));
+        AjaxResult ajaxResult = comprehensiveNonPublicEconomicOrganizationsService.edit(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            HashMap<String,Object> comprehensiveNonPublicEconomicOrganizations = (HashMap<String, Object>) ajaxResult.get("data");
+
+            comprehensiveNonPublicEconomicOrganizations.put("enterpriseCategoryLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_BUSINESS_CATEGORY, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"enterpriseCategory")));
+            comprehensiveNonPublicEconomicOrganizations.put("legalPersonIdCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"legalPersonIdCode")));
+            comprehensiveNonPublicEconomicOrganizations.put("safetyHazardsTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SECURITY_RISKS, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"safetyHazardsType")));
+            comprehensiveNonPublicEconomicOrganizations.put("attentivenessLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION, MapUtils.getString(comprehensiveNonPublicEconomicOrganizations,"attentiveness")));
+            comprehensiveNonPublicEconomicOrganizations.put("conditionsEstablishmentLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"conditionsEstablishment")==0?"否":"是");
+            comprehensiveNonPublicEconomicOrganizations.put("communistOrganizationLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"communistOrganization")==0?"否":"是");
+            comprehensiveNonPublicEconomicOrganizations.put("tradeUnionLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"tradeUnion")==0?"否":"是");
+            comprehensiveNonPublicEconomicOrganizations.put("communistYouthLeagueLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"communistYouthLeague")==0?"否":"是");
+            comprehensiveNonPublicEconomicOrganizations.put("womenFederationLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"womenFederation")==0?"否":"是");
+            comprehensiveNonPublicEconomicOrganizations.put("hazardousIndustryLabel",MapUtils.getLong(comprehensiveNonPublicEconomicOrganizations,"hazardousIndustry")==0?"否":"是");
+
+            return AjaxResult.success(comprehensiveNonPublicEconomicOrganizations);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
+
     }
     /**
      * 非公有制经济组织新增

src/main/java/com/sooka/sponest/mobile/comprehensive/nonPublicEconomicOrganizationsController/APPComprehensiveSocialOrganizationController.java

@@ -1,16 +1,21 @@
 package com.sooka.sponest.mobile.comprehensive.nonPublicEconomicOrganizationsController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveSocialOrganization;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveSocialOrganizationService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zhaozhan
@@ -33,7 +38,25 @@ public class APPComprehensiveSocialOrganizationController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = comprehensiveSocialOrganizationService.list(pageNum, pageSize, comprehensiveSocialOrganization.getSocialOrganizationName(), comprehensiveSocialOrganization.getRegistrationNumbe(), comprehensiveSocialOrganization.getPrincipalIdNumber());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+
+            Map<String,Object> comprehensiveSocialOrganization1 = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_SOCIAL_ORGANIZATION);
+            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+            Map<String,Object> comprehensiveLevelOfAttention = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION);
+            for (Map<String, Object> row : rows) {
+
+                row.put("socialOrganizationTypeLabel",MapUtils.getString(comprehensiveSocialOrganization1 , MapUtils.getString(row,"socialOrganizationType")));
+                row.put("principalIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode, MapUtils.getString(row,"principalIdCode")));
+                row.put("attentivenessLabel",MapUtils.getString(comprehensiveLevelOfAttention, MapUtils.getString(row,"attentiveness")));
+                row.put("conditionsEstablishmentLabel",MapUtils.getLong(row,"conditionsEstablishment")==0?"否":"是");
+                row.put("communistOrganizationLabel",MapUtils.getLong(row,"communistOrganization")==0?"否":"是");
+                row.put("tradeUnionLabel",MapUtils.getLong(row,"tradeUnion")==0?"否":"是");
+                row.put("communistYouthLeagueLabel",MapUtils.getLong(row,"communistYouthLeague")==0?"否":"是");
+                row.put("womenFederationLabel",MapUtils.getLong(row,"womenFederation")==0?"否":"是");
+                row.put("overseasBackgroundLabel",MapUtils.getLong(row,"overseasBackground")==0?"否":"是");
+                row.put("statusLabel",MapUtils.getLong(row,"status")==0?"不可用":"可用");
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -45,7 +68,23 @@ public class APPComprehensiveSocialOrganizationController {
      */
     @GetMapping("/ComprehensiveSocialOrganization/edit")
     public AjaxResult edit(String id) {
-        return AjaxResult.success(comprehensiveSocialOrganizationService.edit(id));
+        AjaxResult ajaxResult = comprehensiveSocialOrganizationService.edit(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            HashMap<String,Object> comprehensiveSocialOrganization = (HashMap<String, Object>) ajaxResult.get("data");
+            comprehensiveSocialOrganization.put("socialOrganizationTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_SOCIAL_ORGANIZATION, MapUtils.getString(comprehensiveSocialOrganization,"socialOrganizationType")));
+            comprehensiveSocialOrganization.put("principalIdCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveSocialOrganization,"principalIdCode")));
+            comprehensiveSocialOrganization.put("attentivenessLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVEL_OF_ATTENTION, MapUtils.getString(comprehensiveSocialOrganization,"attentiveness")));
+            comprehensiveSocialOrganization.put("conditionsEstablishmentLabel",MapUtils.getLong(comprehensiveSocialOrganization,"conditionsEstablishment")==0?"否":"是");
+            comprehensiveSocialOrganization.put("communistOrganizationLabel",MapUtils.getLong(comprehensiveSocialOrganization,"communistOrganization")==0?"否":"是");
+            comprehensiveSocialOrganization.put("tradeUnionLabel",MapUtils.getLong(comprehensiveSocialOrganization,"tradeUnion")==0?"否":"是");
+            comprehensiveSocialOrganization.put("communistYouthLeagueLabel",MapUtils.getLong(comprehensiveSocialOrganization,"communistYouthLeague")==0?"否":"是");
+            comprehensiveSocialOrganization.put("womenFederationLabel",MapUtils.getLong(comprehensiveSocialOrganization,"womenFederation")==0?"否":"是");
+            comprehensiveSocialOrganization.put("overseasBackgroundLabel",MapUtils.getLong(comprehensiveSocialOrganization,"overseasBackground")==0?"否":"是");
+            comprehensiveSocialOrganization.put("statusLabel",MapUtils.getLong(comprehensiveSocialOrganization,"status")==0?"不可用":"可用");
+            return AjaxResult.success(comprehensiveSocialOrganization);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
     }
     /**
      * 社会组织新增

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

@@ -1,17 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveLeadership;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteLeadershipService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 综治领导责任制
@@ -36,7 +41,17 @@ public class AppLeadershipController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteLeadershipService.selectComprehensiveLeadershipList(pageNum, pageSize,comprehensiveLeadership.getImplementPrincipal());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> comprehensiveLevels = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_LEVELS);
+            Map<String,Object> comprehensivePoliciesType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_POLICIES_TYPE);
+
+
+            for (Map<String, Object> row : rows) {
+                row.put("implementedLevelLabel",MapUtils.getString(comprehensiveLevels,MapUtils.getString(row,"implementedLevel")));
+                row.put("implementLevelLabel",MapUtils.getString(comprehensiveLevels,MapUtils.getString(row,"implementLevel")));
+                row.put("policyTypelabel",MapUtils.getString(comprehensivePoliciesType, MapUtils.getString(row,"policyType")));
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -47,7 +62,16 @@ public class AppLeadershipController extends BaseController {
      */
     @GetMapping("/comprehensiveLeadership/edit")
     public AjaxResult getInfo(String id) {
-        return remoteLeadershipService.selectComprehensiveLeadershipById(id);
+        AjaxResult ajaxResult = remoteLeadershipService.selectComprehensiveLeadershipById(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            HashMap<String,Object> comprehensiveLeadership = (HashMap<String, Object>) ajaxResult.get("data");
+            comprehensiveLeadership.put("implementedLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVELS, MapUtils.getString(comprehensiveLeadership,"implementedLevel")));
+            comprehensiveLeadership.put("implementLevelLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_LEVELS, MapUtils.getString(comprehensiveLeadership,"implementLevel")));
+            comprehensiveLeadership.put("policyTypelabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_POLICIES_TYPE, MapUtils.getString(comprehensiveLeadership,"policyType")));
+            return AjaxResult.success(comprehensiveLeadership);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -10,10 +11,12 @@ import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensivepatrol.domain.ComprehensivePatrolPlan;
 import com.sooka.sponest.comprehensive.api.comprehensivepatrol.service.RemotePatrolPlanService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 巡查计划
@@ -38,7 +41,15 @@ public class AppPatrolPlanController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remotePatrolPlanService.selectPatrolPlanList(pageNum, pageSize,comprehensivepatrolplan.getType(),comprehensivepatrolplan.getName());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> forestLinLevel = DictUtils.getDictCacheToMap(DictKeys.FOREST_LIN_LEVEL);
+            Map<String,Object> centerdataplanningCycle = DictUtils.getDictCacheToMap(DictKeys.CENTERDATAPLANNING_CYCLE);
+
+            for (Map<String, Object> row : rows) {
+             row.put("rankLabel", MapUtils.getString(forestLinLevel,MapUtils.getString(row,"rank")));
+             row.put("periodLabel", MapUtils.getString(centerdataplanningCycle,MapUtils.getString(row,"period")));
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -51,11 +62,12 @@ public class AppPatrolPlanController extends BaseController {
     public AjaxResult getInfo(String id) {
         R<ComprehensivePatrolPlan> edit = remotePatrolPlanService.selectPatrolPlanById(id);
         ComprehensivePatrolPlan data = edit.getData();
+        data.setRankLabel(DictUtils.getDictDataByValue(DictKeys.FOREST_LIN_LEVEL,data.getRank()));
+        data.setPeriodLabel(DictUtils.getDictDataByValue(DictKeys.CENTERDATAPLANNING_CYCLE,data.getPeriod()));
         if (HttpStatus.SUCCESS == edit.getCode()){
-            data.setRankLabel(DictUtils.getDictDataByValue("forest_lin_level",data.getRank()));
-            data.setPeriodLabel(DictUtils.getDictDataByValue("centerdataplanning_cycle",data.getPeriod()));
             data.setIsEdit(true);
         }else if (HttpStatus.ERROR == edit.getCode() && null != edit.getData()) {
+
             data.setIsEdit(false);
         }else {
             return AjaxResult.error(edit.getCode(), edit.getMsg());
@@ -91,7 +103,18 @@ public class AppPatrolPlanController extends BaseController {
      */
     @GetMapping("/comprehensivepatrolplan/getPatrolPlanAll")
     public AjaxResult getPatrolPlanAll(String type) {
-
-        return remotePatrolPlanService.getPatrolPlanAll(type);
+        AjaxResult ajaxResult = remotePatrolPlanService.getPatrolPlanAll(type);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            List<Map<String,Object>>  data = (List<Map<String, Object>>) ajaxResult.get("data");
+            Map<String,Object> forestLinLevel = DictUtils.getDictCacheToMap(DictKeys.FOREST_LIN_LEVEL);
+            Map<String,Object> centerdataplanningCycle = DictUtils.getDictCacheToMap(DictKeys.CENTERDATAPLANNING_CYCLE);
+            for (Map<String, Object> datum : data) {
+                datum.put("rankLabel", MapUtils.getString(forestLinLevel,MapUtils.getString(datum,"rank")));
+                datum.put("periodLabel", MapUtils.getString(centerdataplanningCycle,MapUtils.getString(datum,"period")));
+            }
+            return AjaxResult.success(data);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -10,10 +11,12 @@ import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensivepatrol.domain.ComprehensivePatrolTask;
 import com.sooka.sponest.comprehensive.api.comprehensivepatrol.service.RemotePatrolTaskService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 巡查任务
@@ -38,7 +41,12 @@ public class AppPatrolTaskController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remotePatrolTaskService.selectPatrolTaskList(pageNum, pageSize,comprehensivepatroltask.getType(),comprehensivepatroltask.getPlanName());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String, Object> waterTaskStatus = DictUtils.getDictCacheToMap(DictKeys.WATER_TASK_STATUS);
+            for (Map<String, Object> row : rows) {
+                row.put("statusLabel", MapUtils.getString(waterTaskStatus,MapUtils.getString(row,"status")));
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -52,7 +60,7 @@ public class AppPatrolTaskController extends BaseController {
         R<ComprehensivePatrolTask> edit = remotePatrolTaskService.selectPatrolTaskById(id);
         ComprehensivePatrolTask data = edit.getData();
         if(HttpStatus.SUCCESS == edit.getCode()){
-            data.setStatusLabel(DictUtils.getDictDataByValue("water_task_status",data.getStatus()));
+            data.setStatusLabel(DictUtils.getDictDataByValue(DictKeys.WATER_TASK_STATUS,data.getStatus()));
             return AjaxResult.success(data);
         }else {
             return AjaxResult.error(edit.getCode(), edit.getMsg());
@@ -87,6 +95,16 @@ public class AppPatrolTaskController extends BaseController {
      */
     @GetMapping("/comprehensivepatroltask/getPatrolTaskAll")
     public AjaxResult getPatrolTaskAll(String type) {
-        return remotePatrolTaskService.getPatrolTaskAll(type);
+        AjaxResult ajaxResult = remotePatrolTaskService.getPatrolTaskAll(type);;
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+           List<Map<String,Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
+            Map<String, Object> waterTaskStatus = DictUtils.getDictCacheToMap(DictKeys.WATER_TASK_STATUS);
+            for (Map<String, Object> datum : data) {
+                datum.put("statusLabel", MapUtils.getString(waterTaskStatus,MapUtils.getString(datum,"status")));
+            }
+            return AjaxResult.success(data);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
     }
 }

src/main/java/com/sooka/sponest/mobile/comprehensive/schoolSafetyController/AppSafetyInvolvedController.java

@@ -1,17 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.schoolSafetyController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.domain.ComprehensiveSafetyInvolved;
 import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.service.RemoteSafetyInvolvedService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 涉及师生安全的案（事）件app
@@ -36,7 +41,17 @@ public class AppSafetyInvolvedController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedList(pageNum, pageSize, comprehensiveSafetyInvolved.getCaseName());
         if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
+            Map<String,Object> comprehensiveNatureOfTheCase = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_NATURE_OF_THE_CASE);
+            Map<String,Object> comprehensiveCertificateCode = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE);
+            for (Map<String, Object> row : rows) {
+                row.put("occurPlaceLabel", MapUtils.getString(comprehensiveCityCode,MapUtils.getString(row,"occurPlace")));
+                row.put("caseNatureLabel",MapUtils.getString(comprehensiveNatureOfTheCase, MapUtils.getString(row,"caseNature")));
+                row.put("mainSuspectIdCodeLabel",MapUtils.getString(comprehensiveCertificateCode, MapUtils.getString(row,"mainSuspectIdCode")));
+                row.put("solvedLabel",MapUtils.getLong(row,"solved") == 1? "是":"否");
+            }
+            return AjaxResult.success(rows);
         } else {
             return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
         }
@@ -48,7 +63,19 @@ public class AppSafetyInvolvedController extends BaseController {
      */
     @GetMapping("/SafetyInvolved/edit")
     public AjaxResult getInfo(String id) {
-        return remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedById(id);
+        AjaxResult ajaxResult = remoteSafetyInvolvedService.selectComprehensiveSafetyInvolvedById(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            HashMap<String,Object> comprehensiveSafetyInvolved = (HashMap<String, Object>) ajaxResult.get("data");
+            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
+            comprehensiveSafetyInvolved.put("occurPlaceLabel", MapUtils.getString(comprehensiveCityCode,MapUtils.getString(comprehensiveSafetyInvolved,"occurPlace")));
+            comprehensiveSafetyInvolved.put("caseNatureLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_NATURE_OF_THE_CASE, MapUtils.getString(comprehensiveSafetyInvolved,"caseNature")));
+            comprehensiveSafetyInvolved.put("mainSuspectIdCodeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_CERTIFICATE_CODE, MapUtils.getString(comprehensiveSafetyInvolved,"mainSuspectIdCode")));
+            comprehensiveSafetyInvolved.put("solvedLabel",MapUtils.getLong(comprehensiveSafetyInvolved,"solved") == 1? "是":"否");
+
+            return AjaxResult.success(comprehensiveSafetyInvolved);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
     }
 
     /**

src/main/java/com/sooka/sponest/mobile/comprehensive/schoolSafetyController/AppSchoolController.java

@@ -1,18 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.schoolSafetyController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.DictKeys;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRfhGridLeader;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.domain.ComprehensiveSchool;
 import com.sooka.sponest.comprehensive.api.comprehensiveSchoolSafety.service.RemoteSchoolService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 学校app
@@ -37,7 +41,16 @@ public class AppSchoolController extends BaseController {
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo tableDataInfo = remoteSchoolService.selectComprehensiveSchoolList(pageNum, pageSize, comprehensiveSchool.getSchoolName());
         if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
-            return AjaxResult.success(tableDataInfo.getRows());
+            List<Map<String,Object>> rows = (List<Map<String, Object>>) tableDataInfo.getRows();
+            Map<String,Object> map = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_TYPE_OF_SCHOOL);
+            Map<String,Object> map1 = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
+            if (!rows.isEmpty()) {
+                for (Map<String,Object> datum : rows) {
+                    datum.put("schoolTypeLabel",MapUtils.getString(map,MapUtils.getString(datum,"schoolType")));
+                    datum.put("dictName", MapUtils.getString(map1,MapUtils.getString(datum,"educationAdminDept")));
+                }
+            }
+            return AjaxResult.success(rows);
         }else{
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
@@ -49,7 +62,16 @@ public class AppSchoolController extends BaseController {
      */
     @GetMapping("/leader/edit")
     public AjaxResult getInfo(String id) {
-        return remoteSchoolService.selectComprehensiveSchoolById(id);
+        AjaxResult ajaxResult = remoteSchoolService.selectComprehensiveSchoolById(id);
+        if("200".equals(MapUtils.getString(ajaxResult,"code"))){
+            HashMap<String,Object> comprehensiveSchool = (HashMap<String, Object>) ajaxResult.get("data");
+            Map<String,Object> map = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);
+            comprehensiveSchool.put("schoolTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_TYPE_OF_SCHOOL, MapUtils.getString(comprehensiveSchool,"schoolType")));
+            comprehensiveSchool.put("dictName", MapUtils.getString(map,MapUtils.getString(comprehensiveSchool,"educationAdminDept")));
+            return AjaxResult.success(comprehensiveSchool);
+        }else{
+            return AjaxResult.error(MapUtils.getString(ajaxResult,"code"), MapUtils.getString(ajaxResult,"msg"));
+        }
     }
 
     /**

src/main/java/com/sooka/sponest/mobile/comprehensive/socialPolicingController/AppSafetyManagementController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.domain.SafetyManagement;
 import com.sooka.sponest.comprehensive.api.comprehensiveSocialPolicing.service.RemoteSafetyManagementService;
 import com.ruoyi.common.core.domain.DictKeys;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -38,6 +39,7 @@ public class AppSafetyManagementController {
         Map<String, Object> typeOfRegistration = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_TYPE_OF_REGISTRATION);
         Map<String, Object> holdingInertia = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_HOLDING_INERTIA);
         Map<String, Object> businessType = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_BUSINESS_TYPE);
+        Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
 
         if (HttpStatus.SUCCESS == list.getCode()) {
             List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) list.getRows();
@@ -49,6 +51,7 @@ public class AppSafetyManagementController {
                 row.put("preClosingCheckLabel","1".equals(row.get("preClosingCheck").toString())? "是":"否");
                 row.put("realNameRegistrationLabel","1".equals(row.get("realNameRegistration").toString())? "是":"否");
                 row.put("xrayInspectionLabel","1".equals(row.get("xrayInspection").toString())? "是":"否");
+                row.put("enterprisePlaceLabel", MapUtils.getString(comprehensiveCityCode,MapUtils.getString(row,"enterprisePlace")));
             }
             return AjaxResult.success(rows);
         } else {
@@ -65,6 +68,8 @@ public class AppSafetyManagementController {
         AjaxResult edit = safetyManagementService.getEdit(safetyManagement.getId());
         if("200".equals(edit.get("code").toString())){
             HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
+            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
+
             data.put("registrationTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_TYPE_OF_REGISTRATION,data.get("registrationType").toString()));
             data.put("holdingStatusLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_HOLDING_INERTIA,data.get("holdingStatus").toString()));
             data.put("enterpriseTypeLabel",DictUtils.getDictDataByValue(DictKeys.COMPREHENSIVE_BUSINESS_TYPE,data.get("enterpriseType").toString()));
@@ -72,6 +77,8 @@ public class AppSafetyManagementController {
             data.put("preClosingCheckLabel","1".equals(data.get("preClosingCheck").toString())? "是":"否");
             data.put("realNameRegistrationLabel","1".equals(data.get("realNameRegistration").toString())? "是":"否");
             data.put("xrayInspectionLabel","1".equals(data.get("xrayInspection").toString())? "是":"否");
+
+            data.put("enterprisePlaceLabel",MapUtils.getString(comprehensiveCityCode,MapUtils.getString(data,"enterprisePlace")));
             return AjaxResult.success(data);
         }else{
             return edit;

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

@@ -48,6 +48,8 @@ public class AppVictimController {
         Map<String, Object> religiousBelief = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_RELIGIOUS_BELIEF);//宗教信仰
         Map<String, Object> occupationalCategory = DictUtils.getDictCacheToMap(DictKeys.COMPREHENSIVE_OCCUPATIONAL_CATEGORY);//职业类别
 
+        Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
+
         //isSevereMentalDisorderPatient     是否为严重精神障碍患者
         //isMinor                           是否为未成年人
         //isJuvenile                        是否为青少年
@@ -55,6 +57,12 @@ public class AppVictimController {
         if (HttpStatus.SUCCESS == list.getCode()) {
             List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) list.getRows();
             for (HashMap<String, Object> row : rows) {
+
+                row.put("nativePlaceLabel",null == row.get("nativePlace")?"":comprehensiveCityCode.get(row.get("nativePlace")));
+                row.put("registeredResidenceLabel",null == row.get("registeredResidence")?"":comprehensiveCityCode.get(row.get("registeredResidence")));
+                row.put("currentResidenceLabel",null == row.get("currentResidence")?"":comprehensiveCityCode.get(row.get("currentResidence")));
+
+
                 row.put("identityCodeLabel",certificateCode.get(row.get("identityCode")));
                 row.put("genderLabel",sex.get(row.get("gender")));
 
@@ -85,7 +93,7 @@ public class AppVictimController {
         AjaxResult edit = victimService.getEdit(victim.getId());
         if("200".equals(edit.get("code").toString())){
             HashMap<String,Object> data = (HashMap<String, Object>) edit.get("data");
-
+            Map<String,Object> comprehensiveCityCode = DictUtils.getComprehensiveDictCacheToMap(DictKeys.COMPREHENSIVE_CITY_CODE);//籍贯、户籍地、所在地
             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("nationalityRegionLabel",null == data.get("nationalityRegion")? "":DictUtils.getDictDataByValue("comprehensive_internation",data.get("nationalityRegion").toString()));
@@ -99,6 +107,11 @@ public class AppVictimController {
             data.put("isSevereMentalDisorderPatientLabel",null == data.get("isSevereMentalDisorderPatient")? "":"1".equals(data.get("isSevereMentalDisorderPatient").toString())?"是":"否");
             data.put("isMinorLabel",null == data.get("isMinor")? "":"1".equals(data.get("isMinor").toString())?"是":"否");
             data.put("isJuvenileLabel",null == data.get("isJuvenile")? "":"1".equals(data.get("isJuvenile").toString())?"是":"否");
+
+            data.put("nativePlaceLabel",null == data.get("nativePlace")?"":comprehensiveCityCode.get(data.get("nativePlace")));
+            data.put("registeredResidenceLabel",null == data.get("registeredResidence")?"":comprehensiveCityCode.get(data.get("registeredResidence")));
+            data.put("currentResidenceLabel",null == data.get("currentResidence")?"":comprehensiveCityCode.get(data.get("currentResidence")));
+
             return AjaxResult.success(data);
         }else{
             return edit;