归档第一版功能

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

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,7 +52,7 @@ public class StorageDailyController {
             @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
             @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query")
     })
-    public PageInfo<StorageDailycheck> listPage(Integer pageNum, Integer pageSize , Integer houseId, Integer warehouseId) {
+    public PageInfo<StorageDailycheck> listPage(Integer pageNum, Integer pageSize , Integer houseId, Integer warehouseId, String createTime) {
 
         StorageDailycheckExample example = new StorageDailycheckExample();
         StorageDailycheckExample.Criteria criteria = example.createCriteria();
@@ -62,6 +65,16 @@ public class StorageDailyController {
         if (null != warehouseId) {
             criteria.andWarehouseIdEqualTo(warehouseId);
         }
+        if (null != createTime) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = null;
+            try {
+                date = dateFormat.parse(createTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            criteria.andCheckTimeLessThan(date);
+        }
 
         //查询FlagType为null的，要不然和粮情卡冲突
         criteria.andFlagTypeIsNull();

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

@@ -1,5 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -43,7 +45,7 @@ public class StorageQualityEventController {
             @ApiImplicitParam(name = "orgId", value = "单位Id", paramType = "query")
     })
 	public PageInfo<StorageQualityEvent> getList(Integer pageNum, Integer pageSize, Integer houseId,
-			Integer wareId, Integer orgId) {
+			Integer wareId, Integer orgId, String createTime) {
 
 		List<StorageQualityEvent> list = null;
 		PageInfo<StorageQualityEvent> pageInfo = null;
@@ -63,6 +65,16 @@ public class StorageQualityEventController {
 		if (null != orgId) {
 			criteria.andOrgIdEqualTo(orgId);
 		}
+		if (null != createTime) {
+			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+			Date date = null;
+			try {
+				date = dateFormat.parse(createTime);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			criteria.andInputDateLessThan(date);
+		}
 
 		list = eventService.findByCondition(example);
 		String czwt = "";

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

@@ -31,11 +31,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by product on 2017/10/11.
@@ -67,7 +65,7 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "depotType", value = "判断是否是代储", paramType = "query"),
     })
     public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize, StorageQualitycheck qualitycheck,
-                                                  String checktype,String checkResult,String depotType) {
+                                                  String checktype,String checkResult,String depotType,String createTime) {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
 
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
@@ -115,6 +113,18 @@ public class StorageQualitycheckController {
             qualityCheck.setDepotId(Integer.parseInt(depotType));
         }
 
+        //归档用时间查询
+        if(ParameterUtil.isnotnull(createTime)){
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = null;
+            try {
+                date = dateFormat.parse(createTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            qualityCheck.setSealDate(date);
+        }
+
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
         //qualityCheck.setSealStatus("0");

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

@@ -37,10 +37,10 @@ public class VentilationOperationController {
             @ApiImplicitParam(name = "orgId", value = "库点编码", paramType = "query"),
             @ApiImplicitParam(name = "vcfcode", value = "仓库名称", paramType = "query")
     })
-   public ResponseEntity<PageInfo<TVentilationOperation>> getList(Integer pageNum, Integer pageSize, String orgId, String cfbh,String cfmc) {
+   public ResponseEntity<PageInfo<TVentilationOperation>> getList(Integer pageNum, Integer pageSize, String orgId, String cfbh,String createTime,String cfmc) {
         List<TVentilationOperation> list = null;
         try {
-            list = ventilationOperationService.getList(pageNum,pageSize,orgId,cfbh,cfmc);
+            list = ventilationOperationService.getList(pageNum,pageSize,orgId,cfbh,createTime,cfmc);
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());

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

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

src/main/java/com/chinaitop/depot/storage/service/VentilationOperationService.java

@@ -6,7 +6,7 @@ import com.chinaitop.depot.storage.model.TVentilationOperation;
 
 public interface VentilationOperationService {
 
-	List<TVentilationOperation> getList(Integer pageNum, Integer pageSize,String orgId, String cfbh,String cfmc);
+	List<TVentilationOperation> getList(Integer pageNum, Integer pageSize,String orgId, String cfbh,String createTime,String cfmc);
 
 	TVentilationOperation getById(String id);
 

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

@@ -1,5 +1,8 @@
 package com.chinaitop.depot.storage.service.impl;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -21,13 +24,23 @@ public class VentilationOperationServiceImpl implements VentilationOperationServ
     private TVentilationOperationMapper tVentilationOperationMapper;
 
 	@Override
-	public List<TVentilationOperation> getList(Integer pageNum, Integer pageSize,String orgId, String cfbh,String cfmc) {
+	public List<TVentilationOperation> getList(Integer pageNum, Integer pageSize,String orgId, String cfbh,String createTime,String cfmc) {
 		TVentilationOperationExample tVentilationOperationExample = new TVentilationOperationExample();
 		tVentilationOperationExample.setDistinct(true);
 		TVentilationOperationExample.Criteria criteria = tVentilationOperationExample.createCriteria();
         if (StringUtils.isNotEmpty(cfbh)) {
             criteria.andCfbhEqualTo(cfbh);
         }
+        if (StringUtils.isNotEmpty(createTime)) {
+			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+			Date date = null;
+			try {
+				date = dateFormat.parse(createTime);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+            criteria.andDjrqLessThan(date);
+        }
         if (StringUtils.isNotEmpty(cfmc)) {
         	criteria.andCfmcEqualTo(cfmc);
         }