diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index ea3b3208..a41cccfd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -4,9 +4,14 @@ package com.adc.da.slrs.sarBussionessStand.controller; import cn.hutool.core.util.ZipUtil; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.impl.AttFileEOServiceImpl; import com.adc.da.common.FileUnZip; import com.adc.da.common.ReadExcel; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; @@ -98,6 +103,12 @@ public class SarBussionessStandController extends BaseController rows = sarBussionessStandEOService.getSarBussionStandPage(page); + for(SarBussionessStand data: rows){ + List objects = new ArrayList<>(); + SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getId()); + if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) { + String fbgbuss = sarBussStandAttrInfo.getFbgbuss(); + String[] split = fbgbuss.split(","); + for (String fileId : split) { + AttFileEO fileInfo = attFileEOService.getFileInfo(fileId); + if (fileInfo != null) { + EsRevisePlanInfo esRevisePlanInfo = new EsRevisePlanInfo(); + esRevisePlanInfo.setId(fileInfo.getId()); + esRevisePlanInfo.setName(fileInfo.getOldFileName()); + objects.add(esRevisePlanInfo); + } + } + } + data.setFbgBuss(objects); + } + return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index f4278876..ccb42a7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -5,6 +5,7 @@ import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; import java.time.LocalDate; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo; import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; @@ -124,6 +125,10 @@ public class SarBussionessStand extends BaseEntity { @TableField("STAND_SN") private String standSn; + @ApiModelProperty(value = "发布稿名称") + @TableField(exist = false) + private List fbgBuss; + // 非表字段 @TableField(exist = false)