From 9a16d4675b22d0845158d0f07424f4bda2e39475 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 九月 2023 18:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 72b3615..f53b6c8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -93,7 +93,7 @@
}).collect(Collectors.toList());
//妫�楠岄」鐩壒閲忔坊鍔�
rawInsProductService.saveBatch(rawInsProductList);
- return "鏂板妫�楠屽崟鎴愬姛!";
+ return rawInspect.getId().toString();
}
@@ -105,7 +105,7 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
- public List<Map<String, Object>> selectRawInspectsListById(Integer id) {
+ public Map<String, Object> selectRawInspectsListById(Integer id) {
return rawInspectMapper.selectRawInspectsListById(id);
}
@@ -145,34 +145,6 @@
inspectUnacceptedMapper.insert(rawUnaccepted);
}
return "涓婃姤鎴愬姛!";
- }
-
- //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delRawInsById(Integer id) {
- /*鍒犻櫎鍘熸潗鏂欐楠屽崟*/
- RawInspect rawInspect = new RawInspect();
- rawInspect.setId(id);
- rawInspect.setState(0);
- rawInspectMapper.updateById(rawInspect);
- /*鍒犻櫎鍘熸潗鏂欐楠岄」鐩〃*/
- rawInsProductMapper.updaRawInsById(id);
- /*鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍗�*/
- inspectUnacceptedMapper.updaRawIns(id);
- }
-
- //鎵归噺鍒犻櫎
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delAllRawIns(String ids) {
- /*鎵归噺鍒犻櫎鍘熸潗鏂欐楠屽崟*/
- rawInspectMapper.delAllRawIns(ids);
- /*鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩〃*/
- rawInsProductMapper.delAllRawIns(ids);
- /*鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍗�*/
- inspectUnacceptedMapper.delAllRawIns(ids);
-
}
--
Gitblit v1.9.3