From a8990150b50fde2e507b9df01d8e0847b2bda81d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 22 八月 2021 19:05:06 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml |   70 ++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index cf97e36..5e9fc8d
--- a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
@@ -6,13 +6,13 @@
 
     <!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessActivitiesInfo" parameterType="Map">
-           insert into business_activities(
-collect_count,like_count,title,read_count,user_name,user_id,activities_id,operate,type_cd,context,start_time,end_time,community_id,b_id,header_img,state
-) values (
-#{collectCount},#{likeCount},#{title},#{readCount},#{userName},#{userId},#{activitiesId},#{operate},#{typeCd},#{context},#{startTime},#{endTime},
-#{communityId},#{bId},#{headerImg},#{state}
-)
-       </insert>
+        insert into business_activities(
+        collect_count,like_count,title,read_count,user_name,user_id,activities_id,operate,type_cd,context,start_time,end_time,community_id,b_id,header_img,state
+        ) values (
+        #{collectCount},#{likeCount},#{title},#{readCount},#{userName},#{userId},#{activitiesId},#{operate},#{typeCd},#{context},#{startTime},#{endTime},
+        #{communityId},#{bId},#{headerImg},#{state}
+        )
+    </insert>
 
 
     <!-- 鏌ヨ娲诲姩淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
@@ -54,10 +54,10 @@
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
@@ -113,10 +113,10 @@
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
@@ -138,17 +138,16 @@
         statusCd,t.title,t.read_count,t.read_count readCount,t.user_name,t.user_name userName,t.user_id,t.user_id
         userId,t.activities_id,t.activities_id activitiesId,t.type_cd,t.type_cd
         typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state
+        communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time createTime
         from activities t
+        left join activities_type act on t.type_cd = act.type_cd and t.community_id = act.community_id
         where 1 =1
+        and t.status_cd= '0' and act.status_cd = '0'
         <if test="collectCount !=null and collectCount != ''">
             and t.collect_count= #{collectCount}
         </if>
         <if test="likeCount !=null and likeCount != ''">
             and t.like_count= #{likeCount}
-        </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
         </if>
         <if test="title !=null and title != ''">
             and t.title= #{title}
@@ -156,12 +155,10 @@
         <if test="readCount !=null and readCount != ''">
             and t.read_count= #{readCount}
         </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
+        <if test="staffName !=null and staffName != ''">
+            and t.user_name= #{staffName}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
         <if test="activitiesId !=null and activitiesId != ''">
             and t.activities_id= #{activitiesId}
         </if>
@@ -171,11 +168,11 @@
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
-        <if test="startTime !=null and startTime != ''">
-            and t.start_time= #{startTime}
+        <if test="startTime !=null ">
+            and t.start_time &lt;= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
-            and t.end_time= #{endTime}
+        <if test="endTime !=null ">
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -189,6 +186,7 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -226,10 +224,10 @@
         <if test="context !=null and context != ''">
             , t.context= #{context}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="startTime !=null ">
             , t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             , t.end_time= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
@@ -256,26 +254,22 @@
         select count(1) count
         from activities t
         where 1 =1
+        and t.status_cd= '0'
         <if test="collectCount !=null and collectCount != ''">
             and t.collect_count= #{collectCount}
         </if>
         <if test="likeCount !=null and likeCount != ''">
             and t.like_count= #{likeCount}
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
+
         <if test="title !=null and title != ''">
             and t.title= #{title}
         </if>
         <if test="readCount !=null and readCount != ''">
             and t.read_count= #{readCount}
         </if>
-        <if test="userName !=null and userName != ''">
-            and t.user_name= #{userName}
-        </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
+        <if test="staffName !=null and staffName != ''">
+            and t.user_name= #{staffName}
         </if>
         <if test="activitiesId !=null and activitiesId != ''">
             and t.activities_id= #{activitiesId}
@@ -286,11 +280,11 @@
         <if test="context !=null and context != ''">
             and t.context= #{context}
         </if>
-        <if test="startTime !=null and startTime != ''">
-            and t.start_time= #{startTime}
+        <if test="startTime !=null ">
+            and t.start_time &lt;= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
-            and t.end_time= #{endTime}
+        <if test="endTime !=null ">
+            and t.end_time &gt;= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}

--
Gitblit v1.8.0