From 8ce557e4548fe345062935d3af30324de8bc373d Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Mon, 8 Aug 2022 17:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94-=E4=BF=AE=E6=94=B9=E6=AF=94=E5=AF=B9=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E8=8B=B1=E6=96=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileCompareInfoController.java         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
index 90b53ed10..f9a9aa1f5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
@@ -1,14 +1,18 @@
 package com.jero.modules.compare.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
+import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.compare.entity.SarFileCompareDetailVO;
 import com.jero.modules.compare.entity.SarFileCompareInfo;
 import com.jero.modules.compare.service.ISarFileCompareInfoService;
@@ -41,6 +45,8 @@ import java.util.List;
 public class SarFileCompareInfoController extends JeroController<SarFileCompareInfo, ISarFileCompareInfoService> {
     @Autowired
     private ISarFileCompareInfoService sarFileCompareInfoService;
+    @Autowired
+    private OnlCgformFieldServiceImpl onlCgformFieldService;
 
     /**
      * 分页列表查询
@@ -63,10 +69,25 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
         IPage<SarFileCompareInfo> pageList = sarFileCompareInfoService.page(page, queryWrapper);
         for (SarFileCompareInfo info : pageList.getRecords()) {
             info.setReleaseStateTitle(ReleaseConditionEnum.getTextByValue(info.getReleaseState(), cut));
+            info.setFileTypeLeft(getFileTypeText(info.getFileTypeLeft(), cut));
+            info.setFileIdRight(getFileTypeText(info.getFileTypeRight(), cut));
         }
         return Result.OK(pageList);
     }
 
+    private String getFileTypeText(String fileType, String cut) {
+        OnlCgformField fileTypeField = this.onlCgformFieldService.queryById(fileType);
+        if (ObjectUtil.isNotEmpty(fileTypeField)) {
+            if (CutEnum.CN.getValue().equals(cut)) {
+                return fileTypeField.getDbFieldTxt();
+            } else {
+                return fileTypeField.getDbFieldEnName();
+            }
+        }
+        return "";
+    }
+
+
     /**
      * 列表查询
      *