1

src/main/java/com/chinaitop/depot/yjbj/controller/YjbjController.java

@@ -197,9 +197,9 @@ public class YjbjController {
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "cfmc", value = "仓房或油罐名称", paramType = "query"),
         @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
-        @ApiImplicitParam(name = "crklx", value = "出入库类型(0:入库,1:出库,2:强检)", required=true, paramType = "query")
+        @ApiImplicitParam(name = "crklx", value = "出入库类型(0:入库,1:出库,2:强检)", paramType = "query")
 	})
-	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId, Integer crklx) {
+	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId, String crklx) {
 		PageInfo<Zlbj> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {

src/main/java/com/chinaitop/depot/yjbj/mapper/YjbjMapper.xml

@@ -121,7 +121,7 @@
         and org_id = #{obj.orgId,jdbcType=INTEGER}
       </if>
       <if test="obj.crklx != null">
-        and crklx = #{obj.crklx,jdbcType=INTEGER}
+        and crklx = #{obj.crklx,jdbcType=VARCHAR}
       </if>
     </where>
     order by bjsj desc

src/main/java/com/chinaitop/depot/yjbj/model/Zlbj.java

@@ -14,7 +14,7 @@ public class Zlbj {
 	private String hwmc;//货位名称
 	private String pzmc;//品种名称
 	private String lyxzmc;//粮油性质名称
-	private Integer crklx;//出入库类型(0:入库,1:出库,2:强检)
+	private String crklx;//出入库类型(0:入库,1:出库,2:强检)
 	private String yjxx;//预警信息
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date bjsj;//报警时间

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

@@ -85,7 +85,7 @@ public interface YjbjService {
 	 * @return
 	 * @throws Exception
 	 */
-	List<Zlbj> selectZlbj(Integer orgId, String cfmc, Integer crklx) throws Exception;
+	List<Zlbj> selectZlbj(Integer orgId, String cfmc, String crklx) throws Exception;
 
 	/**
 	 * 空进空出预警数据查询

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

@@ -105,13 +105,13 @@ public class YjbjServiceImpl implements YjbjService {
 	}
 
 	@Override
-	public List<Zlbj> selectZlbj(Integer orgId, String cfmc, Integer crklx) throws Exception {
+	public List<Zlbj> selectZlbj(Integer orgId, String cfmc, String crklx) throws Exception {
 		Zlbj obj = new Zlbj();
 		obj.setOrgId(orgId);
 		if (StringUtils.isNotBlank(cfmc)) {
 			obj.setCfmc("%"+cfmc+"%");
 		}
-		if (null != crklx) {
+		if (StringUtils.isNotBlank(crklx)) {
 			obj.setCrklx(crklx);
 		}
 		return yjbjMapper.selectZlbj(obj);