From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml
index b0585aa..39ab60e 100644
--- a/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/AllocationStorehouseApplyServiceDaoImplMapper.xml
@@ -13,7 +13,6 @@
         )
     </insert>
 
-
     <!-- 鏌ヨ璋冩嫧鐢宠淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessAllocationStorehouseApplyInfo" parameterType="Map" resultType="Map">
         select t.apply_id,t.apply_id applyId,t.start_user_id,t.start_user_id
@@ -48,9 +47,7 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
-
     </select>
-
 
     <!-- 淇濆瓨璋冩嫧鐢宠淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveAllocationStorehouseApplyInfoInstance" parameterType="Map">
@@ -83,17 +80,19 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
-
     </insert>
-
 
     <!-- 鏌ヨ璋冩嫧鐢宠淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getAllocationStorehouseApplyInfo" parameterType="Map" resultType="Map">
         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
+        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
         from allocation_storehouse_apply t
-        where 1 =1
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse_apply' and
+        td.table_columns =
+        'state'
+        where 1 = 1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
@@ -127,13 +126,17 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{endTime}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼璋冩嫧鐢宠淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateAllocationStorehouseApplyInfoInstance" parameterType="Map">
@@ -166,14 +169,13 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ璋冩嫧鐢宠鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryAllocationStorehouseApplysCount" parameterType="Map" resultType="Map">
         select count(1) count
         from allocation_storehouse_apply t
-        where 1 =1
+        where 1 = 1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
@@ -207,8 +209,11 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
-
-
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{endTime}
+        </if>
     </select>
-
 </mapper>

--
Gitblit v1.8.0