From 201692b4891e98fbf6df0ab54d8edef69c0e8033 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 27 七月 2022 09:05:26 +0800
Subject: [PATCH] 添加是否能下载和日志移除异常的显示
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 2d58845..4e97c77 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -1,7 +1,14 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.whyc.mapper.ProductBomApprovingMapper;
import com.whyc.mapper.WorksheetLinkMapper;
+import com.whyc.pojo.DocUser;
+import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetLink;
+import com.whyc.pojo.WorksheetMain;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +25,14 @@
@Resource
private WorksheetLinkMapper linkMapper;
+ @Autowired
+ private ProductBomApprovingMapper approvingMapper;
+
+ @Autowired
+ private ProductBomService bomService;
+
+ @Autowired
+ private ProductBomHistoryService historyService;
@Transactional
public void audit(WorksheetLink link) {
@@ -78,6 +93,32 @@
}else{
//瀹℃壒閫氳繃,鏇存柊涓昏〃鐘舵��
mainService.updateEndStatusById(link.getMainId(),"瀹岀粨",5);
+ //灏嗕骇鍝佹枃浠跺鍒惰嚦姝ｅ紡璺緞
+ QueryWrapper<ProductBomApproving> query = Wrappers.query();
+ query.eq("main_id",link.getMainId());
+ List<ProductBomApproving> approvingList = approvingMapper.selectList(query);
+
+ //澧炲姞->澧炲姞閮ㄤ欢(澧炲姞璁板綍,鍚屾椂鎵�鏈塭Version+1)
+ //淇敼->淇敼閮ㄤ欢鍥剧焊,淇敼閮ㄤ欢闈炲浘绾�(澧炲姞璁板綍,鍚屾椂淇敼闈炲師閮ㄤ欢鐨勬墍鏈塭Version+1)
+ //鍒犻櫎? TODO 闇�瑕佺害瀹氶�昏緫
+
+ //鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
+ Integer version = bomService.getProduct(approvingList.get(0).getParentModel()).getVersion();
+ if(version==null){
+ version = 0;
+ }
+ Integer nextVersion = version+1;
+ //鏇存柊鍒皃roduct_bom_history,闇�瑕乻Version鍜宔Version
+ //澧炲姞鎵�鏈夐儴浠�,鎺掓煡鍑虹浉鍏崇殑鍘熼儴浠�,闈炰篃鏄洿鏂�
+ //historyService.get
+
+ //鏇存柊鍒皃roduct_bom
+
+ /*String projectDir = CommonUtil.getProjectDir();
+ FileUtil.copyDir()*/
+
+
+ //灏嗕骇鍝乥om琛ㄧ殑url淇,鏇存柊鍒版寮忚〃
}
}
@@ -89,4 +130,28 @@
public List<WorksheetLink> getInfoList(Long id) {
return linkMapper.getInfoList(id);
}
+
+ /**
+ *
+ * @param userId 鎬荤粡鐞嗗搴旂殑userId
+ * @param statusExp 0:鏈鎵�,1:宸插鎵�(鍖呭惈鐘舵�佸��1,2)
+ * @return
+ */
+ public List<WorksheetMain> getInfoList2(Long userId, int statusExp) {
+ return linkMapper.getInfoList2(userId,statusExp);
+ }
+
+ /**
+ *
+ * @param userId 鎬荤粡鐞嗗搴旂殑userId
+ * @param statusExp 0:鏈鎵�,1:宸插鎵�(鍖呭惈鐘舵�佸��1,2)
+ * @return
+ */
+ public List<WorksheetMain> getInfoList3(Long userId, int statusExp) {
+ return linkMapper.getInfoList3(userId,statusExp);
+ }
+
+ public DocUser getApprovingUser(Integer mainId) {
+ return linkMapper.getApprovingUser(mainId);
+ }
}
--
Gitblit v1.9.1