From 2c456094bdf1cc7e1bab5e0dbee00bb1f2743488 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 17 七月 2023 13:50:12 +0800
Subject: [PATCH] 1、审批顺序：审批时，从一级到五级逐级审批，回退时，由审批人员指定回退级别，如从五级审批退回到经办人（需要重新修改材料的人员处），每一级可以看到回退的信息；修改完成后，直接从经办人处到达五级审批或退回的审批人。被退回的信息修改完成后，直接从经办人到达五级审批或退回的审批人处，那么其他层级的审批人虽然不需要审批，但要能够看到重新修改后的信息。 说明： （1）差旅费报销主表：service_reimbursement 标识字段：FlowLevel（当前审核级别 处于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等; 4：四级审核等； 5：五级审核等）；RecordStatus（记录状态 详见字典sys_travelexpensestatus） （2）费用报销主表：service_fund 标识字段：FlowLevel（当前审核级别 处于哪个阶段 0：申请；1：一级审核；2：二级审核；3：三级审核等; 4：四级审核等； 5：五级审核等）；RecordStatus（记录状态 详见字典sys_travelexpensestatus） （3）审批流程设置表：service_fundflowrule （4）审批流程记录表：service_fundflow
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 8057b77..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);
@@ -293,6 +299,7 @@
remShare.setId(nId);
remShare.setFilename(filename);
remShare.setFileid(fileid);
+ log.info("remShare鐨勬暟鎹负 : {}:", remShare.toString());
boolean bRet = sharedService.updateById(remShare);
if (!bRet) return -1;
--
Gitblit v1.9.3