| 
					
				 | 
			
			
				@@ -5,30 +5,32 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <mapper namespace="com.ruoyi.basicData.mapper.TWarehouseMapper"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <resultMap type="TWarehouse" id="TWarehouseResult"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="fId" column="f_id"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="fNo" column="f_no"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="fName" column="f_name"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="fAddr" column="f_addr"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="fStatus" column="f_status"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="delFlag" column="del_flag"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="createBy" column="create_by"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="createTime" column="create_time"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="updateBy" column="update_by"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="updateTime" column="update_time"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <result property="remark" column="remark"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="fId"    column="f_id"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="fNo"    column="f_no"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="fName"    column="f_name"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="fAddr"    column="f_addr"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="fTotalgross"    column="f_totalgross"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="fStatus"    column="f_status"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="delFlag"    column="del_flag"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="createBy"    column="create_by"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="createTime"    column="create_time"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="updateBy"    column="update_by"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="updateTime"    column="update_time"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="remark"    column="remark"    /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </resultMap> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <sql id="selectTWarehouseVo"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        select f_id, f_no, f_name, f_addr, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        select f_id, f_no, f_name, f_addr, f_totalgross, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehouse 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </sql> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectTWarehouseList" parameterType="TWarehouse" resultMap="TWarehouseResult"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <include refid="selectTWarehouseVo"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <if test="fNo != null  and fNo != ''">and f_no = #{fNo}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <if test="fName != null  and fName != ''">and f_name like concat('%', #{fName}, '%')</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <if test="fAddr != null  and fAddr != ''">and f_addr = #{fAddr}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fNo != null  and fNo != ''"> and f_no = #{fNo}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fAddr != null  and fAddr != ''"> and f_addr = #{fAddr}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fTotalgross != null "> and f_totalgross = #{fTotalgross}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -43,6 +45,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fNo != null and fNo != ''">f_no,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fName != null and fName != ''">f_name,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fAddr != null and fAddr != ''">f_addr,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fTotalgross != null">f_totalgross,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fStatus != null">f_status,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="delFlag != null">del_flag,</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="createBy != null">create_by,</if> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -55,6 +58,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fNo != null and fNo != ''">#{fNo},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fName != null and fName != ''">#{fName},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fAddr != null and fAddr != ''">#{fAddr},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fTotalgross != null">#{fTotalgross},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fStatus != null">#{fStatus},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="delFlag != null">#{delFlag},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="createBy != null">#{createBy},</if> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -71,6 +75,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fNo != null and fNo != ''">f_no = #{fNo},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fName != null and fName != ''">f_name = #{fName},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fAddr != null and fAddr != ''">f_addr = #{fAddr},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <if test="fTotalgross != null">f_totalgross = #{fTotalgross},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fStatus != null">f_status = #{fStatus},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="delFlag != null">del_flag = #{delFlag},</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="createBy != null">create_by = #{createBy},</if> 
			 |