From ac2e83387aa465fa3eb5f23b6ef95c50999cb321 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 17:17:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 31 +++++++++++++++++++ .../esRevisePlan/entity/EsRevisePlanInfo.java | 10 ++++++ 2 files changed, 41 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanInfo.java 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 c934cd2f..3ee690f4 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 @@ -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,26 @@ public class WorkFlowController { qbfsForm.put("rqbJson",data.getRqbJson()); qbfsForm.put("rqbName",data.getRqbName()); + if(StringUtils.isNotBlank(data.getRqbJson())){ + //通过id去找到代替标准号 + List 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) { + EsRevisePlanInfo esRevisePlanInfo = new EsRevisePlanInfo(); + esRevisePlanInfo.setId(fileInfo.getId()); + esRevisePlanInfo.setName(fileInfo.getOldFileName()); + objects.add(esRevisePlanInfo); + } + } + } + qbfsForm.put("fbgbuss",objects); + } + //qbfsForm.put("fbgbussName",""); qbfsForm.put("rqbCode",data.getRqbCode()); qbfsForm.put("tsJson",data.getTsJson()); qbfsForm.put("tsJsonName",data.getTsJsonName()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanInfo.java new file mode 100644 index 00000000..200a1a65 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanInfo.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.esRevisePlan.entity; + +import lombok.Data; +@Data +public class EsRevisePlanInfo { + + private String id; + + private String name; +} From 619696a8335f33cd0d6b2851182778bfaf97a543 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 17:30:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 30 +++++++++++++++++++ .../entity/SarBussionessStand.java | 5 ++++ 2 files changed, 35 insertions(+) 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) From 9f5806520bfccb4822d69702b020a0ec3de87055 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 18:16:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 21 +++++++++++++----- .../SarBussionessStandController.java | 22 ++++++++++++++----- .../entity/SarBussionessStand.java | 6 ++++- 3 files changed, 37 insertions(+), 12 deletions(-) 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; // 非表字段