添加label值

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

@@ -6,6 +6,7 @@ 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.comprehensiveConflictDefuse.service.RemoteConflictResolutionService;
 import org.springframework.web.bind.annotation.*;
@@ -41,15 +42,18 @@ public class AppConflictResolutionController extends BaseController {
      */
     @GetMapping("/conflict/edit")
     public AjaxResult getInfo(String id) {
-        ConflictResolution conflictResolution = remoteConflictResolutionService.selectConflictResolutionById(id);
-        if (!conflictResolution.getResolutionSuccess().isEmpty()) {
-            if (conflictResolution.getResolutionSuccess().equals("1")){
-                conflictResolution.setResolutionSuccessLabel("是");
-            }else {
-                conflictResolution.setResolutionSuccessLabel("否");
-            }
+        AjaxResult ajaxResult = remoteConflictResolutionService.selectConflictResolutionById(id);
+        if("200".equals(String.valueOf(ajaxResult.get("code")))){
+            ConflictResolution conflictResolution = (ConflictResolution) ajaxResult.get("data");
+            conflictResolution.setMainPersonIdCodeLabel(DictUtils.getDictDataByValue("comprehensive_certificate_code", conflictResolution.getMainPersonIdCode()));
+            conflictResolution.setMainPersonGenderLabel(DictUtils.getDictDataByValue("comprehensive_sex", conflictResolution.getMainPersonGender()));
+            conflictResolution.setMainPersonNationalityLabel(DictUtils.getDictDataByValue("comprehensive_nation", conflictResolution.getMainPersonNationality()));
+            conflictResolution.setMainPersonEducationLabel(DictUtils.getDictDataByValue("comprehensive_educational_background", conflictResolution.getMainPersonEducation()));
+            conflictResolution.setResolutionSuccessLabel(!conflictResolution.getResolutionSuccess().isEmpty()?("1".equals(conflictResolution.getResolutionSuccess())?"是":"否"):"");
+            return AjaxResult.success(conflictResolution);
+        }else{
+            return AjaxResult.error(ajaxResult.get("code").toString(), ajaxResult.get("msg"));
         }
-        return AjaxResult.success(conflictResolution);
     }
 
     /**