From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 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..b2e0c03 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">
@@ -46,6 +47,17 @@
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
</if>
+ </select>
+
+ <select id="selectDistinctProjects" parameterType="java.util.Map" resultMap="SysProject">
+ SELECT
+ sp.*
+ FROM
+ sys_project sp
+ WHERE sp.valid_flag = 1
+ AND sp.project is not null
+ GROUP BY
+ sp.project
</select>
@@ -111,14 +123,21 @@
limit #{first}, #{pageSize}
</if>
</select>
+ <select id="selectByProject" resultType="java.lang.Integer">
+ select count(0)
+ from sys_project
+ where valid_flag = 1
+ and project = #{0}
+
+ </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">
--
Gitblit v1.9.2