From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 7bf6dc1..d420111
--- a/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml
@@ -7,9 +7,10 @@
<!-- 淇濆瓨閫氱煡淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessNoticeInfo" parameterType="Map">
insert into business_notice(
- operate,notice_type_cd,context,start_time,end_time,community_id,title,b_id,user_id,notice_id
+ operate,notice_type_cd,context,start_time,end_time,community_id,title,b_id,user_id,notice_id,obj_type,obj_id,state
) values (
- #{operate},#{noticeTypeCd},#{context},#{startTime},#{endTime},#{communityId},#{title},#{bId},#{userId},#{noticeId}
+ #{operate},#{noticeTypeCd},#{context},#{startTime},#{endTime},#{communityId},#{title},#{bId},#{userId},#{noticeId},
+ #{objType},#{objId},#{state}
)
</insert>
@@ -18,7 +19,7 @@
<select id="getBusinessNoticeInfo" parameterType="Map" resultType="Map">
select t.operate,t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.end_time,t.start_time
startTime,t.end_time endTime,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id bId,t.user_id,t.user_id
- userId,t.notice_id,t.notice_id noticeId
+ userId,t.notice_id,t.notice_id noticeId,t.obj_type,t.obj_id,t.obj_type objType,t.obj_id objId,t.state
from business_notice t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -52,14 +53,17 @@
and t.notice_id= #{noticeId}
</if>
+
</select>
<!-- 淇濆瓨閫氱煡淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveNoticeInfoInstance" parameterType="Map">
insert into n_notice(
- notice_type_cd,context,start_time,end_time,status_cd,community_id,title,b_id,user_id,notice_id
- ) select t.notice_type_cd,t.context,t.start_time,t.end_time,'0',t.community_id,t.title,t.b_id,t.user_id,t.notice_id from
+ notice_type_cd,context,start_time,end_time,status_cd,community_id,title,b_id,user_id,notice_id,obj_type,obj_id,state
+ ) select t.notice_type_cd,t.context,t.start_time,t.end_time,'0',t.community_id,t.title,t.b_id,t.user_id,t.notice_id,
+ t.obj_type,t.obj_id,t.state
+ from
business_notice t where 1=1
and t.operate= 'ADD'
<if test="noticeTypeCd !=null and noticeTypeCd != ''">
@@ -98,15 +102,11 @@
select t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time
startTime,t.end_time,t.end_time endTime,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id
bId,t.user_id,t.user_id userId,t.notice_id,t.notice_id noticeId,t.create_time,t.create_time createTime,
- (CASE
- WHEN t.`notice_type_cd` = '1000'
- THEN '涓氫富閫氱煡'
- WHEN t.notice_type_cd = '1001'
- THEN '鍛樺伐閫氱煡'
- ELSE
- '灏忓尯閫氱煡'
- END) noticeTypeCdName
+ d.`name` noticeTypeCdName,
+ t.obj_type,t.obj_id,t.obj_type objType,t.obj_id objId,t.state,d1.name stateName
from n_notice t
+ left join t_dict d on d.table_name = 'n_notice' and d.table_columns = 'notice_type_cd' and t.notice_type_cd = d.status_cd
+ left join t_dict d1 on d1.table_name = 'n_notice' and d1.table_columns = 'state' and t.state = d1.status_cd
where 1 =1
<if test="noticeTypeCd !=null and noticeTypeCd != ''">
and t.notice_type_cd= #{noticeTypeCd}
@@ -115,10 +115,10 @@
and t.context= #{context}
</if>
<if test="startTime !=null">
- and t.start_time= #{startTime}
+ and t.start_time <= #{startTime}
</if>
<if test="endTime !=null">
- and t.end_time= #{endTime}
+ and t.end_time >= #{endTime}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -134,6 +134,9 @@
</if>
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
</if>
<if test="noticeId !=null and noticeId != ''">
and t.notice_id= #{noticeId}
@@ -170,8 +173,8 @@
<if test="title !=null and title != ''">
, t.title= #{title}
</if>
- <if test="userId !=null and userId != ''">
- , t.user_id= #{userId}
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
</if>
where 1=1
<if test="bId !=null and bId != ''">
@@ -195,10 +198,10 @@
and t.context= #{context}
</if>
<if test="startTime !=null">
- and t.start_time= #{startTime}
+ and t.start_time <= #{startTime}
</if>
<if test="endTime !=null">
- and t.end_time= #{endTime}
+ and t.end_time >= #{endTime}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -218,8 +221,6 @@
<if test="noticeId !=null and noticeId != ''">
and t.notice_id= #{noticeId}
</if>
-
-
</select>
</mapper>
--
Gitblit v1.8.0