From 237af41edb4cc1e0b15c2f32404e4ac0752ff35e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 30 May 2023 16:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8A=82=E7=82=B9=20=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActSarItemsBussEOController.java | 13 +++++++++++++ .../da/workFlow/controller/WorkFlowController.java | 3 +++ 2 files changed, 16 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index 40dfc60f..be557b57 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -4,6 +4,7 @@ package com.adc.da.workFlow.controller; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.adc.da.workFlow.entity.GetQBZXDExcelDto; import com.adc.da.workFlow.service.ActSarItemsBussEOService; @@ -32,6 +33,9 @@ public class ActSarItemsBussEOController extends BaseController { @Autowired private ActSarItemsBussEOService actSarItemsEOService; + @Autowired + private OnlineFileLogService onlineFileLogService; + // private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class); @ApiOperation(value = "|SarBussionessStand|企标复审入库流程") @@ -51,6 +55,15 @@ public class ActSarItemsBussEOController extends BaseController { if (StringUtils.isNotBlank(infoJson)) { JSONObject jsonObject = JSON.parseObject(infoJson); if(jsonObject!=null){ + // 在线编辑 转换问题 + Object fugBuss = jsonObject.get("FBGBUSS"); + if(fugBuss!=null){ + String fug = fugBuss.toString(); + if(StringUtils.isNotBlank(fug)) { + String fileId = onlineFileLogService.selectOnlineFile(fug); + jsonObject.put("FBGBUSS",fileId); + } + } Object issueTime = jsonObject.get("issueTime"); Object standSort = jsonObject.get("standSort"); if(issueTime!=null && standSort!=null){ 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 ce74e290..61220b24 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 @@ -1100,6 +1100,9 @@ public class WorkFlowController extends BaseController { attFileEODao.updateFileInfoById(attFileEO); logger.info("======================文件名称修改成功==============================="+standName+".docx"+"======"+"传入对象为："+attFileEO.getOldFileName()); } + // 转码编译 + + //删除媒介桥梁文件 if(file.delete()){ //删除文件名称