Merge remote-tracking branch 'origin/master'

src/main/java/com/chinaitop/depot/risk/controller/HumidityAlarmController.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.risk.controller;
 import com.chinaitop.depot.risk.model.HumidityAlarm;
 import com.chinaitop.depot.risk.service.HumidityAlarmService;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.utils.ParameterUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
@@ -55,17 +56,15 @@ public class HumidityAlarmController {
         }
         Map<String, Object> queryMap = Maps.newHashMap();
         if (StringUtils.isNotBlank(startDate)) {
-            queryMap.put("startDate", startDate);
+            queryMap.put("startDate", ParameterUtil.string2datetime(startDate));
         }
         if (StringUtils.isNotBlank(endDate)) {
-            queryMap.put("endDate", endDate);
+            queryMap.put("endDate", ParameterUtil.string2datetime(endDate));
         }
         if (StringUtils.isNotBlank(storehouseName)) {
             queryMap.put("storehouseName", storehouseName);
         }
         queryMap.put("orgId", orgId);
-        List<HumidityAlarm> list = humidityAlarmService.selectList(queryMap);
-        PageInfo<HumidityAlarm> pageInfo = new PageInfo<>(list);
-        return ResponseEntity.ok(pageInfo);
+        return ResponseEntity.ok(new PageInfo<>(humidityAlarmService.selectList(queryMap)));
     }
 }

src/main/java/com/chinaitop/depot/risk/mapper/HumidityAlarmMapper.xml

@@ -21,11 +21,11 @@
         <if test="storehouseName != null">
             and bs.storehouse_name = #{storehouseName}
         </if>
-        <if test="startDate != null and endDate != null" >
-            and tw.w_time BETWEEN #{startDate} AND #{endDate}
+        <if test="startDate != null" >
+            <![CDATA[ and tw.w_time >= #{startDate} ]]>
         </if>
-        <if test="startDate != null and endDate != null" >
-            and tw.w_time &lt;= #{endDate}
+        <if test="endDate != null" >
+            <![CDATA[ and tw.w_time <= #{endDate} ]]>
         </if>
     </select>
 </mapper>