diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 3ee690f4..8fcb78f4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1135,6 +1135,8 @@ public class WorkFlowController { qbfsForm.put("rqbName",data.getRqbName()); if(StringUtils.isNotBlank(data.getRqbJson())){ //通过id去找到代替标准号 + String fbgBuss =""; + String fbgBussName = ""; List objects = new ArrayList<>(); SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getRqbJson()); if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) { @@ -1143,14 +1145,23 @@ public class WorkFlowController { 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); + if(StringUtils.isNotBlank(fbgBuss)){ + fbgBuss = fbgBuss+","+fileInfo.getId(); + }else { + fbgBuss = fileInfo.getId(); + } + + if(StringUtils.isNotBlank(fbgBussName)){ + fbgBussName = fbgBussName+","+fileInfo.getId(); + }else { + fbgBussName = fileInfo.getId(); + } + } } } - qbfsForm.put("fbgbuss",objects); + qbfsForm.put("LSBBBUSS",objects); + qbfsForm.put("LSBBBUSSName",objects); } //qbfsForm.put("fbgbussName",""); qbfsForm.put("rqbCode",data.getRqbCode()); 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 a41cccfd..b1b008cc 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 @@ -369,19 +369,29 @@ public class SarBussionessStandController extends BaseController fbgBuss; + private String LSBBBUSS; + + @ApiModelProperty(value = "发布稿名称") + @TableField(exist = false) + private String LSBBBUSSName; // 非表字段