From eab1c7170a901f354bb8bf5c62e5a12c4d73d88b Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期四, 28 七月 2022 10:36:59 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/WorksheetMainService.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index f19e370..1c676e5 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -44,13 +44,18 @@
@Transactional
public boolean submit(WorksheetMain main, DocUser user) {
List<ProductBomApproving> bomList = main.getApprovingBomList();
+ int rejectVersion=-1;
//鎻愪氦涓昏〃
main.setCreateUserId(user.getId());
//鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
if(user.getRoleId().equals("1001")){
- main.setLevel(2);
- main.setStatus(1);
- mainMapper.insert(main);
+ if(main.getId()==null) {
+ main.setLevel(2);
+ main.setStatus(1);
+ mainMapper.insert(main);
+ }else {
+ rejectVersion = approvingService.getRejectVersion(main.getId());
+ }
//鎻愪氦瀛愯〃
WorksheetLink link =new WorksheetLink();
link.setMainId(main.getId());
@@ -60,12 +65,17 @@
link.setDealDesc(main.getDealDesc());
link.setLinkStatus(0);
link.setEnableArchive(0);
+ link.setRejectVersion(rejectVersion+1);
linkMapper.insert(link);
}
else if(user.getRoleId().equals("1002")){
- main.setLevel(1);
- main.setStatus(2);
- mainMapper.insert(main);
+ if(main.getId()==null) {
+ main.setLevel(1);
+ main.setStatus(2);
+ mainMapper.insert(main);
+ }else {
+ rejectVersion = approvingService.getRejectVersion(main.getId());
+ }
//鎻愪氦瀛愯〃
WorksheetLink link =new WorksheetLink();
link.setMainId(main.getId());
@@ -75,6 +85,7 @@
link.setDealDesc(main.getDealDesc());
link.setLinkStatus(0);
link.setEnableArchive(1);
+ link.setRejectVersion(rejectVersion+1);
linkMapper.insert(link);
}
else if(user.getRoleId().equals("1003")){
@@ -85,8 +96,11 @@
return false;
}
//浜у搧bom/鍥剧焊鍥剧墖鎻愪氦
+ //鏌ヨ褰撳墠椹冲洖鐗堟湰
+ int nextRejectVersion = rejectVersion+1;
bomList.forEach(bom->{
bom.setMainId(main.getId());
+ bom.setRejectVersion(nextRejectVersion);
});
approvingService.insert(bomList);
return true;
@@ -291,4 +305,8 @@
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
}
+
+ public WorksheetMain getInfo(int id) {
+ return mainMapper.selectById(id);
+ }
}
--
Gitblit v1.9.1