.

src/main/java/com/chinaitop/agile/controller/FcbgzController.java

@@ -176,10 +176,12 @@ public class FcbgzController {
 		@ApiImplicitParam(name="pageSize", value = "每页条数", paramType = "query"),
 		@ApiImplicitParam(name="orgId", value = "单位ID", paramType = "query"),
 		@ApiImplicitParam(name="houseId", value="仓房ID ", paramType="query"),
-		@ApiImplicitParam(name="warehouseId", value="货位ID", paramType="query")
+		@ApiImplicitParam(name="warehouseId", value="货位ID", paramType="query"),
+		@ApiImplicitParam(name="lspz", value="粮油品种", paramType="query"),
+		@ApiImplicitParam(name="rcsj", value="入仓时间", paramType="query")
 	})
 	public PageInfo<Map<String, Object>> queryRkZsList(Integer pageNum, Integer pageSize, 
-			Integer orgId, Integer houseId, Integer warehouseId) {
+			Integer orgId, Integer houseId, Integer warehouseId, Integer lspz, String rcsj) {
 
 		Map<String, Object> param_map = new HashMap<String, Object>();
 		if (null != pageNum && null != pageSize) {
@@ -197,6 +199,14 @@ public class FcbgzController {
 		if (null != warehouseId) {
 			param_map.put("hwh", warehouseId);
 		}
+		/* 粮油品种 */
+		if (null != lspz) {
+			param_map.put("lspz", lspz);
+		}
+		/* 入仓时间 */
+		if (null != rcsj && !"".equals(rcsj)) {
+			param_map.put("rcsj", rcsj);
+		}
 		List<Map<String, Object>> list = null;
 		try {
 			list = fcbgzService.queryRkZsList(param_map);

src/main/java/com/chinaitop/agile/mapper/DataKcglFcbgzDefaultMapper.xml

@@ -759,6 +759,12 @@
     <if test="hwh != null">
         and a.hwh = #{hwh} 
     </if>
+    <if test="lspz != null">
+        and a.pz = #{lspz} 
+    </if>
+    <if test="rcsj != null">
+        and DATE_FORMAT(a.cjsj,'%Y-%m-%d') = #{rcsj} 
+    </if>
     <if test="orgId != null">
     	and a.UnitID=#{orgId}
     </if>