质量报警

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

@@ -17,6 +17,7 @@ import com.chinaitop.depot.yjbj.model.Jybgcqyj;
 import com.chinaitop.depot.yjbj.model.StorageAlarmRecordWithBLOBs;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
+import com.chinaitop.depot.yjbj.model.Zlbj;
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 import com.github.pagehelper.PageHelper;
@@ -177,6 +178,29 @@ public class YjbjController {
 			return ResponseEntity.failed("查询失败:" + e.getMessage());
 		}
 	}
+	
+	@RequestMapping(value="/getZlbjPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询质量报警列表", notes = "支持分页")
+	@ApiImplicitParams({
+		@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")
+	})
+	public ResponseEntity getZlbjPageList(Integer pageNum, Integer pageSize, String cfmc, Integer orgId) {
+		PageInfo<Zlbj> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<Zlbj> list = yjbjService.selectZlbj(orgId, cfmc);
+			pageInfo = new PageInfo<>(list);
+			return ResponseEntity.ok(pageInfo);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return ResponseEntity.failed("查询失败:" + e.getMessage());
+		}
+	}
 
 	@RequestMapping(value="/getCljl", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询处理记录", notes = "")

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

@@ -10,6 +10,7 @@ import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
+import com.chinaitop.depot.yjbj.model.Zlbj;
 
 public interface YjbjMapper {
 
@@ -54,4 +55,11 @@ public interface YjbjMapper {
 	 * @return
 	 */
 	List<Chbj> selectChbj(@Param("obj") Chbj obj);
+
+	/**
+	 * 质量报警数据查询
+	 * @param obj
+	 * @return
+	 */
+	List<Zlbj> selectZlbj(@Param("obj") Zlbj obj);
 }

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

@@ -93,4 +93,20 @@
     </where>
     order by bjsj desc
   </select>
+  <!-- 质量报警数据查询 -->
+  <select id="selectZlbj" resultType="com.chinaitop.depot.yjbj.model.Zlbj" parameterType="map">
+    select 
+  		id,cfmc,hwmc, pzmc, lyxzmc, decode(0, crklx, '入库质检', '出库质检') crklx, 
+  		yjxx, bjsj, approval_status_name approvalStatusName, org_id orgId
+	from storage_quality_alarm 
+    <where>
+      <if test="obj.cfmc != null">
+        and cfmc like #{obj.cfmc,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.orgId != null">
+        and org_id = #{obj.orgId,jdbcType=INTEGER}
+      </if>
+    </where>
+    order by bjsj desc
+  </select>
 </mapper>

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

@@ -0,0 +1,23 @@
+package com.chinaitop.depot.yjbj.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+@Data
+public class Zlbj {
+
+	private String id;//主键ID
+	private String cfmc;//仓房名称
+	private String hwmc;//货位名称
+	private String pzmc;//品种名称
+	private String lyxzmc;//粮油性质名称
+	private String crklx;//出入库类型
+	private String yjxx;//预警信息
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date bjsj;//报警时间
+	private String approvalStatusName;//处理状态名称
+	private Integer orgId;//库ID
+}

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

@@ -8,6 +8,7 @@ import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
+import com.chinaitop.depot.yjbj.model.Zlbj;
 
 public interface YjbjService {
 
@@ -64,4 +65,13 @@ public interface YjbjService {
 	 * @throws Exception
 	 */
 	List<Chbj> selectChbj(Integer orgId, String cforyg) throws Exception;
+
+	/**
+	 * 质量报警数据查询
+	 * @param orgId
+	 * @param cfmc
+	 * @return
+	 * @throws Exception
+	 */
+	List<Zlbj> selectZlbj(Integer orgId, String cfmc) throws Exception;
 }

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

@@ -14,6 +14,7 @@ import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
+import com.chinaitop.depot.yjbj.model.Zlbj;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 
 @Service
@@ -77,9 +78,19 @@ public class YjbjServiceImpl implements YjbjService {
 		Chbj obj = new Chbj();
 		obj.setOrgId(orgId);
 		if (StringUtils.isNotBlank(cforyg)) {
-			obj.setCforyg("%"+cforyg+"%");
+			obj.setCforyg(cforyg);
 		}
 		return yjbjMapper.selectChbj(obj);
 	}
 
+	@Override
+	public List<Zlbj> selectZlbj(Integer orgId, String cfmc) throws Exception {
+		Zlbj obj = new Zlbj();
+		obj.setOrgId(orgId);
+		if (StringUtils.isNotBlank(cfmc)) {
+			obj.setCfmc("%"+cfmc+"%");
+		}
+		return yjbjMapper.selectZlbj(obj);
+	}
+
 }