From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java
index dc893c3..c7ab012 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.TechnicalModelMapper;
-import com.yuanchu.mom.mapper.TechniqueModelMapper;
import com.yuanchu.mom.pojo.TechnicalModel;
import com.yuanchu.mom.pojo.dto.TechnicalModelDto;
import com.yuanchu.mom.service.TechnicalModelService;
@@ -11,6 +10,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -26,12 +26,10 @@
@Resource
TechnicalModelMapper technicalModelMapper;
- @Resource
- TechniqueModelMapper techniqueModelMapper;
//鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛�-->宸﹁竟浜岀骇灞曠ず宸ュ簭鍜屽伐鑹�
@Override
- public List<Map<String, Object>> selectAllTechTem(Integer type, String message) {
+ public List<Map<String, Object>> selectAllTechTem(String type, String message) {
return technicalModelMapper.selectAllTechTem(type, message);
}
@@ -43,7 +41,7 @@
//鏂板鎶�鏈寚鏍囩淮鎶�-->閫夋嫨宸ュ簭鍜屽伐鑹�
@Override
- public List<Map<String, Object>> chooseTechFath(Integer type) {
+ public List<Map<String, Object>> chooseTechFath(String type) {
return technicalModelMapper.chooseTechFath(type);
}
@@ -90,8 +88,6 @@
technicalModel.setState(0);
technicalModel.setId(id);
technicalModelMapper.updateById(technicalModel);
- //鍒犻櫎鐢熶骇宸ヨ壓
- techniqueModelMapper.delTechById(id);
}
//鎵归噺鍒犻櫎
@@ -99,7 +95,16 @@
@Transactional(rollbackFor = Exception.class)
public void delAllTech(String ids) {
technicalModelMapper.delAllTech(ids);
- techniqueModelMapper.delAllTech(ids);
+ }
+
+ /**
+ * 瀵煎嚭
+ * @param response
+ * @param type
+ */
+ @Override
+ public void downloadDataValueExcel(HttpServletResponse response, String type) {
+
}
}
--
Gitblit v1.9.3