From 9e2ee26a25c6ac42963e374afb01b788831bb52f Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 03 八月 2022 10:16:23 +0800
Subject: [PATCH] 产品管理去除bom最大版本查询和最新版本打包下载
---
src/main/java/com/whyc/service/WorksheetMainService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 86475f6..4fd664b 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -39,6 +39,7 @@
private DocUserMapper userMapper;
@Autowired
+ @Lazy
private ProductBomApprovingService approvingService;
@Transactional
@@ -102,6 +103,22 @@
bom.setMainId(main.getId());
bom.setUpUserId(user.getId());
bom.setRejectVersion(nextRejectVersion);
+ bom.setCreateDate(new Date());
+ if(bom.getDwgUrl()==null){
+ bom.setDwgUrl("");
+ }else {
+ bom.setDwgUrl(bom.getDwgUrl());
+ }
+ if(bom.getFileUrl()==null){
+ bom.setFileUrl("");
+ }else {
+ bom.setFileUrl(bom.getFileUrl());
+ }
+ if(bom.getPictureUrl()==null){
+ bom.setPictureUrl("");
+ }else{
+ bom.setPictureUrl(bom.getPictureUrl());
+ }
});
approvingService.insert(bomList);
return true;
@@ -262,7 +279,7 @@
public Response<PageInfo<WorksheetMain>> getApprovingListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
QueryWrapper<WorksheetMain> query = Wrappers.query();
- query.eq("create_user_id",user.getId()).in("status",1,2);
+ query.eq("create_user_id",user.getId()).in("status",1,2).orderByDesc("id");
List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
//鏌ヨ涓昏〃鐘舵�佸搴旂殑瀛愯〃
worksheetMainList.forEach(main -> {
@@ -275,7 +292,7 @@
public Response<PageInfo<WorksheetMain>> getRejectedListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
QueryWrapper<WorksheetMain> query = Wrappers.query();
- query.eq("create_user_id",user.getId()).in("status",0);
+ query.eq("create_user_id",user.getId()).in("status",0).orderByDesc("id");
List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
@@ -288,7 +305,7 @@
//鑷繁鐨勫伐鍗�
if(!user.getRoleId().equals("1003")){
QueryWrapper<WorksheetMain> query = Wrappers.query();
- query.eq("create_user_id",user.getId()).in("status",5);
+ query.eq("create_user_id",user.getId()).in("status",5).orderByDesc("id");
worksheetMainList = mainMapper.selectList(query);
}else{
@@ -301,7 +318,7 @@
public Response<PageInfo<WorksheetMain>> getHandlingListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
- List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),0);
+ List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),0);
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
}
--
Gitblit v1.9.1