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 | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 e15387a..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
@@ -7,8 +7,10 @@
import com.yuanchu.mom.service.TechnicalModelService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -24,9 +26,10 @@
@Resource
TechnicalModelMapper technicalModelMapper;
+
//鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛�-->宸﹁竟浜岀骇灞曠ず宸ュ簭鍜屽伐鑹�
@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);
}
@@ -38,7 +41,7 @@
//鏂板鎶�鏈寚鏍囩淮鎶�-->閫夋嫨宸ュ簭鍜屽伐鑹�
@Override
- public List<Map<String, Object>> chooseTechFath(Integer type) {
+ public List<Map<String, Object>> chooseTechFath(String type) {
return technicalModelMapper.chooseTechFath(type);
}
@@ -51,10 +54,13 @@
//鏂板鎶�鏈寚鏍囩淮鎶�
@Override
- public void addTechMode(Integer id, TechnicalModelDto technicalModelDto) {
- TechnicalModel technicalModel = new TechnicalModel();
- BeanUtils.copyProperties(technicalModelDto, technicalModel);
- technicalModel.setTechTemId(id);
+ public void addTechMode(TechnicalModelDto technicalModelDto) {
+ TechnicalModel technicalModel = TechnicalModel.builder()
+ .techTemId(technicalModelDto.getTechTemId())
+ .father(technicalModelDto.getFather())
+ .name(technicalModelDto.getName())
+ .unit(technicalModelDto.getUnit())
+ .build();
technicalModelMapper.insert(technicalModel);
}
@@ -66,7 +72,7 @@
//缂栬緫
@Override
- public void writeTechById(Integer id, TechnicalModelDto technicalModelDto) {
+ public void writeTechById(Integer id,TechnicalModelDto technicalModelDto) {
TechnicalModel technicalModel = new TechnicalModel();
BeanUtils.copyProperties(technicalModelDto, technicalModel);
technicalModel.setId(id);
@@ -75,7 +81,9 @@
//鍒犻櫎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delTechById(Integer id) {
+ //鍒犻櫎鎶�鏈寚鏍�
TechnicalModel technicalModel = new TechnicalModel();
technicalModel.setState(0);
technicalModel.setId(id);
@@ -84,8 +92,19 @@
//鎵归噺鍒犻櫎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delAllTech(String ids) {
technicalModelMapper.delAllTech(ids);
}
+
+ /**
+ * 瀵煎嚭
+ * @param response
+ * @param type
+ */
+ @Override
+ public void downloadDataValueExcel(HttpServletResponse response, String type) {
+
+ }
}
--
Gitblit v1.9.3