From 299738e5720dbf6f82f212afd51cbeb459ef2e39 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 15 十二月 2020 15:42:13 +0800
Subject: [PATCH] 模块:课题管理 修改：变更为新增一列课题组 提出：秦老师
---
src/main/webapp/project_mng.xhtml | 12 ++++++++++++
src/main/java/com/nanometer/smartlab/entity/SysProject.java | 9 +++++++++
src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml | 7 ++++---
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml
index ad90806..c3e5311 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml
@@ -11,6 +11,7 @@
<result property="createrUser" column="creater_user"></result>
<result property="createTime" column="create_time"></result>
<result property="username" column="userName"></result>
+ <result property="project" column="project"></result>
</resultMap>
<sql id="queryWhereSql">
@@ -113,12 +114,12 @@
</select>
<insert id="insertSysProject" parameterType="com.nanometer.smartlab.entity.SysProject">
- insert into sys_project(id, project_id,project_name,sys_user_id,remark,valid_flag,creater_user,create_time)
- values (#{id}, #{projectId}, #{projectName}, #{sysUserId}, #{remark},#{validFlag},#{createrUser},now())
+ insert into sys_project(id, project_id,project_name,sys_user_id,remark,valid_flag,creater_user,create_time,project)
+ values (#{id}, #{projectId}, #{projectName}, #{sysUserId}, #{remark},#{validFlag},#{createrUser},now(),#{project})
</insert>
<update id="updateSysProject" parameterType="com.nanometer.smartlab.entity.SysProject">
- update sys_project set project_id=#{projectId}, project_name=#{projectName}, sys_user_id=#{sysUserId}, remark=#{remark} where id=#{id}
+ update sys_project set project_id=#{projectId}, project_name=#{projectName}, sys_user_id=#{sysUserId}, remark=#{remark} ,project=#{project} where id=#{id}
</update>
<update id="deleteSysProjects" parameterType="java.util.List">
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysProject.java b/src/main/java/com/nanometer/smartlab/entity/SysProject.java
index 1de99d3..419633e 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysProject.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysProject.java
@@ -7,6 +7,7 @@
private String id;
private String projectId;
private String projectName;
+ private String project;
private String sysUserId;
private String remark;
private int validFlag;
@@ -85,4 +86,12 @@
public void setValidFlag(int validFlag) {
this.validFlag = validFlag;
}
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
}
diff --git a/src/main/webapp/project_mng.xhtml b/src/main/webapp/project_mng.xhtml
index e1f6840..907a43c 100644
--- a/src/main/webapp/project_mng.xhtml
+++ b/src/main/webapp/project_mng.xhtml
@@ -76,6 +76,10 @@
<!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
<h:outputText value="#{row.username}"></h:outputText>
</p:column>
+ <p:column headerText="课题组">
+ <!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
+ <h:outputText value="#{row.project}"></h:outputText>
+ </p:column>
<p:column headerText="备注">
<h:outputText value="#{row.remark}"></h:outputText>
</p:column>
@@ -97,6 +101,14 @@
</p:row>
<p:row>
<p:column>
+ <p:outputLabel value="课题组"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:inputText value="#{projectMngController.sysProject.project}"></p:inputText>
+ </p:column>
+ </p:row>
+ <p:row>
+ <p:column>
<p:outputLabel value="课题名称"></p:outputLabel>
</p:column>
<p:column>
--
Gitblit v1.9.2