From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java | 6 +++---
1 files changed, 3 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..7257dbe 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);
--
Gitblit v1.9.3