From 5c33f948a28f49b7c47b646541d90d756ba805fb Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 28 七月 2022 11:50:16 +0800
Subject: [PATCH] 更新工作流
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 946da4a..293fa2c 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -78,20 +78,20 @@
linkMapper.updateById(link);
if(link.getLinkStatus() == 2){ //椹冲洖
//椹冲洖鍒板憳宸ヨ繘琛屽鐞�
- //鏌ヨ宸ュ崟鐨勫憳宸�
- Long createUserId = mainService.getInfoById(link.getMainId()).getCreateUserId();
+ //鏌ヨ瀵瑰簲鐨勯」鐩粡鐞�
+ Long createUserId = linkMapper.selectById(link.getParentId()).getDealUserId();
WorksheetLink link2 = new WorksheetLink();
link2.setMainId(link.getMainId());
link2.setParentId(link.getId());
link2.setDealUserId(createUserId);
link2.setDealType(0);
- link2.setDealDesc("宸ュ崟琚粡鐞嗛┏鍥�,椹冲洖淇℃伅:"+link.getDealReason());
+ link2.setDealDesc("宸ュ崟琚�荤粡鐞嗛┏鍥�,椹冲洖淇℃伅:"+link.getDealReason());
link2.setLinkStatus(0);
link2.setEnableArchive(0);
link2.setRejectVersion(link.getRejectVersion());
linkMapper.insert(link2);
//鏇存柊涓昏〃鐘舵��
- mainService.updateStatusById(link.getMainId(),0);
+ mainService.updateStatusById(link.getMainId(),1);
}else{
//瀹℃壒閫氳繃,鏇存柊涓昏〃鐘舵��
mainService.updateEndStatusById(link.getMainId(),"瀹岀粨",5);
@@ -147,7 +147,6 @@
his.setThickness(approvingBom.getThickness());
his.setType(approvingBom.getType());
his.setUnit(approvingBom.getUnit());
- his.setUpdateDate(approvingBom.getUpdateDate());
his.setUpUser(approvingBom.getUpUser());
newHistoryList.add(his);
--
Gitblit v1.9.1