第一版归档修改

src/main/java/com/chinaitop/depot/storage/controller/StorageDailyController.java

@@ -66,14 +66,14 @@ public class StorageDailyController {
             criteria.andWarehouseIdEqualTo(warehouseId);
         }
         if (null != 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.andCheckTimeLessThan(date);
+            criteria.andCheckTimeLessThanOrEqualTo(date);
         }
 
         //查询FlagType为null的，要不然和粮情卡冲突

src/main/java/com/chinaitop/depot/storage/controller/StorageQualityEventController.java

@@ -66,14 +66,14 @@ public class StorageQualityEventController {
 			criteria.andOrgIdEqualTo(orgId);
 		}
 		if (null != 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.andInputDateLessThan(date);
+			criteria.andInputDateLessThanOrEqualTo(date);
 		}
 
 		list = eventService.findByCondition(example);

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -115,7 +115,7 @@ public class StorageQualitycheckController {
 
         //归档用时间查询
         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/storage/mapper/StorageQualitycheckMapper.xml

@@ -1873,8 +1873,8 @@
       <if test="depotId ==null">
         and sq.depot_id is null
       </if>
-      <if test="depotId !=null">
-        and sq.seal_date &lt; #{sealdate}
+      <if test="sealDate != null" >
+        and sq.seal_date &lt;= #{sealDate}
       </if>
       <!--区分粮情卡的数据-->
       and sq.flag_type is null

src/main/java/com/chinaitop/depot/storage/service/impl/VentilationOperationServiceImpl.java

@@ -32,14 +32,14 @@ public class VentilationOperationServiceImpl implements VentilationOperationServ
             criteria.andCfbhEqualTo(cfbh);
         }
         if (StringUtils.isNotEmpty(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.andDjrqLessThan(date);
+            criteria.andDjrqLessThanOrEqualTo(date);
         }
         if (StringUtils.isNotEmpty(cfmc)) {
         	criteria.andCfmcEqualTo(cfmc);