From 5d0f425324ee72e50f0b7ad5200ccebab32e7099 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期六, 13 八月 2022 12:11:43 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 67ea342..f665a3c 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -57,7 +57,7 @@
if(link.getLinkStatus() == 2){ //椹冲洖
//鏌ョ湅鏄惁涓烘暎瑁呬欢瀹℃壒,鏄垯闇�瑕佹洿鏂版暎瑁呬欢瀹℃壒琛ㄤ腑鐨勭姸鎬佷负瀹岀粨
if(mainService.getInfoById(link.getMainId()).getType().equals(EnumWorksheetType.Component.getType())){
- cAService.endType(link.getMainId());
+ cAService.endStatus(link.getMainId());
}
//椤圭洰缁忕悊椹冲洖,椹冲洖鍗崇粓姝�
mainService.updateEndStatusById(link.getMainId(),"缁忕悊椹冲洖,椹冲洖鍘熷洜:"+link.getDealReason(),0);
@@ -263,7 +263,7 @@
});
cService.insertBatch(componentList);
//鏇存柊鏁ｈ浠跺鎵瑰瓙琛ㄤ腑type涓哄畬缁�
- cAService.endType(link.getMainId());
+ cAService.endStatus(link.getMainId());
}
else if(type.intValue() == EnumWorksheetType.ComponentProduct.getType()){ //鏇存柊鏁ｈ浠�-浜у搧鍏崇郴
//鏌ユ壘鍒板搴旂殑鏁ｈ浠�-浜у搧鍏崇郴鏁版嵁
--
Gitblit v1.9.1