1

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

@@ -149,15 +149,16 @@ public class YjbjController {
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "cfmc", value = "仓房名称", paramType = "query"),
-        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
+        @ApiImplicitParam(name = "yjlx", value = "距离超期天数", required=true, paramType = "query")
 	})
-	public ResponseEntity getJybgcqyjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId) {
+	public ResponseEntity getJybgcqyjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId, String yjlx) {
 		PageInfo<Jybgcqyj> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<Jybgcqyj> list = yjbjService.selectJybgcqyj(orgId, cfmc);
+			List<Jybgcqyj> list = yjbjService.selectJybgcqyj(orgId, cfmc, yjlx);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {
@@ -195,15 +196,16 @@ public class YjbjController {
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "cfmc", value = "仓房或油罐名称", paramType = "query"),
-        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
+        @ApiImplicitParam(name = "crklx", value = "出入库类型(0:入库,1:出库,2:强检)", required=true, paramType = "query")
 	})
-	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId) {
+	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId, Integer crklx) {
 		PageInfo<Zlbj> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<Zlbj> list = yjbjService.selectZlbj(orgId, cfmc);
+			List<Zlbj> list = yjbjService.selectZlbj(orgId, cfmc, crklx);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {

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

@@ -86,6 +86,9 @@
       <if test="obj.orgId != null">
         and org_id = #{obj.orgId,jdbcType=INTEGER}
       </if>
+      <if test="obj.yjlx != null">
+        and yjlx = #{obj.yjlx,jdbcType=INTEGER}
+      </if>
     </where>
     order by bjsj desc
   </select>
@@ -107,7 +110,7 @@
   <!-- 质量报警数据查询 -->
   <select id="selectZlbj" resultType="com.chinaitop.depot.yjbj.model.Zlbj" parameterType="map">
     select 
-  		id,cfmc,hwmc, pzmc, lyxzmc, decode(0, crklx, '入库质检', '出库质检') crklx, 
+  		id,cfmc,hwmc, pzmc, lyxzmc, decode(crklx, 0, '入库', 1, '出库', 2, '强检') crklx, 
   		yjxx, bjsj, approval_status_name approvalStatusName, org_id orgId
 	from storage_quality_alarm 
     <where>
@@ -117,6 +120,9 @@
       <if test="obj.orgId != null">
         and org_id = #{obj.orgId,jdbcType=INTEGER}
       </if>
+      <if test="obj.crklx != null">
+        and crklx = #{obj.crklx,jdbcType=INTEGER}
+      </if>
     </where>
     order by bjsj desc
   </select>

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 String crklx;//出入库类型
+	private Integer 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

@@ -62,10 +62,11 @@ public interface YjbjService {
 	 * 检验报告超期预警查询
 	 * @param orgId 库ID
 	 * @param cfmc 仓房名称
+	 * @param yjlx 距离超期天数
 	 * @return
 	 * @throws Exception
 	 */
-	List<Jybgcqyj> selectJybgcqyj(Integer orgId, String cfmc) throws Exception;
+	List<Jybgcqyj> selectJybgcqyj(Integer orgId, String cfmc, String yjlx) throws Exception;
 
 	/**
 	 * 超耗报警数据查询
@@ -78,12 +79,13 @@ public interface YjbjService {
 
 	/**
 	 * 质量报警数据查询
-	 * @param orgId
-	 * @param cfmc
+	 * @param orgId 库ID
+	 * @param cfmc 仓房名称
+	 * @param crklx 出入库类型(0:入库,1:出库,2:强检)
 	 * @return
 	 * @throws Exception
 	 */
-	List<Zlbj> selectZlbj(Integer orgId, String cfmc) throws Exception;
+	List<Zlbj> selectZlbj(Integer orgId, String cfmc, Integer crklx) throws Exception;
 
 	/**
 	 * 空进空出预警数据查询

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

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