刷卡-灌溉逻辑+修改灌溉记录和充值记录的导出接口

fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserIrrigationRecordMapper.xml

@@ -34,6 +34,32 @@
         select id, user_id, device_number, project_id, dept_id, card_number, area_code, cur_flow, cur_ele, balance, start_time, end_time, duration, unit, last_time, status, remarks, create_time, update_time, create_by, update_by,open_cum_flow,close_cum_flow from user_irrigation_record
     </sql>
 
+    <select id="selectUserIrrigationRecordListByTime" parameterType="UserIrrigationRecordDto" resultMap="UserIrrigationRecordResult">
+        <include refid="selectUserIrrigationRecordVo"/>
+        <where>
+            <if test="searchStartTime !=null and searchEndTime !=null"> end_time between #{searchStartTime} and #{searchEndTime}</if>
+            <if test="id != null "> and id = #{id}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="curFlow != null "> and cur_flow = #{curFlow}</if>
+            <if test="curEle != null "> and cur_ele = #{curEle}</if>
+            <if test="balance != null "> and balance = #{balance}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="duration != null "> and duration = #{duration}</if>
+            <if test="unit != null "> and unit = #{unit}</if>
+            <if test="lastTime != null "> and last_time = #{lastTime}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="openCumFlow != null "> and open_cum_flow = #{openCumFlow}</if>
+            <if test="closeCumFlow != null "> and close_cum_flow = #{closeCumFlow}</if>
+        </where>
+    </select>
+
     <select id="selectUserIrrigationRecordList" parameterType="UserIrrigationRecord" resultMap="UserIrrigationRecordResult">
         <include refid="selectUserIrrigationRecordVo"/>
         <where>