From 4ed99c989e535b704705d057dd492c962fb806f1 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 15:15:13 +0800
Subject: [PATCH] 模块：实验室临时存储库管理 修改：修改设置课题组
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 9 ++++++---
src/main/webapp/laboratory_container_mng.xhtml | 2 +-
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index dad9793..b555f0a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -137,6 +137,11 @@
public void onSaveBtnClick() {
try {
+
+ if (!StringUtils.isNotBlank(sysLaboratoryContainer.getProjectId())){
+ sysLaboratoryContainer.setProjectId(null);
+ }
+
// 新建
if (this.action == Constants.ACTION_ADD) {
if (this.sysLaboratoryContainer == null) {
@@ -171,9 +176,7 @@
return;
}
System.out.println(sysLaboratoryContainer.getContainerCode());
- if (!StringUtils.isNotBlank(sysLaboratoryContainer.getProjectId())){
- sysLaboratoryContainer.setProjectId(null);
- }
+
this.sysLaboratoryContainerService.insertSysLaboratoryContainer(sysLaboratoryContainer);
FacesUtils.info("新建成功。");
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
index 609ba1f..dcf4488 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
@@ -137,7 +137,7 @@
<update id="updateSysLaboratoryContainer" parameterType="com.nanometer.smartlab.entity.SysLaboratoryContainer">
update sys_laboratory_container set laboratory_id=#{laboratoryId}, type=#{type}, container_code=#{containerCode}, info_code=#{infoCode},
structure=#{structure}, name=#{name}, character_left=#{characterLeft}, character_right=#{characterRight},controller_code=#{controllerCode},
- update_time=now()
+ update_time=now(),project_id = #{projectId}
where id=#{id}
</update>
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index 0b319b0..e346ad3 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -186,7 +186,7 @@
<p:selectOneMenu value="#{laboratoryContainerMngController.sysLaboratoryContainer.projectId}">
<f:selectItem itemLabel="不选择课题组" />
<f:selectItems value="#{sysProjectServiceImpl.getAll()}"
- var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
+ var="item" itemLabel="#{item.project}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>
</p:panelGrid>
--
Gitblit v1.9.2