From 237af41edb4cc1e0b15c2f32404e4ac0752ff35e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 30 May 2023 16:03:08 +0800 Subject: [PATCH 1/2] =?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()){ //删除文件名称 From 8514dddb382fdb673c7026a6a2b723f01cfeb452 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 30 May 2023 16:05:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=20his?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 3 -- .../controller/OnlineFileLogController.java | 16 ++++++++ .../service/OnlineFileLogService.java | 1 + .../impl/OnlineFileLogServiceImpl.java | 37 +++++++++++++++++++ 4 files changed, 54 insertions(+), 3 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 61220b24..ce74e290 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,9 +1100,6 @@ public class WorkFlowController extends BaseController { attFileEODao.updateFileInfoById(attFileEO); logger.info("======================文件名称修改成功==============================="+standName+".docx"+"======"+"传入对象为："+attFileEO.getOldFileName()); } - // 转码编译 - - //删除媒介桥梁文件 if(file.delete()){ //删除文件名称 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java index 2ab92a0d..9eb258e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java @@ -1,8 +1,13 @@ package com.adc.da.slrs.OnlineFileLog.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,4 +18,15 @@ public class OnlineFileLogController { @Autowired private OnlineFileLogService onlineFileLogService; + + @ApiOperation(value = "|在线编辑id查找标准文件id") + @PostMapping("/selectOnlineFile") + public ResponseMessage selectOnlineFile(String ids) { + if (StringUtils.isNotBlank(ids)) { + String fileIds = onlineFileLogService.selectOnlineFile(ids); + return Result.success(fileIds); + } else { + return Result.error("转换失败"); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java index 44787a12..2185ac3f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java @@ -4,4 +4,5 @@ import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.baomidou.mybatisplus.extension.service.IService; public interface OnlineFileLogService extends IService { + String selectOnlineFile(String ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java index 3e4f66e7..d7e2a353 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java @@ -3,10 +3,47 @@ package com.adc.da.slrs.OnlineFileLog.service.impl; import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao; import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class OnlineFileLogServiceImpl extends ServiceImpl implements OnlineFileLogService { + @Override + public String selectOnlineFile(String ids) { + String fileId = ""; + if(StringUtils.isNotBlank(ids)){ + String[] fbgFileId = ids.split(","); + for (String id :fbgFileId){ + if(id.contains("ATT_FILE_")){ + //则是正规数据 + if(StringUtils.isNotBlank(fileId)){ + fileId = fileId+","+ id; + }else { + fileId = id; + } + }else { + //加工数据 + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("HIS_ID",id); + onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); + List onlineFileLogs = baseMapper.selectList(onlineFileLogQueryWrapper); + if(!onlineFileLogs.isEmpty()){ + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileId)){ + fileId = fileId+","+onlineFileLogs.get(0).getAttFileId(); + }else { + fileId = onlineFileLogs.get(0).getAttFileId(); + } + } + } + + } + //jsonObject.put("FBGBUSS",fileId); + } + return fileId; + } }