Commit 383693ee authored by wanghaihang's avatar wanghaihang

时间默认格式改为2014年

parent 143cce5f
...@@ -686,7 +686,7 @@ public class CustomerProjectImpl implements ICustomerProject { ...@@ -686,7 +686,7 @@ public class CustomerProjectImpl implements ICustomerProject {
logEntity.setCustomerManagerName(""); logEntity.setCustomerManagerName("");
logEntity.setRemark(remark); logEntity.setRemark(remark);
logEntity.setNonStatistic(0); logEntity.setNonStatistic(0);
String time = "0000-00-00 00:00:00"; String time = "2014-01-01 00:00:00";
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date time1 = format.parse(time); Date time1 = format.parse(time);
logEntity.setOccurTime(time1); logEntity.setOccurTime(time1);
......
...@@ -880,7 +880,7 @@ ...@@ -880,7 +880,7 @@
WHERE is_active = 1 WHERE is_active = 1
AND cityCode = #{city} AND cityCode = #{city}
AND DATE_SUB(CURDATE(), INTERVAL #{hour} HOUR) >= DATE(active_time) AND DATE_SUB(CURDATE(), INTERVAL #{hour} HOUR) >= DATE(active_time)
AND active_time != '0000-00-00 00:00:00' AND active_time != '2014-01-01 00:00:00'
</update> </update>
<select id="queryForAddHot" resultMap="infoMap" parameterType="java.util.HashMap"> <select id="queryForAddHot" resultMap="infoMap" parameterType="java.util.HashMap">
......
...@@ -997,7 +997,7 @@ ...@@ -997,7 +997,7 @@
WHERE is_active = 1 WHERE is_active = 1
AND cityCode = #{city} AND cityCode = #{city}
AND DATE_SUB(CURDATE(), INTERVAL #{hour} HOUR) >= DATE(active_time) AND DATE_SUB(CURDATE(), INTERVAL #{hour} HOUR) >= DATE(active_time)
AND active_time != '0000-00-00 00:00:00' AND active_time != '2014-01-01 00:00:00'
</update> </update>
<select id="queryForAddHot" resultMap="infoMap" parameterType="java.util.HashMap"> <select id="queryForAddHot" resultMap="infoMap" parameterType="java.util.HashMap">
......
...@@ -997,7 +997,7 @@ ...@@ -997,7 +997,7 @@
WHERE is_active = 1 WHERE is_active = 1
AND cityCode = #{city} AND cityCode = #{city}
AND DATE_SUB(CURDATE(), INTERVAL #{hour} HOUR) >= DATE(active_time) AND DATE_SUB(CURDATE(), INTERVAL #{hour} HOUR) >= DATE(active_time)
AND active_time != '0000-00-00 00:00:00' AND active_time != '2014-01-01 00:00:00'
</update> </update>
<select id="queryForAddHot" resultMap="infoMap" parameterType="java.util.HashMap"> <select id="queryForAddHot" resultMap="infoMap" parameterType="java.util.HashMap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment