群防群治队伍字典

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

@@ -1,14 +1,17 @@
 package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.domain.R;
 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.comprehensiveConflictDefuse.domain.ConflictResolution;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveTPreventionTeam;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.ComprehensiveTPreventionTeamService;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.ibatis.util.MapUtil;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Arrays;
@@ -45,13 +48,19 @@ public class APPComprehensiveTPreventionTeam {
      */
     @GetMapping(value = "/preventionTeam/{id}")
     public AjaxResult getInfo(String id) {
-        AjaxResult ajaxResult = comprehensiveTPreventionTeamService.getInfo(id);
-        if("200".equals(String.valueOf(ajaxResult.get("code")))){
-            HashMap<String,Object> comprehensiveTPreventionTeam = (HashMap<String, Object>) ajaxResult.get("data");
-            comprehensiveTPreventionTeam.put("specialityLabel",String.join(",",DictUtils.getDictDataListByValue("comprehensive_professional_expertise", (List<String>) comprehensiveTPreventionTeam.get("speciality"))));
+        R<ComprehensiveTPreventionTeam> edit = comprehensiveTPreventionTeamService.getInfo(id);
+        if(HttpStatus.SUCCESS == edit.getCode()){
+            ComprehensiveTPreventionTeam comprehensiveTPreventionTeam = edit.getData();
+            comprehensiveTPreventionTeam.setSpecialityLabel(String.join(",",DictUtils.getDictDataListByValue("comprehensive_professional_expertise",comprehensiveTPreventionTeam.getSpeciality())));
+            comprehensiveTPreventionTeam.setGenderLabel(DictUtils.getDictDataByValue("comprehensive_sex", comprehensiveTPreventionTeam.getGender()));
+            comprehensiveTPreventionTeam.setNationLabel(DictUtils.getDictDataByValue("comprehensive_nation", comprehensiveTPreventionTeam.getNation()));
+            comprehensiveTPreventionTeam.setPoliticalOutlookLabel(DictUtils.getDictDataByValue("comprehensive_political_status", comprehensiveTPreventionTeam.getPoliticalOutlook()));
+            comprehensiveTPreventionTeam.setCodeLabel(DictUtils.getDictDataByValue("comprehensive_certificate_code", comprehensiveTPreventionTeam.getCode()));
+            comprehensiveTPreventionTeam.setEducationLabel(DictUtils.getDictDataByValue("comprehensive_educational_background", comprehensiveTPreventionTeam.getEducation()));
+
             return AjaxResult.success(comprehensiveTPreventionTeam);
         }else{
-            return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));
+            return AjaxResult.error(edit.getCode(), edit.getMsg());
         }
 
     }