From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Tue, 28 Nov 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 9e81db0..2fe86b9 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -38,7 +38,6 @@
@Resource
SysUserDao sysUserDao;
- @Transactional(propagation = Propagation.REQUIRED)
public List<SysLaboratory> getSysLaboratoryList(String type, String name,String project,Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
@@ -87,7 +86,7 @@
return commonPage;
}
- @Transactional(propagation = Propagation.REQUIRED)
+
public int getSysLaboratoryTotalCount(String type, String name,String project) {
try {
Map<String, Object> params = new HashMap<String, Object>();
@@ -106,7 +105,6 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
public SysLaboratory getSysLaboratory(String id) {
try {
return this.sysLaboratoryDao.getSysLaboratory(id);
@@ -117,7 +115,16 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
+ public SysLaboratory getSysLaboratorySimpleInfo(String id) {
+ try {
+ return this.sysLaboratoryDao.getSysLaboratorySimpleInfo(id);
+ } catch (DataAccessException e) {
+ logger.error(e.getMessage(), e);
+ throw new BusinessException(ExceptionEnumCode.DB_ERR,
+ MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
+ }
+ }
+
public SysLaboratory insertSysLaboratory(SysLaboratory sysLaboratory) {
try {
if (sysLaboratory.getId() == null) {
@@ -139,7 +146,6 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
public boolean updateSysLaboratory(SysLaboratory sysLaboratory) {
try {
int row = this.sysLaboratoryDao.updateSysLaboratory(sysLaboratory);
@@ -159,7 +165,7 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
+
public boolean deleteSysLaboratory(List<SysLaboratory> sysLaboratoryList) {
try {
if (sysLaboratoryList == null || sysLaboratoryList.size() == 0) {
@@ -193,7 +199,7 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
+
public boolean isSysLaboratoryExist(String barCode, String editId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
@@ -209,7 +215,7 @@
}
}
- @Transactional(propagation = Propagation.REQUIRED)
+
public SysLaboratory getSysLaboratoryByBarCode(String barCode) {
try {
Map<String, Object> params = new HashMap<String, Object>();
@@ -322,7 +328,6 @@
}
@Override
- @Transactional(propagation = Propagation.REQUIRED)
public List<SysLaboratory> getSysLaboratoryListByDep(String depId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
--
Gitblit v1.9.2