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 { @Autowired private ISarFileCompareInfoService sarFileCompareInfoService; + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; /** * 分页列表查询 @@ -63,10 +69,25 @@ public class SarFileCompareInfoController extends JeroController 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 ""; + } + + /** * 列表查询 *