From 98250a7cff913563152ae8b313c7f45cc27545ba Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 二月 2025 09:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index dc6e28b..8eff348 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -364,10 +364,11 @@
* @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
* @param businessId 涓氬姟涓婚敭 鏍规嵁 tempType
* @param createMemberId 鎻愪氦娴佺▼浜哄憳
+ * @param applyMember 鐢宠浜哄璞★紙濡傛灉涓虹┖锛岄粯璁や负鎻愪氦浜猴級
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId){
+ public void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId,Member applyMember){
//鏌ヨ澶勭悊妯℃澘
ApproveTempl approveTempl = approveTemplMapper.selectOne(new QueryWrapper<ApproveTempl>().lambda()
.eq(ApproveTempl::getType,tempType)
@@ -394,18 +395,15 @@
}
List<ApproveParam> approveCopyList = approveParamAllList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
- Member createMember = memberMapper.selectById(createMemberId);
+ Member createMember = memberMapper.selectById(createMemberId);
if(Objects.isNull(createMember)|| Objects.isNull(createMember.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠浜虹粍缁囦俊鎭紓甯�");
}
List<Approve> approveList = new ArrayList<>();
-
- this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
-
+ this.organizeApproveData(approveTempl,approveParamList,createMember,applyMember,businessId,approveList);
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
}
-
//澶勭悊鎶勯�佹暟鎹�
if(CollectionUtils.isNotEmpty(approveCopyList)){
this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
@@ -417,7 +415,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId){
+ public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId ){
//鏌ヨ澶勭悊妯℃澘
ApproveTempl approveTempl = approveTemplMapper.selectById(tempId);
if(Objects.isNull(approveTempl)){
@@ -446,7 +444,7 @@
}
List<Approve> approveList = new ArrayList<>();
- this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
+ this.organizeApproveData(approveTempl,approveParamList,createMember,null,businessId,approveList);
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
@@ -468,15 +466,18 @@
* @param businessId
* @param approveList
*/
- public void organizeApproveData(ApproveTempl approveTempl,List<ApproveParam> approveParamList,Member createMember,Integer businessId,List<Approve> approveList){
+ public void organizeApproveData(ApproveTempl approveTempl,List<ApproveParam> approveParamList,Member createMember,Member applyMember,Integer businessId,List<Approve> approveList){
+ if(applyMember ==null){
+ applyMember = createMember;
+ }
//鍒涘缓榛樿浜轰俊鎭�
Approve createUserApprove = new Approve();
createUserApprove.setRemark("鍙戣捣鐢宠");
createUserApprove.setCreateDate(new Date());
createUserApprove.setIsdeleted(Constants.ZERO);
createUserApprove.setTemplatId(approveTempl.getId());
- createUserApprove.setChekorId(createMember.getId());
+ createUserApprove.setChekorId(applyMember.getId());
createUserApprove.setCheckDate(createUserApprove.getCreateDate());
createUserApprove.setStatus(Constants.approveStatus.pass);
createUserApprove.setTitle("鍙戣捣鐢宠");
--
Gitblit v1.9.3