diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java index 48ccd5e70..80a4e28a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryLogEOController.java @@ -55,7 +55,8 @@ public class ProjectCertificationInventoryLogEOController extends JeroController QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); queryWrapper.orderByDesc("create_time"); - IPage pageList = projectCertificationInventoryLogEOService.page(page, queryWrapper); + IPage pageList = this.projectCertificationInventoryLogEOService.page(page, queryWrapper); + this.projectCertificationInventoryLogEOService.disposeData(pageList.getRecords(),projectCertificationInventoryLogEO.getCut()); return Result.OK(pageList); } @@ -68,7 +69,7 @@ public class ProjectCertificationInventoryLogEOController extends JeroController @ApiOperation(value="项目库-认证清单-修改历史表-列表查询", notes="项目库-认证清单-修改历史表-列表查询") @GetMapping(value = "/list") public Result> queryList(ProjectCertificationInventoryLogEO projectCertificationInventoryLogEO,HttpServletRequest req) { - List list = projectCertificationInventoryLogEOService.queryList(projectCertificationInventoryLogEO,req); + List list = this.projectCertificationInventoryLogEOService.queryList(projectCertificationInventoryLogEO,req); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java index d52dfbe75..750630d9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryLogEOService.java @@ -66,4 +66,11 @@ public interface IProjectCertificationInventoryLogEOService extends IService projectCertificationInventoryLogEOList); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java index a944077b1..3ff2f34b6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryLogEOServiceImpl.java @@ -1,10 +1,13 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.mapper.ProjectCertificationInventoryLogEOMapper; import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -91,6 +94,7 @@ public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl

queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryLogEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); List projectCertificationInventoryLogEOList = this.list(queryWrapper); + this.disposeData(projectCertificationInventoryLogEOList,projectCertificationInventoryLogEO.getCut()); return projectCertificationInventoryLogEOList; } @@ -98,4 +102,17 @@ public class ProjectCertificationInventoryLogEOServiceImpl extends ServiceImpl

projectCertificationInventoryLogEOList) { this.saveBatch(projectCertificationInventoryLogEOList); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + for (ProjectCertificationInventoryLogEO data : datas) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + data.setContent(data.getContentCn()); + }else { + data.setContent(data.getContentEn()); + } + } + } + } }