FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

批量发起企标计划流程 文件 发布稿

Browse Source
This commit is contained in:
gaojiabao
2023-04-19 18:16:29 +08:00
parent 619696a833
commit 9f5806520b
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+16 -5
View File
@@ -1135,6 +1135,8 @@ public class WorkFlowController {
qbfsForm.put("rqbName",data.getRqbName()); qbfsForm.put("rqbName",data.getRqbName());
if(StringUtils.isNotBlank(data.getRqbJson())){ if(StringUtils.isNotBlank(data.getRqbJson())){
//通过id去找到代替标准号 //通过id去找到代替标准号
String fbgBuss ="";
String fbgBussName = "";
List<EsRevisePlanInfo> objects = new ArrayList<>(); List<EsRevisePlanInfo> objects = new ArrayList<>();
SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getRqbJson()); SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getRqbJson());
if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) { if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) {
@@ -1143,14 +1145,23 @@ public class WorkFlowController {
for (String fileId : split) { for (String fileId : split) {
AttFileEO fileInfo = attFileEOService.getFileInfo(fileId); AttFileEO fileInfo = attFileEOService.getFileInfo(fileId);
if (fileInfo != null) { if (fileInfo != null) {
EsRevisePlanInfo esRevisePlanInfo = new EsRevisePlanInfo(); if(StringUtils.isNotBlank(fbgBuss)){
esRevisePlanInfo.setId(fileInfo.getId()); fbgBuss = fbgBuss+","+fileInfo.getId();
esRevisePlanInfo.setName(fileInfo.getOldFileName()); }else {
objects.add(esRevisePlanInfo); 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("fbgbussName","");
qbfsForm.put("rqbCode",data.getRqbCode()); qbfsForm.put("rqbCode",data.getRqbCode());
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+16 -6
View File
@@ -369,19 +369,29 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) { if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) {
String fbgbuss = sarBussStandAttrInfo.getFbgbuss(); String fbgbuss = sarBussStandAttrInfo.getFbgbuss();
String[] split = fbgbuss.split(","); String[] split = fbgbuss.split(",");
String fbgBuss ="";
String fbgBussName = "";
for (String fileId : split) { for (String fileId : split) {
AttFileEO fileInfo = attFileEOService.getFileInfo(fileId); AttFileEO fileInfo = attFileEOService.getFileInfo(fileId);
if (fileInfo != null) { if (fileInfo != null) {
EsRevisePlanInfo esRevisePlanInfo = new EsRevisePlanInfo(); if(StringUtils.isNotBlank(fbgBuss)){
esRevisePlanInfo.setId(fileInfo.getId()); fbgBuss = fbgBuss+","+fileInfo.getId();
esRevisePlanInfo.setName(fileInfo.getOldFileName()); }else {
objects.add(esRevisePlanInfo); fbgBuss = fileInfo.getId();
}
if(StringUtils.isNotBlank(fbgBussName)){
fbgBussName = fbgBussName+","+fileInfo.getId();
}else {
fbgBussName = fileInfo.getId();
}
} }
} }
data.setLSBBBUSS(fbgBuss);
data.setLSBBBUSSName(fbgBussName);
} }
data.setFbgBuss(objects);
} }
return Result.success(getPageInfo(page.getPager(), rows)); return Result.success(getPageInfo(page.getPager(), rows));
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+5 -1
View File
@@ -127,7 +127,11 @@ public class SarBussionessStand extends BaseEntity {
@ApiModelProperty(value = "发布稿名称") @ApiModelProperty(value = "发布稿名称")
@TableField(exist = false) @TableField(exist = false)
private List<EsRevisePlanInfo> fbgBuss; private String LSBBBUSS;
@ApiModelProperty(value = "发布稿名称")
@TableField(exist = false)
private String LSBBBUSSName;
// 非表字段 // 非表字段