|
|
@@ -4,38 +4,38 @@
|
|
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
|
<mapper namespace="com.zd.laboratory.mapper.LabMessageUserMapper">
|
|
|
|
|
|
- <resultMap type="com.zd.system.api.laboratory.domain.LabMessageUser" id="LabMessageUserResult">
|
|
|
- <result property="id" column="id" />
|
|
|
- <result property="joinUserId" column="join_user_id" />
|
|
|
- <result property="messageId" column="message_id" />
|
|
|
- <result property="createTime" column="create_time" />
|
|
|
- <result property="messageType" column="message_type" />
|
|
|
- <result property="meaasgeContext" column="meaasge_context" />
|
|
|
- <result property="deptId" column="dept_id" />
|
|
|
- <result property="isRead" column="is_read" />
|
|
|
- <result property="deptName" column="dept_name" />
|
|
|
- <result property="userId" column="user_id" />
|
|
|
- <result property="createBy" column="create_by" />
|
|
|
- <result property="updateTime" column="update_time" />
|
|
|
- <result property="updateBy" column="update_by" />
|
|
|
- <result property="remark" column="remark" />
|
|
|
+ <resultMap type="com.zd.laboratory.api.entity.LabMessageUser" id="LabMessageUserResult">
|
|
|
+ <result property="id" column="id"/>
|
|
|
+ <result property="joinUserId" column="join_user_id"/>
|
|
|
+ <result property="messageId" column="message_id"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="messageType" column="message_type"/>
|
|
|
+ <result property="meaasgeContext" column="meaasge_context"/>
|
|
|
+ <result property="deptId" column="dept_id"/>
|
|
|
+ <result property="isRead" column="is_read"/>
|
|
|
+ <result property="deptName" column="dept_name"/>
|
|
|
+ <result property="userId" column="user_id"/>
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
</resultMap>
|
|
|
|
|
|
- <resultMap type="com.zd.system.api.laboratory.domain.LabMessageUser" id="LabMessageUserAndContentResult">
|
|
|
- <result property="id" column="id" />
|
|
|
- <result property="joinUserId" column="join_user_id" />
|
|
|
- <result property="messageId" column="message_id" />
|
|
|
- <result property="createTime" column="create_time" />
|
|
|
- <result property="messageType" column="message_type" />
|
|
|
- <result property="meaasgeContext" column="meaasge_context" />
|
|
|
- <result property="deptId" column="dept_id" />
|
|
|
- <result property="isRead" column="is_read" />
|
|
|
- <result property="deptName" column="dept_name" />
|
|
|
- <result property="userId" column="user_id" />
|
|
|
- <result property="createBy" column="create_by" />
|
|
|
- <result property="updateTime" column="update_time" />
|
|
|
- <result property="updateBy" column="update_by" />
|
|
|
- <result property="remark" column="remark" />
|
|
|
+ <resultMap type="com.zd.laboratory.api.entity.LabMessageUser" id="LabMessageUserAndContentResult">
|
|
|
+ <result property="id" column="id"/>
|
|
|
+ <result property="joinUserId" column="join_user_id"/>
|
|
|
+ <result property="messageId" column="message_id"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="messageType" column="message_type"/>
|
|
|
+ <result property="meaasgeContext" column="meaasge_context"/>
|
|
|
+ <result property="deptId" column="dept_id"/>
|
|
|
+ <result property="isRead" column="is_read"/>
|
|
|
+ <result property="deptName" column="dept_name"/>
|
|
|
+ <result property="userId" column="user_id"/>
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
|
|
|
</resultMap>
|
|
|
|
|
|
@@ -64,7 +64,7 @@
|
|
|
|
|
|
</sql>
|
|
|
|
|
|
- <select id="selectLabMessageUserList" parameterType="com.zd.system.api.laboratory.domain.LabMessageUser" resultMap="LabMessageUserAndContentResult">
|
|
|
+ <select id="selectLabMessageUserList" parameterType="com.zd.laboratory.api.entity.LabMessageUser" resultMap="LabMessageUserAndContentResult">
|
|
|
SELECT
|
|
|
lc.id,
|
|
|
#{joinUserId} AS join_user_id,
|
|
|
@@ -99,7 +99,7 @@
|
|
|
</select>
|
|
|
|
|
|
|
|
|
- <select id="selectLabMessageListByUser" parameterType="com.zd.system.api.laboratory.domain.LabMessageUser" resultMap="LabMessageUserAndContentResult">
|
|
|
+ <select id="selectLabMessageListByUser" parameterType="com.zd.laboratory.api.entity.LabMessageUser" resultMap="LabMessageUserAndContentResult">
|
|
|
select mu.id, mu.join_user_id,mu.message_type,mu.meaasge_context, mu.message_id,
|
|
|
mu.create_time, mu.dept_id, mu.is_read, mu.dept_name, mu.user_id, mu.create_by, mu.update_time,
|
|
|
mu.update_by, mu.remark from lab_message_user mu
|
|
|
@@ -109,7 +109,7 @@
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectListVO" parameterType="com.zd.system.api.laboratory.domain.LabMessageUser" resultType="com.zd.system.api.laboratory.domain.vo.LabMessageUserListVO">
|
|
|
+ <select id="selectListVO" parameterType="com.zd.laboratory.api.entity.LabMessageUser" resultType="com.zd.laboratory.api.vo.LabMessageUserListVO">
|
|
|
<!--SELECT
|
|
|
lc.id,
|
|
|
#{joinUserId} AS join_user_id,
|
|
|
@@ -156,8 +156,6 @@
|
|
|
LEFT JOIN lab_subject st ON st.id = pne.subject_id
|
|
|
WHERE ur.is_read = 0 AND ur.join_user_id=#{joinUserId}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
union all
|
|
|
|
|
|
SELECT
|
|
|
@@ -209,7 +207,7 @@
|
|
|
where id = #{id}
|
|
|
</select>
|
|
|
|
|
|
- <insert id="insertLabMessageUser" parameterType="com.zd.system.api.laboratory.domain.LabMessageUser" useGeneratedKeys="true" keyProperty="id">
|
|
|
+ <insert id="insertLabMessageUser" parameterType="com.zd.laboratory.api.entity.LabMessageUser" useGeneratedKeys="true" keyProperty="id">
|
|
|
insert into lab_message_user
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
<if test="joinUserId != null">join_user_id,</if>
|
|
|
@@ -279,7 +277,7 @@
|
|
|
</insert>
|
|
|
|
|
|
|
|
|
- <update id="updateLabMessageUser" parameterType="com.zd.system.api.laboratory.domain.LabMessageUser">
|
|
|
+ <update id="updateLabMessageUser" parameterType="com.zd.laboratory.api.entity.LabMessageUser">
|
|
|
update lab_message_user
|
|
|
<trim prefix="SET" suffixOverrides=",">
|
|
|
<if test="joinUserId != null">join_user_id = #{joinUserId},</if>
|