应轮未轮条件查询

src/main/java/com/chinaitop/depot/warningAndAlarm/controller/YjBjController.java

@@ -67,15 +67,16 @@ public class YjBjController {
         @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query"),
         @ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
         @ApiImplicitParam(name = "hwh", value = "货位ID", paramType = "query"),
-        @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query")
+        @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query"),
+        @ApiImplicitParam(name = "rksj", value = "入库时间", paramType = "query")
 	})
-	public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz) {
+	public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj) {
 		PageInfo<StorageRotationWarning> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz);
+			List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz, rksj);
 			pageInfo = new PageInfo<>(list);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

src/main/java/com/chinaitop/depot/warningAndAlarm/service/YjbjService.java

@@ -28,7 +28,7 @@ public interface YjbjService {
 	 * @return
 	 * @throws Exception
 	 */
-	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz) throws Exception;
+	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj) throws Exception;
 
 	/**
 	 * 更新轮换预警报警数据的处理结果信息

src/main/java/com/chinaitop/depot/warningAndAlarm/service/impl/YjbjServiceImpl.java

@@ -57,7 +57,7 @@ public class YjbjServiceImpl implements YjbjService {
 	}
 
 	@Override
-	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz)
+	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj)
 			throws Exception {
 
 		StorageRotationWarningExample example = new StorageRotationWarningExample();
@@ -75,6 +75,9 @@ public class YjbjServiceImpl implements YjbjService {
 		if (null != lspz) {
 			criteria.andLspzEqualTo(lspz);  //粮食品种ID
 		}
+		if (null != rksj) {
+			criteria.andZhycrqLike(rksj);
+		}
 
 		criteria.andBjlxEqualTo(StatusUtils.LHYJBJ_TYPE_1); //查询应轮未轮报警的数据