From cddcf22a61489ee9c2dfee169d817ccd66f95430 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 02:23:43 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml |   65 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml
index 39ab60e..2aa606f 100644
--- a/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml
@@ -7,9 +7,18 @@
     <!-- 淇濆瓨璋冩嫧鐢宠淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessAllocationStorehouseApplyInfo" parameterType="Map">
         insert into business_allocation_storehouse_apply(
-        apply_id,start_user_id,operate,start_user_name,apply_count,remark,state,b_id,store_id
+        apply_id,start_user_id,operate,start_user_name,apply_count,remark,state,b_id,store_id,community_id,create_time,apply_type
         ) values (
-        #{applyId},#{startUserId},#{operate},#{startUserName},#{applyCount},#{remark},#{state},#{bId},#{storeId}
+        #{applyId},#{startUserId},#{operate},#{startUserName},#{applyCount},#{remark},#{state},#{bId},#{storeId},#{communityId},#{createTime},#{applyType}
+        )
+    </insert>
+
+    <!-- 淇濆瓨璋冩嫧鐢宠淇℃伅-->
+    <insert id="saveAllocationStorehouseApplyInfo" parameterType="Map">
+        insert into allocation_storehouse_apply(
+        apply_id,b_id,start_user_id,start_user_name,remark,apply_count,store_id,create_time,state,community_id,apply_type
+        ) values (
+        #{applyId},#{bId},#{startUserId},#{startUserName},#{remark},#{applyCount},#{storeId},#{createTime},#{state},#{communityId},#{applyType}
         )
     </insert>
 
@@ -17,7 +26,8 @@
     <select id="getBusinessAllocationStorehouseApplyInfo" parameterType="Map" resultType="Map">
         select t.apply_id,t.apply_id applyId,t.start_user_id,t.start_user_id
         startUserId,t.operate,t.start_user_name,t.start_user_name startUserName,t.apply_count,t.apply_count
-        applyCount,t.remark,t.state,t.b_id,t.b_id bId,t.store_id,t.store_id storeId
+        applyCount,t.remark,t.state,t.b_id,t.b_id bId,t.store_id,t.store_id storeId,t.community_id,t.community_id
+        communityId,t.apply_type,t.apply_type applyType
         from business_allocation_storehouse_apply t
         where 1 =1
         <if test="applyId !=null and applyId != ''">
@@ -47,14 +57,21 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="applyType !=null and applyType != ''">
+            and t.apply_type= #{applyType}
+        </if>
     </select>
 
     <!-- 淇濆瓨璋冩嫧鐢宠淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveAllocationStorehouseApplyInfoInstance" parameterType="Map">
         insert into allocation_storehouse_apply(
-        apply_id,start_user_id,start_user_name,apply_count,remark,status_cd,state,b_id,store_id
-        ) select t.apply_id,t.start_user_id,t.start_user_name,t.apply_count,t.remark,'0',t.state,t.b_id,t.store_id from
-        business_allocation_storehouse_apply t where 1=1
+        apply_id,start_user_id,start_user_name,apply_count,remark,status_cd,state,b_id,store_id,community_id,create_time,apply_type
+        ) select
+        t.apply_id,t.start_user_id,t.start_user_name,t.apply_count,t.remark,'0',t.state,t.b_id,t.store_id,t.community_id,t.create_time,t.apply_type
+        from business_allocation_storehouse_apply t where 1=1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
@@ -80,6 +97,12 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="applyType !=null and applyType != ''">
+            and t.apply_type= #{applyType}
+        </if>
     </insert>
 
     <!-- 鏌ヨ璋冩嫧鐢宠淇℃伅 add by wuxw 2018-07-03 -->
@@ -87,11 +110,11 @@
         select t.apply_id,t.apply_id applyId,t.start_user_id,t.start_user_id
         startUserId,t.start_user_name,t.start_user_name startUserName,t.apply_count,t.apply_count
         applyCount,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.b_id,t.b_id bId,t.store_id,t.store_id storeId,
-        td.name stateName,t.create_time createTime
+        td.name stateName,t.create_time createTime,t.community_id,t.community_id communityId,t.apply_type,t.apply_type
+        applyType,td2.name applyTypeName
         from allocation_storehouse_apply t
-        left join t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse_apply' and
-        td.table_columns =
-        'state'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse_apply' and td.table_columns = 'state'
+        left join t_dict td2 on t.apply_type = td2.status_cd and td2.table_name = 'allocation_storehouse_apply' and td2.table_columns = 'apply_type'
         where 1 = 1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
@@ -106,7 +129,7 @@
             and t.start_user_id= #{startUserId}
         </if>
         <if test="startUserName !=null and startUserName != ''">
-            and t.start_user_name= #{startUserName}
+            and t.start_user_name like '%${startUserName}%'
         </if>
         <if test="applyCount !=null and applyCount != ''">
             and t.apply_count= #{applyCount}
@@ -131,6 +154,12 @@
         </if>
         <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id = #{communityId}
+        </if>
+        <if test="applyType !=null and applyType != ''">
+            and t.apply_type= #{applyType}
         </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -162,6 +191,12 @@
         <if test="storeId !=null and storeId != ''">
             , t.store_id= #{storeId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="applyType !=null and applyType != ''">
+            , t.apply_type= #{applyType}
+        </if>
         where 1=1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
@@ -189,7 +224,7 @@
             and t.start_user_id= #{startUserId}
         </if>
         <if test="startUserName !=null and startUserName != ''">
-            and t.start_user_name= #{startUserName}
+            and t.start_user_name like '%${startUserName}%'
         </if>
         <if test="applyCount !=null and applyCount != ''">
             and t.apply_count= #{applyCount}
@@ -215,5 +250,11 @@
         <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id = #{communityId}
+        </if>
+        <if test="applyType !=null and applyType != ''">
+            and t.apply_type= #{applyType}
+        </if>
     </select>
 </mapper>

--
Gitblit v1.8.0