From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
index 59a226b..aaee653 100644
--- a/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java
@@ -100,7 +100,7 @@
QueryWrapper<UnqualifiedRecord> wrapper = new QueryWrapper<>(unqualifiedRecord);
return unqualifiedRecordMapper.selectList(wrapper);
}
-
+
@Override
public PageData<UnqualifiedRecord> findPage(PageWrap<UnqualifiedRecord> pageWrap) {
IPage<UnqualifiedRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -151,8 +151,8 @@
MPJLambdaWrapper<UnqualifiedRecord> mpjLambdaWrapper = new MPJLambdaWrapper<>();
mpjLambdaWrapper.selectAll(UnqualifiedRecord.class);
mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getWorkOrderCode);
- mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialName);
- mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getMaterialCode);
+ mpjLambdaWrapper.selectAs(Material::getName, UnqualifiedRecord::getMaterialName);
+ mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialCode);
mpjLambdaWrapper.selectAs(Procedures::getName, UnqualifiedRecord::getProceduresName);
mpjLambdaWrapper.selectAs(Category::getName, UnqualifiedRecord::getCategoryName);
mpjLambdaWrapper.selectAs(SystemUser::getRealname, UnqualifiedRecord::getCreateUserName);
@@ -180,4 +180,37 @@
}
+ @Override
+ public List<UnqualifiedRecord> findJoinList(Integer recordId) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
+ }
+
+ MPJLambdaWrapper<UnqualifiedRecord> mpjLambdaWrapper = new MPJLambdaWrapper<>();
+ mpjLambdaWrapper.selectAll(UnqualifiedRecord.class);
+ mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getWorkOrderCode);
+ mpjLambdaWrapper.selectAs(Material::getName, UnqualifiedRecord::getMaterialName);
+ mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialCode);
+ mpjLambdaWrapper.selectAs(Procedures::getName, UnqualifiedRecord::getProceduresName);
+ mpjLambdaWrapper.selectAs(Category::getName, UnqualifiedRecord::getCategoryName);
+ mpjLambdaWrapper.selectAs(SystemUser::getRealname, UnqualifiedRecord::getCreateUserName);
+
+ mpjLambdaWrapper.leftJoin(Workorder.class,Workorder::getId,UnqualifiedRecord::getWorkorderId);
+ mpjLambdaWrapper.leftJoin(MaterialDistribute.class,MaterialDistribute::getId,Workorder::getMaterialId);
+ mpjLambdaWrapper.leftJoin(Material.class,Material::getId,MaterialDistribute::getMaterialId);
+ mpjLambdaWrapper.leftJoin(Procedures.class,Procedures::getId,Workorder::getProcedureId);
+ mpjLambdaWrapper.leftJoin(Category.class,Category::getId,UnqualifiedRecord::getCategoryId);
+ mpjLambdaWrapper.leftJoin(SystemUser.class,SystemUser::getId,UnqualifiedRecord::getCreateUser);
+ //鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
+ mpjLambdaWrapper.eq(Workorder::getRootDepartId,user.getRootDepartment().getId());
+ //濡傛灉褰撳墠閫夋嫨鐨勫叕鍙哥骇缁勭粐闈炴牴缁勭粐淇℃伅锛屽彧鑳芥煡鐪嬪綋鍓嶉�夋嫨鍏徃绾х粍缁囨暟鎹�
+ mpjLambdaWrapper.eq(Workorder::getDepartId,user.getCurComDepartment().getId());
+ mpjLambdaWrapper.eq(UnqualifiedRecord::getDeleted,Constants.ZERO);
+ mpjLambdaWrapper.eq(UnqualifiedRecord::getRecordId, recordId);
+ List<UnqualifiedRecord> unqualifiedRecordList = unQualifiedRecordJoinMapper.selectJoinList(UnqualifiedRecord.class,mpjLambdaWrapper);
+ return unqualifiedRecordList;
+ }
+
+
}
--
Gitblit v1.9.3