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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!56
This commit is contained in:
高嵩
2023-04-19 18:32:13 +08:00
parent 0083b13d26 9f5806520b
commit 85e156e79d
4 changed files with 101 additions and 0 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
+42
View File
@@ -6,6 +6,8 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.hutool.core.lang.UUID;
import com.adc.da.FeignClientImpl.workFlowFeignClientImpl;
import com.adc.da.Timer.ProcessTimer;
import com.adc.da.att.entity.AttFileEO;
import com.adc.da.att.service.impl.AttFileEOServiceImpl;
import com.adc.da.common.*;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.PageInfo;
@@ -16,8 +18,11 @@ import com.adc.da.login.util.JwtUtils;
import com.adc.da.slrs.StandardQA.service.Impl.SarAgenldAcceptButtonServiceImpl;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo;
import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
import com.adc.da.slrs.sarUser.entity.TsUser;
@@ -101,6 +106,12 @@ public class WorkFlowController {
@Autowired
private DicTypeEODao dicTypeEODao;
@Autowired
private SarBussStandAttrInfoDao sarBussStandAttrInfoDao;
@Autowired
private AttFileEOServiceImpl attFileEOService;
// @Autowired
// private ExportExcelMapper exportExcelMapper;
@@ -1122,6 +1133,37 @@ public class WorkFlowController {
qbfsForm.put("rqbJson",data.getRqbJson());
qbfsForm.put("rqbName",data.getRqbName());
if(StringUtils.isNotBlank(data.getRqbJson())){
//通过id去找到代替标准号
String fbgBuss ="";
String fbgBussName = "";
List<EsRevisePlanInfo> objects = new ArrayList<>();
SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getRqbJson());
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) {
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("LSBBBUSS",objects);
qbfsForm.put("LSBBBUSSName",objects);
}
//qbfsForm.put("fbgbussName","");
qbfsForm.put("rqbCode",data.getRqbCode());
qbfsForm.put("tsJson",data.getTsJson());
qbfsForm.put("tsJsonName",data.getTsJsonName());
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanInfo.java
+10
View File
@@ -0,0 +1,10 @@
package com.adc.da.slrs.esRevisePlan.entity;
import lombok.Data;
@Data
public class EsRevisePlanInfo {
private String id;
private String name;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+40
View File
@@ -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<SarBussionessSt
@Autowired
private ITsResourceService tsResourceService;
@Autowired
private SarBussStandAttrInfoDao sarBussStandAttrInfoDao;
@Autowired
private AttFileEOServiceImpl attFileEOService;
/**
* 根据计划库制定状态查询企标编号
*
@@ -352,6 +363,35 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
nowOrderFunc(page);
}
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
for(SarBussionessStand data: rows){
List<EsRevisePlanInfo> objects = new ArrayList<>();
SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoDao.selectByIdAtt(data.getId());
if(sarBussStandAttrInfo != null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())) {
String fbgbuss = sarBussStandAttrInfo.getFbgbuss();
String[] split = fbgbuss.split(",");
String fbgBuss ="";
String fbgBussName = "";
for (String fileId : split) {
AttFileEO fileInfo = attFileEOService.getFileInfo(fileId);
if (fileInfo != null) {
if(StringUtils.isNotBlank(fbgBuss)){
fbgBuss = fbgBuss+","+fileInfo.getId();
}else {
fbgBuss = fileInfo.getId();
}
if(StringUtils.isNotBlank(fbgBussName)){
fbgBussName = fbgBussName+","+fileInfo.getId();
}else {
fbgBussName = fileInfo.getId();
}
}
}
data.setLSBBBUSS(fbgBuss);
data.setLSBBBUSSName(fbgBussName);
}
}
return Result.success(getPageInfo(page.getPager(), rows));
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+9
View File
@@ -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,14 @@ public class SarBussionessStand extends BaseEntity {
@TableField("STAND_SN")
private String standSn;
@ApiModelProperty(value = "发布稿名称")
@TableField(exist = false)
private String LSBBBUSS;
@ApiModelProperty(value = "发布稿名称")
@TableField(exist = false)
private String LSBBBUSSName;
// 非表字段
@TableField(exist = false)