From 9a107421d1b7d99eb4b68c092fe97013b755fb43 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 17 七月 2023 18:32:49 +0800
Subject: [PATCH] 修改“delFlag”

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index 92b729e..6da9c5e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -16,6 +16,8 @@
 import com.ruoyi.project.service.IServiceReimbursementSharedService;
 import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
 import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,6 +36,7 @@
  * @author ruoyi
  * @date 2022-01-24
  */
+@Slf4j
 @Service
 public class ServiceReimbursementServiceImpl extends ServiceImpl<ServiceReimbursementMapper, ServiceReimbursement> implements IServiceReimbursementService {
 
@@ -70,6 +73,9 @@
     @Override
     public List<ServiceReimbursement> queryList(ServiceReimbursement serviceReimbursement) {
         LambdaQueryWrapper<ServiceReimbursement> wrappers = Wrappers.lambdaQuery();
+        if (ObjectUtils.isNotEmpty(serviceReimbursement.getId())) {
+            wrappers.eq(ServiceReimbursement::getId, serviceReimbursement.getId());
+        }
         if (StringUtils.isNotBlank(serviceReimbursement.getCreateBy())) {
             wrappers.eq(ServiceReimbursement::getCreateBy, serviceReimbursement.getCreateBy());
         }
@@ -204,8 +210,8 @@
         //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
 
         String filePath = RuoYiConfig.getUploadPath();
-        String strMutfileUrl = remShare.getFileurl();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
-
+        // String strMutfileUrl = remShare.getFileurl();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
+        String strMutfileUrl = remShare.getAnnexfiles();
         String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
         //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
         //strFUrl = String.format(strFUrl, strRes);
@@ -289,12 +295,13 @@
 
         }
 
-//        long nId = remShare.getId();
-//        remShare.setId(nId);
-//        remShare.setFilename(filename);
-//        remShare.setFileid(fileid);
-//        boolean bRet = serviceReimbursementServiceShare.updateById(remShare);
-//        if (!bRet) return -1;
+        long nId = remShare.getId();
+        remShare.setId(nId);
+        remShare.setFilename(filename);
+        remShare.setFileid(fileid);
+        log.info("remShare鐨勬暟鎹负 : {}:", remShare.toString());
+        boolean bRet = sharedService.updateById(remShare);
+        if (!bRet) return -1;
 
         return 0;
     }

--
Gitblit v1.9.3