From ed29342061c29cc16e36b17ae61d7b97a4dcb884 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 17:04:37 +0800
Subject: [PATCH] 标准库树下检验项目修改记录查询
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java | 3 +++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java | 11 +++++++----
basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java | 6 +++---
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java | 5 ++---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java | 5 ++---
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
index 0f86485..75f504d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
@@ -36,10 +36,10 @@
return Result.success(standardProductListUpdateRecordService.standardProductListRecordPage(page,standardProductListUpdateRecord));
}
- @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ")
@GetMapping("/standardProductListRecordRelPage")
- public Result standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
- return Result.success(standardProductListUpdateRecordService.standardProductListRecordRelPage(page,standardProductListUpdateRecordRel));
+ public Result standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+ return Result.success(standardProductListUpdateRecordService.standardProductListRecordRelPage(standardProductListUpdateRecordRel));
}
@ApiOperation(value = "鏍囧噯鏍戜笅淇敼璁板綍鏂囦欢涓婁紶")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java
index 580b76e..80041cd 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java
@@ -21,12 +21,11 @@
void batchInsertRecordRel(@Param("list") List<StandardProductListUpdateRecordRel> list);
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @param page
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ
* @param ew
* @return
*/
- IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, @Param("ew") QueryWrapper<StandardProductListUpdateRecordRel> ew);
+ List<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(@Param("ew") QueryWrapper<StandardProductListUpdateRecordRel> ew);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
index 28978a2..38529c4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
@@ -31,12 +31,11 @@
IPage<StandardProductListUpdateRecordDto> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record);
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @param page
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ
* @param standardProductListUpdateRecordRel
* @return
*/
- IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel);
+ Map<String,Object> standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel);
/**
* 鏍囧噯鏍戜笅淇敼璁板綍鏂囦欢涓婁紶
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
index 95ac78d..f84bca8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
@@ -51,6 +51,9 @@
throw new BaseException("璇ヤ骇鍝佸凡缁戝畾杩囪鍘傚");
}
baseMapper.insert(supplierAsk);
+ //
+
+
return supplierAsk.getSupplierAskId();
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
index 73341d2..a649d17 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
@@ -70,14 +70,17 @@
}
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @param page
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鏌ヨ
* @param standardProductListUpdateRecordRel
* @return
*/
@Override
- public IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
- return standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(page,QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+ public Map<String,Object> standardProductListRecordRelPage(StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+ Map<String, Object> resultMap = new HashMap<>();
+ List<StandardProductListUpdateRecordRel> recordRelList = standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+ resultMap.put("productList",recordRelList);
+ resultMap.put("total",recordRelList.size());
+ return resultMap;
}
/**
--
Gitblit v1.9.3