合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!91

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<ActSarItemsEO> {
     @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<ActSarItemsEO> {
         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){

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("转换失败");
+        }
+    }
 }

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<OnlineFileLog> {
+    String selectOnlineFile(String ids);
 }

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<OnlineFileLogDao, OnlineFileLog> 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<OnlineFileLog> onlineFileLogQueryWrapper = new QueryWrapper<>();
+                    onlineFileLogQueryWrapper.eq("HIS_ID",id);
+                    onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME");
+                    List<OnlineFileLog> 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;
+    }
 }