第一版归档修改

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationAlterController.java

@@ -85,7 +85,7 @@ public class FumigationAlterController {
             map.put("houseId",houseId);
 
         if (ParameterUtil.isnotnull(createTime)) {//归档用
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date = null;
             try {
                 date = dateFormat.parse(createTime);

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationPlanController.java

@@ -72,14 +72,14 @@ public class FumigationPlanController {
         }
 
         if (ParameterUtil.isnotnull(createTime)) {//归档用
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date = null;
             try {
                 date = dateFormat.parse(createTime);
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            criteria.andCreateTimeLessThan(date);
+            criteria.andCreateTimeLessThanOrEqualTo(date);
             map.put("createTime", createTime);
         }
 
@@ -257,7 +257,7 @@ public class FumigationPlanController {
         map.put("userId",userId);
 
         if (ParameterUtil.isnotnull(createTime)) {//归档用
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date = null;
             try {
                 date = dateFormat.parse(createTime);

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationProcessController.java

@@ -71,7 +71,7 @@ public class FumigationProcessController {
             map.put("houseId",houseId);
 
         if (ParameterUtil.isnotnull(createTime)) {//归档用
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date = null;
             try {
                 date = dateFormat.parse(createTime);

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationAfterMapper.xml

@@ -772,7 +772,7 @@
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
     </if>
     <if test="createTime != null">
-      AND af.create_time &lt; #{createTime}
+      AND af.create_time &lt;= #{createTime}
     </if>
   </select>
   <select id="selectHomeWorkQueryList" parameterType="java.util.Map" resultType="java.util.HashMap">

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationPlanMapper.xml

@@ -1311,7 +1311,7 @@
       AND plan.house_id = #{houseId,jdbcType=INTEGER}
     </if>
     <if test="createTime != null">
-      AND plan.create_time &lt; #{createTime}
+      AND plan.create_time &lt;= #{createTime}
     </if>
     order by approval.create_time desc
   </select>
@@ -1334,7 +1334,7 @@
       AND plan.delete_state = #{deleteState,jdbcType=INTEGER}
     </if>
     <if test="createTime != null">
-      AND pro.create_time &lt; #{createTime}
+      AND pro.create_time &lt;= #{createTime}
     </if>
     AND pro.id IS NULL
     <if test="orderByClause != null" >

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationProcessMapper.xml

@@ -1493,7 +1493,7 @@
       AND plan.org_id = #{orgId,jdbcType=INTEGER}
     </if>
     <if test="createTime != null">
-      AND pro.create_time &lt; #{createTime}
+      AND pro.create_time &lt;= #{createTime}
     </if>
   </select>
 

src/main/java/com/chinaitop/depot/storage/mapper/StorageFestivalbeforeCheckMapper.xml

@@ -400,7 +400,7 @@
         and sfc.check_date BETWEEN #{starDate} AND #{endDate}
       </if>
       <if test="endDate != null" >
-        and sfc.check_date &lt; #{endDate}
+        and sfc.check_date &lt;= #{endDate}
       </if>
       <if test="orgId != null" >
         and sfc.org_id = #{orgId}

src/main/java/com/chinaitop/depot/storage/mapper/StorageFoodothercheckMapper.xml

@@ -431,7 +431,7 @@
         and sfk.check_date BETWEEN #{starDate} AND #{endDate}
       </if>
       <if test="starDate != null and endDate != null" >
-        and sfk.check_date &lt; #{endDate}
+        and sfk.check_date &lt;= #{endDate}
       </if>
       <if test="orgId != null" >
         and sfk.org_id = #{orgId}

src/main/java/com/chinaitop/depot/storage/mapper/StorageThreetempcheckMapper.xml

@@ -514,7 +514,7 @@
         AND t_time BETWEEN #{startDate} AND #{endDate}
       </if>
       <if test="endDate != null">
-        AND t_time &lt; #{endDate}
+        AND t_time &lt;= #{endDate}
       </if>
     </where>
       <if test="weekParams != null">

src/main/java/com/chinaitop/depot/storage/mapper/StorageWindrainsnowcheckMapper.xml

@@ -467,7 +467,7 @@
         and swk.check_date BETWEEN #{starDate} AND #{endDate}
       </if>
       <if test="endDate != null" >
-        and swk.check_date &lt; #{endDate}
+        and swk.check_date &lt;= #{endDate}
       </if>
       <if test="orgId != null" >
         and swk.org_id = #{orgId}